群

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatPlanDTO.java

@@ -15,6 +15,8 @@ public class GroupChatPlanDTO implements Serializable{
 
 	private static final long serialVersionUID = 21576537277600L;
 	
+	private String wxEnterpriseId;
+	private String enterpriseId;
 	private Long planId;
 	private String name;
 	private String remark;
@@ -22,8 +24,8 @@ public class GroupChatPlanDTO implements Serializable{
 	private String chatContent;
 	private String creatorId;
 	private String creatorName;
-	private String modifyId;
-	private String modifyName;
+	private String modifierId;
+	private String modifierName;
 	private java.util.Date createTime;
 	private java.util.Date updateTime;
 	/**0已删除 1有效*/
@@ -45,7 +47,23 @@ public class GroupChatPlanDTO implements Serializable{
 	/**总群数*/
 	private Integer totalChatCount;
 	
-	public void setPlanId(Long planId){
+	public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public void setPlanId(Long planId){
 		this.planId = planId;
 	}
 	
@@ -87,21 +105,23 @@ public class GroupChatPlanDTO implements Serializable{
 	public String getCreatorName(){
 		return creatorName;
 	}
-	public void setModifyId(String modifyId){
-		this.modifyId = modifyId;
-	}
-	
-	public String getModifyId(){
-		return modifyId;
-	}
-	public void setModifyName(String modifyName){
-		this.modifyName = modifyName;
-	}
-	
-	public String getModifyName(){
-		return modifyName;
-	}
-	public void setCreateTime(java.util.Date createTime){
+	public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}
 	

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatPlanSearchQDTO.java

+package com.gic.haoban.manage.api.dto.qdto.chat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class GroupChatPlanSearchQDTO implements Serializable {
+
+    private static final long serialVersionUID = 7983127960892502325L;
+
+    private Date startDate;
+    private Date endDate;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private String searchParams;
+    private Integer status;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public String getSearchParams() {
+        return searchParams;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public void setSearchParams(String searchParams) {
+        this.searchParams = searchParams;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/chat/GroupChatSearchQDTO.java

+package com.gic.haoban.manage.api.dto.qdto.chat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class GroupChatSearchQDTO implements Serializable {
+
+    private static final long serialVersionUID = 7983127960892502325L;
+
+    private Date startDate;
+    private Date endDate;
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    private String searchParams;
+    private Integer status;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public String getSearchParams() {
+        return searchParams;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public void setSearchParams(String searchParams) {
+        this.searchParams = searchParams;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatApiService.java

 package com.gic.haoban.manage.api.service.chat;
 
+import java.util.List;
+
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.chat.ChatEventDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 
 public interface GroupChatApiService {
 
     // 群列表
-    
-    // 群详情
-    
+    public ServiceResponse<Page<GroupChatDTO>> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo);
+
+    // 群列表
+    public ServiceResponse<GroupChatDTO> detail(String wxEnterpriseId, Long groupChatId);
+
+    // 刷新群信息
+    public ServiceResponse<Void> refreshChatInfo(Long groupChatId);
+
+    /**
+     * 
+    * @Title: updateChatEnterpriseId
+    * @Description: 客户群认领,更新企业ID
+    * @author xugh
+    * @param wxEnterpriseId
+    * @param enterpriseId
+    * @param groupChatIdList
+    * @return
+    * @throws
+     */
+    public ServiceResponse<Void> updateChatEnterpriseId(String wxEnterpriseId, String enterpriseId,
+            List<Long> groupChatIdList);
+
     /**
      * 
     * @Title: qwEventNotice
@@ -18,7 +43,5 @@ public interface GroupChatApiService {
     * @throws
      */
     public ServiceResponse<Void> qwEventNotice(ChatEventDTO dto);
-    
-    
 
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/chat/GroupChatPlanApiService.java

 package com.gic.haoban.manage.api.service.chat;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
+
 /**
  * 
 * @ClassName: GroupChatPlanApiService
@@ -10,9 +16,13 @@ package com.gic.haoban.manage.api.service.chat;
  */
 public interface GroupChatPlanApiService {
 
-    // 群列表
-    
-    // 群详情
-    
+    // 群发列表
+    public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo);
+
+    // 群发详情
+    public ServiceResponse<GroupChatPlanDTO> detail(Long planId);
+
+    // 保存/更新
+    public ServiceResponse<GroupChatPlanDTO> save(GroupChatPlanDTO dto);
 
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChat;
 
 /**
@@ -36,4 +37,6 @@ public interface GroupChatMapper {
             @Param("wxChatId") String wxChatId);
 
     public List<TabGroupChat> listAllNeedInit();
+    
+    public List<TabGroupChat> list(GroupChatSearchQDTO qdto);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/chat/GroupChatPlanMapper.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.service.dao.mapper.chat;
 
 import java.util.List;
 
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan;
 
 /**
@@ -14,52 +15,14 @@ import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan;
  * @CopyRight 
  */
 public interface GroupChatPlanMapper {
-	
-	/**
-	 * 新增
-	* @Title: insert 
-	* @Description: TODO
-	* @Param @param TabHaobanGroupChatPlan
-	 */
-	public int insert(TabGroupChatPlan  tabHaobanGroupChatPlan) ;
-	
-	/**
-	 * 通过主键删除
-	* @Title: delete 
-	* @Description: TODO
-	* @Param @param id
-	* @Throws
-	 */
-	public int deleteByPrimaryKey(Long planId) ;
-	
-	/**
-	 * 更新
-	* @Title: update 
-	* @Description: TODO
-	* @Param @param TabHaobanGroupChatPlan
-	* @Throws
-	 */
-	public int updateByPrimaryKey(TabGroupChatPlan  tabHaobanGroupChatPlan) ;
-	
-	/**
-	 * 通过主键查询
-	* @Title: selectById 
-	* @Description: TODO
-	* @Param @param id
-	* @Param @return
-	* @Return TabHaobanGroupChatPlan
-	* @Throws
-	 */
-	public TabGroupChatPlan selectByPrimaryKey(Long planId) ;
-	
-	/**
-	 * 通过条件查询
-	* @Title: listAll 
-	* @Description: TODO
-	* @Param @param TabHaobanGroupChatPlan
-	* @Param @return
-	* @Return List
-	* @Throws
-	 */
-	public List<TabGroupChatPlan> listAll(TabGroupChatPlan tabHaobanGroupChatPlan) ;
+
+    public int insert(TabGroupChatPlan entity);
+
+    public int deleteById(Long planId);
+
+    public int updateById(TabGroupChatPlan entity);
+
+    public TabGroupChatPlan selectById(Long planId);
+
+    public List<TabGroupChatPlan> list(GroupChatPlanSearchQDTO qdto);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/chat/TabGroupChatPlan.java

@@ -22,8 +22,8 @@ public class TabGroupChatPlan implements Serializable{
 	private String chatContent;
 	private String creatorId;
 	private String creatorName;
-	private String modifyId;
-	private String modifyName;
+    private String modifierId;
+    private String modifierName;
 	private java.util.Date createTime;
 	private java.util.Date updateTime;
 	/**0已删除 1有效*/
@@ -44,8 +44,43 @@ public class TabGroupChatPlan implements Serializable{
 	private Integer successChatCount;
 	/**总群数*/
 	private Integer totalChatCount;
-	
-	public void setPlanId(Long planId){
+	   
+    private String wxEnterpriseId;
+    private String enterpriseId;
+    
+	public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public void setPlanId(Long planId){
 		this.planId = planId;
 	}
 	
@@ -87,20 +122,6 @@ public class TabGroupChatPlan implements Serializable{
 	public String getCreatorName(){
 		return creatorName;
 	}
-	public void setModifyId(String modifyId){
-		this.modifyId = modifyId;
-	}
-	
-	public String getModifyId(){
-		return modifyId;
-	}
-	public void setModifyName(String modifyName){
-		this.modifyName = modifyName;
-	}
-	
-	public String getModifyName(){
-		return modifyName;
-	}
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/chat/GroupChatBO.java

+package com.gic.haoban.manage.service.pojo.bo.chat;
+
+import java.io.Serializable ;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChat
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年11月25日 13:35:28
+ * @Modify
+ * @CopyRight 
+ */
+public class GroupChatBO implements Serializable{
+
+	private static final long serialVersionUID = 13124020287100L;
+	
+	/**主键*/
+	private Long groupChatId;
+	private String wxEnterpriseId;
+	/**群名称*/
+	private String name;
+	/**群主*/
+	private String staffId;
+	/**群id(企微)*/
+	private String wxChatId;
+	/**群创建时间*/
+	private java.util.Date chatAddTime;
+	/**群解散时间*/
+	private java.util.Date chatDissolveTime;
+	/**群公告*/
+	private String chatNotice;
+	/**群状态*/
+	private Integer chatStatus;
+	private java.util.Date createTime;
+	private java.util.Date updateTime;
+	/**是否删除1是0否*/
+	private Integer deleteFlag;
+	/**群成员数*/
+	private Integer totalCount;
+	/**群客户数*/
+	private Integer totalMemberCount;
+	/**新增总客户数*/
+	private Integer addMemberCount;
+	/**新增总成员数*/
+	private Integer addCount;
+	/**流失总成员数*/
+	private Integer quitCount;
+	/**流失总客户数*/
+	private Integer quitMemberCount;
+	/**gic企业ID*/
+	private String enterpriseId;
+	/**gic侧状态1可用,2不可用*/
+	private Integer statusFlag;
+	
+	public void setGroupChatId(Long groupChatId){
+		this.groupChatId = groupChatId;
+	}
+	
+	public Long getGroupChatId(){
+		return groupChatId;
+	}
+	public void setWxEnterpriseId(String wxEnterpriseId){
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	
+	public String getWxEnterpriseId(){
+		return wxEnterpriseId;
+	}
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return name;
+	}
+	public void setStaffId(String staffId){
+		this.staffId = staffId;
+	}
+	
+	public String getStaffId(){
+		return staffId;
+	}
+	public void setWxChatId(String wxChatId){
+		this.wxChatId = wxChatId;
+	}
+	
+	public String getWxChatId(){
+		return wxChatId;
+	}
+	public void setChatAddTime(java.util.Date chatAddTime){
+		this.chatAddTime = chatAddTime;
+	}
+	
+	public java.util.Date getChatAddTime(){
+		return chatAddTime;
+	}
+	public void setChatDissolveTime(java.util.Date chatDissolveTime){
+		this.chatDissolveTime = chatDissolveTime;
+	}
+	
+	public java.util.Date getChatDissolveTime(){
+		return chatDissolveTime;
+	}
+	public void setChatNotice(String chatNotice){
+		this.chatNotice = chatNotice;
+	}
+	
+	public String getChatNotice(){
+		return chatNotice;
+	}
+	public void setChatStatus(Integer chatStatus){
+		this.chatStatus = chatStatus;
+	}
+	
+	public Integer getChatStatus(){
+		return chatStatus;
+	}
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return createTime;
+	}
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return updateTime;
+	}
+	public void setDeleteFlag(Integer deleteFlag){
+		this.deleteFlag = deleteFlag;
+	}
+	
+	public Integer getDeleteFlag(){
+		return deleteFlag;
+	}
+	public void setTotalCount(Integer totalCount){
+		this.totalCount = totalCount;
+	}
+	
+	public Integer getTotalCount(){
+		return totalCount;
+	}
+	public void setTotalMemberCount(Integer totalMemberCount){
+		this.totalMemberCount = totalMemberCount;
+	}
+	
+	public Integer getTotalMemberCount(){
+		return totalMemberCount;
+	}
+	public void setAddMemberCount(Integer addMemberCount){
+		this.addMemberCount = addMemberCount;
+	}
+	
+	public Integer getAddMemberCount(){
+		return addMemberCount;
+	}
+	public void setAddCount(Integer addCount){
+		this.addCount = addCount;
+	}
+	
+	public Integer getAddCount(){
+		return addCount;
+	}
+	public void setQuitCount(Integer quitCount){
+		this.quitCount = quitCount;
+	}
+	
+	public Integer getQuitCount(){
+		return quitCount;
+	}
+	public void setQuitMemberCount(Integer quitMemberCount){
+		this.quitMemberCount = quitMemberCount;
+	}
+	
+	public Integer getQuitMemberCount(){
+		return quitMemberCount;
+	}
+	public void setEnterpriseId(String enterpriseId){
+		this.enterpriseId = enterpriseId;
+	}
+	
+	public String getEnterpriseId(){
+		return enterpriseId;
+	}
+	public void setStatusFlag(Integer statusFlag){
+		this.statusFlag = statusFlag;
+	}
+	
+	public Integer getStatusFlag(){
+		return statusFlag;
+	}
+}
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/chat/GroupChatPlanBO.java

+package com.gic.haoban.manage.service.pojo.bo.chat;
+
+import java.io.Serializable ;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChatPlan
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年11月25日 15:28:49
+ * @Modify
+ * @CopyRight 
+ */
+public class GroupChatPlanBO implements Serializable{
+
+	private static final long serialVersionUID = 21576537277600L;
+	
+	   
+    private String wxEnterpriseId;
+    private String enterpriseId;
+	private Long planId;
+	private String name;
+	private String remark;
+	/**[{relation_id:素材id,content:回显示内容}]*/
+	private String chatContent;
+	private String creatorId;
+	private String creatorName;
+    private String modifierId;
+    private String modifierName;
+	private java.util.Date createTime;
+	private java.util.Date updateTime;
+	/**0已删除 1有效*/
+	private Integer statusFlag;
+	/**1立即发送 2定时发送*/
+	private Integer sendType;
+	private java.util.Date sendTime;
+	private java.util.Date startTime;
+	private java.util.Date endTime;
+	/**几天后失效*/
+	private Integer expireDays;
+	private String staffIdList;
+	/**群主数量*/
+	private Integer staffCount;
+	/**已完成任务的群主数量*/
+	private Integer sendCount;
+	/**已送达数的群数*/
+	private Integer successChatCount;
+	/**总群数*/
+	private Integer totalChatCount;
+	
+	public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public void setPlanId(Long planId){
+		this.planId = planId;
+	}
+	
+	public Long getPlanId(){
+		return planId;
+	}
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return name;
+	}
+	public void setRemark(String remark){
+		this.remark = remark;
+	}
+	
+	public String getRemark(){
+		return remark;
+	}
+	public void setChatContent(String chatContent){
+		this.chatContent = chatContent;
+	}
+	
+	public String getChatContent(){
+		return chatContent;
+	}
+	public void setCreatorId(String creatorId){
+		this.creatorId = creatorId;
+	}
+	
+	public String getCreatorId(){
+		return creatorId;
+	}
+	public void setCreatorName(String creatorName){
+		this.creatorName = creatorName;
+	}
+	
+	public String getCreatorName(){
+		return creatorName;
+	}
+	
+	public String getModifierId() {
+        return modifierId;
+    }
+
+    public String getModifierName() {
+        return modifierName;
+    }
+
+    public void setModifierId(String modifierId) {
+        this.modifierId = modifierId;
+    }
+
+    public void setModifierName(String modifierName) {
+        this.modifierName = modifierName;
+    }
+
+    public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return createTime;
+	}
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return updateTime;
+	}
+	public void setStatusFlag(Integer statusFlag){
+		this.statusFlag = statusFlag;
+	}
+	
+	public Integer getStatusFlag(){
+		return statusFlag;
+	}
+	public void setSendType(Integer sendType){
+		this.sendType = sendType;
+	}
+	
+	public Integer getSendType(){
+		return sendType;
+	}
+	public void setSendTime(java.util.Date sendTime){
+		this.sendTime = sendTime;
+	}
+	
+	public java.util.Date getSendTime(){
+		return sendTime;
+	}
+	public void setStartTime(java.util.Date startTime){
+		this.startTime = startTime;
+	}
+	
+	public java.util.Date getStartTime(){
+		return startTime;
+	}
+	public void setEndTime(java.util.Date endTime){
+		this.endTime = endTime;
+	}
+	
+	public java.util.Date getEndTime(){
+		return endTime;
+	}
+	public void setExpireDays(Integer expireDays){
+		this.expireDays = expireDays;
+	}
+	
+	public Integer getExpireDays(){
+		return expireDays;
+	}
+	public void setStaffIdList(String staffIdList){
+		this.staffIdList = staffIdList;
+	}
+	
+	public String getStaffIdList(){
+		return staffIdList;
+	}
+	public void setStaffCount(Integer staffCount){
+		this.staffCount = staffCount;
+	}
+	
+	public Integer getStaffCount(){
+		return staffCount;
+	}
+	public void setSendCount(Integer sendCount){
+		this.sendCount = sendCount;
+	}
+	
+	public Integer getSendCount(){
+		return sendCount;
+	}
+	public void setSuccessChatCount(Integer successChatCount){
+		this.successChatCount = successChatCount;
+	}
+	
+	public Integer getSuccessChatCount(){
+		return successChatCount;
+	}
+	public void setTotalChatCount(Integer totalChatCount){
+		this.totalChatCount = totalChatCount;
+	}
+	
+	public Integer getTotalChatCount(){
+		return totalChatCount;
+	}
+}
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/chat/GroupChatUserBO.java

+package com.gic.haoban.manage.service.pojo.bo.chat;
+
+import java.io.Serializable ;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChatUser
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年11月25日 15:42:52
+ * @Modify
+ * @CopyRight 
+ */
+public class GroupChatUserBO implements Serializable{
+
+	private static final long serialVersionUID = 21771431486600L;
+	
+	private Long chatUserId;
+	/**微信企业id*/
+	private String wxEnterpriseId;
+	private String enterpriseId;
+	/**1企业成员2外部联系人3客户*/
+	private Integer userType;
+	/**入群时间*/
+	private java.util.Date joinTime;
+	/**姓名*/
+	private String userName;
+	/**昵称*/
+	private String nickName;
+	/**群成员id*/
+	private String userId;
+	/**unionid*/
+	private String unionid;
+	private String memberId;
+	/**邀请者*/
+	private String invitorUserId;
+	private java.util.Date createTime;
+	private java.util.Date updateTime;
+	/**1是0否*/
+	private Integer deleteFlag;
+	/**群id*/
+	private Long groupChatId;
+	/**1有效 2已退群*/
+	private Integer statusFlag;
+	/**用户退群时间*/
+	private java.util.Date userQuitTime;
+	/**0自己退群 1 - 群主/群管理员移出*/
+	private Integer quitScene;
+	/**0 - 由成员邀请入群（包括直接邀请入群和通过邀请链接入群）3 - 通过扫描群二维码入群*/
+	private Integer joinScene;
+	/**入群说明*/
+	private String joinRemark;
+	private String joinState;
+	
+	public void setChatUserId(Long chatUserId){
+		this.chatUserId = chatUserId;
+	}
+	
+	public Long getChatUserId(){
+		return chatUserId;
+	}
+	public void setWxEnterpriseId(String wxEnterpriseId){
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+	
+	public String getWxEnterpriseId(){
+		return wxEnterpriseId;
+	}
+	public void setEnterpriseId(String enterpriseId){
+		this.enterpriseId = enterpriseId;
+	}
+	
+	public String getEnterpriseId(){
+		return enterpriseId;
+	}
+	public void setUserType(Integer userType){
+		this.userType = userType;
+	}
+	
+	public Integer getUserType(){
+		return userType;
+	}
+	public void setJoinTime(java.util.Date joinTime){
+		this.joinTime = joinTime;
+	}
+	
+	public java.util.Date getJoinTime(){
+		return joinTime;
+	}
+	public void setUserName(String userName){
+		this.userName = userName;
+	}
+	
+	public String getUserName(){
+		return userName;
+	}
+	public void setNickName(String nickName){
+		this.nickName = nickName;
+	}
+	
+	public String getNickName(){
+		return nickName;
+	}
+	public void setUserId(String userId){
+		this.userId = userId;
+	}
+	
+	public String getUserId(){
+		return userId;
+	}
+	public void setUnionid(String unionid){
+		this.unionid = unionid;
+	}
+	
+	public String getUnionid(){
+		return unionid;
+	}
+	public void setMemberId(String memberId){
+		this.memberId = memberId;
+	}
+	
+	public String getMemberId(){
+		return memberId;
+	}
+	public void setInvitorUserId(String invitorUserId){
+		this.invitorUserId = invitorUserId;
+	}
+	
+	public String getInvitorUserId(){
+		return invitorUserId;
+	}
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return createTime;
+	}
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return updateTime;
+	}
+	public void setDeleteFlag(Integer deleteFlag){
+		this.deleteFlag = deleteFlag;
+	}
+	
+	public Integer getDeleteFlag(){
+		return deleteFlag;
+	}
+	public void setGroupChatId(Long groupChatId){
+		this.groupChatId = groupChatId;
+	}
+	
+	public Long getGroupChatId(){
+		return groupChatId;
+	}
+	public void setStatusFlag(Integer statusFlag){
+		this.statusFlag = statusFlag;
+	}
+	
+	public Integer getStatusFlag(){
+		return statusFlag;
+	}
+	public void setUserQuitTime(java.util.Date userQuitTime){
+		this.userQuitTime = userQuitTime;
+	}
+	
+	public java.util.Date getUserQuitTime(){
+		return userQuitTime;
+	}
+	public void setQuitScene(Integer quitScene){
+		this.quitScene = quitScene;
+	}
+	
+	public Integer getQuitScene(){
+		return quitScene;
+	}
+	public void setJoinScene(Integer joinScene){
+		this.joinScene = joinScene;
+	}
+	
+	public Integer getJoinScene(){
+		return joinScene;
+	}
+	public void setJoinRemark(String joinRemark){
+		this.joinRemark = joinRemark;
+	}
+	
+	public String getJoinRemark(){
+		return joinRemark;
+	}
+	public void setJoinState(String joinState){
+		this.joinState = joinState;
+	}
+	
+	public String getJoinState(){
+		return joinState;
+	}
+}
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatPlanService.java

 package com.gic.haoban.manage.service.service.chat;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatPlanBO;
+
 public interface GroupChatPlanService {
 	
-	
+    public void save(GroupChatPlanDTO dto);
+
+    GroupChatPlanBO getById(Long hmId);
+
+    public Page<GroupChatPlanBO> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo);
+    
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatService.java

 package com.gic.haoban.manage.service.service.chat;
 
+import java.util.List;
+
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatBO;
+
 public interface GroupChatService {
 
     // 解散群
@@ -19,4 +26,40 @@ public interface GroupChatService {
 
     // 定时初始化新建的群
     public void initGroupChatForTimer(String params);
+
+    /**
+     * 
+    * @Title: refreshChatInfo
+    * @Description: 重新刷新整个群
+    * @author xugh
+    * @param chatHmId
+    * @throws
+     */
+    public void refreshChatInfo(Long chatHmId);
+
+    /**
+     * 
+    * @Title: detail
+    * @Description: 详情
+    * @author xugh
+    * @param wxEnterpriseId
+    * @param groupChatId
+    * @return
+    * @throws
+     */
+    public GroupChatBO detail(String wxEnterpriseId, Long groupChatId);
+
+    /**
+     * 
+    * @Title: listPage
+    * @Description: 群列表
+    * @author xugh
+    * @param qdto
+    * @param basePageInfo
+    * @return
+    * @throws
+     */
+    public Page<GroupChatBO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo);
+
+    public void updateChatEnterpriseId(String wxEnterpriseId, String enterpriseId, List<Long> groupChatIdList);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

 package com.gic.haoban.manage.service.service.chat.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
+import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatPlanMapper;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatPlanBO;
 import com.gic.haoban.manage.service.service.chat.GroupChatPlanService;
+import com.github.pagehelper.PageHelper;
 
 @Service
-public class GroupChatPlanServiceImpl implements GroupChatPlanService{
-	
-	
+public class GroupChatPlanServiceImpl implements GroupChatPlanService {
+
+    @Autowired
+    private GroupChatPlanMapper groupChatPlanMapper;
+
+    @Override
+    public void save(GroupChatPlanDTO dto) {
+        TabGroupChatPlan entity = EntityUtil.changeEntityByJSON(TabGroupChatPlan.class, dto);
+        this.groupChatPlanMapper.insert(entity);
+    }
+
+    @Override
+    public GroupChatPlanBO getById(Long planId) {
+        TabGroupChatPlan plan = this.groupChatPlanMapper.selectById(planId);
+        GroupChatPlanBO bo = EntityUtil.changeEntityByJSON(GroupChatPlanBO.class, plan);
+        return bo;
+    }
+
+    @Override
+    public Page<GroupChatPlanBO> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        PageHelper.startPage(basePageInfo);
+        List<TabGroupChatPlan> list = this.groupChatPlanMapper.list(qdto);
+        Page<GroupChatPlanBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatPlanBO.class);
+        return retPage;
+    }
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -15,10 +15,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.SecretSettingDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
@@ -31,6 +36,7 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.chat.TabChatNotice;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChat;
 import com.gic.haoban.manage.service.entity.chat.TabGroupChatUser;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatBO;
 import com.gic.haoban.manage.service.service.SecretSettingService;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
@@ -41,6 +47,7 @@ import com.gic.wechat.api.dto.qywx.chat.GroupChatDetailMemberDTO;
 import com.gic.wechat.api.dto.qywx.chat.GroupChatListDTO;
 import com.gic.wechat.api.dto.qywx.chat.GroupChatListItemDTO;
 import com.gic.wechat.api.service.qywx.QywxChatApiService;
+import com.github.pagehelper.PageHelper;
 
 @Service("groupChatService")
 public class GroupChatServiceImpl implements GroupChatService {
@@ -126,6 +133,37 @@ public class GroupChatServiceImpl implements GroupChatService {
     }
 
     @Override
+    public void refreshChatInfo(Long groupChatId) {
+        TabGroupChat chat = this.groupChatMapper.selectById(groupChatId);
+        if (null == chat) {
+            logger.info("群主变更事件,群不存在");
+            return;
+        }
+        String wxEnterpriseId = chat.getWxEnterpriseId();
+        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+        this.updateGroupChatDetail(qwDTO, chat, true);
+    }
+
+    @Override
+    public GroupChatBO detail(String wxEnterpriseId, Long groupChatId) {
+        TabGroupChat chat = this.groupChatMapper.selectById(groupChatId);
+        return EntityUtil.changeEntity(GroupChatBO.class, chat);
+    }
+
+    @Override
+    public Page<GroupChatBO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
+        PageHelper.startPage(basePageInfo);
+        List<TabGroupChat> list = this.groupChatMapper.list(qdto);
+        Page<GroupChatBO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatBO.class);
+        return retPage;
+    }
+
+    @Override
+    public void updateChatEnterpriseId(String wxEnterpriseId, String enterpriseId, List<Long> groupChatIdList) {
+
+    }
+
+    @Override
     public void handChatNotice(String params) {
         List<TabChatNotice> list = this.chatNoticeMapper.listAll();
         this.chatNoticeMapper.closeAll();
@@ -270,7 +308,11 @@ public class GroupChatServiceImpl implements GroupChatService {
             chat.setStatusFlag(0);
             chat.setDeleteFlag(0);
             chat.setTotalCount(0);
-            chat.setInitFlag(0);
+            if (syncDetailFlag) {
+                chat.setInitFlag(2);
+            } else {
+                chat.setInitFlag(0);
+            }
             chat.setTotalMemberCount(0);
             chat.setAddMemberCount(0);
             chat.setAddCount(0);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/HaobanTimerApiServiceImpl.java

@@ -45,7 +45,7 @@ public class HaobanTimerApiServiceImpl implements HaobanTimerApiService {
         this.groupChatService.handChatNotice(params);
         return ServiceResponse.success();
     }
-    
+
     @Override
     public ServiceResponse<Void> initGroupChat(String params) {
         this.groupChatService.initGroupChatForTimer(params);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl.chat;
 
+import java.util.List;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.chat.ChatEventDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatBO;
 import com.gic.haoban.manage.service.service.chat.GroupChatService;
 
 @Service("groupChatApiService")
@@ -20,6 +29,33 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
     private GroupChatService groupChatService;
 
     @Override
+    public ServiceResponse<Page<GroupChatDTO>> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
+        Page<GroupChatBO> page = this.groupChatService.listPage(qdto, basePageInfo);
+        Page<GroupChatDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatDTO.class);
+        return ServiceResponse.success(resultPage);
+    }
+
+    @Override
+    public ServiceResponse<GroupChatDTO> detail(String wxEnterpriseId, Long groupChatId) {
+        GroupChatBO bo = this.groupChatService.detail(wxEnterpriseId, groupChatId);
+        GroupChatDTO dto = EntityUtil.changeEntityByJSON(GroupChatDTO.class, bo);
+        return ServiceResponse.success(dto);
+    }
+
+    @Override
+    public ServiceResponse<Void> refreshChatInfo(Long chatHmId) {
+        this.groupChatService.refreshChatInfo(chatHmId);
+        return ServiceResponse.success();
+    }
+    
+    @Override
+    public ServiceResponse<Void> updateChatEnterpriseId(String wxEnterpriseId, String enterpriseId,
+            List<Long> groupChatIdList) {
+        this.groupChatService.updateChatEnterpriseId(wxEnterpriseId,enterpriseId,groupChatIdList);
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<Void> qwEventNotice(ChatEventDTO dto) {
         logger.info("收到群事件,params={}", JSON.toJSONString(dto));
         String changeType = dto.getChangeType();
@@ -33,7 +69,7 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
             this.groupChatService.createChat(corpid, wxChatId);
         } else {
             String updateDetail = dto.getUpdateDetail();
-            this.groupChatService.updateChat(corpid, wxChatId, updateDetail , JSON.toJSONString(dto));
+            this.groupChatService.updateChat(corpid, wxChatId, updateDetail, JSON.toJSONString(dto));
         }
         return ServiceResponse.success();
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatPlanApiServiceImpl.java

 package com.gic.haoban.manage.service.service.out.impl.chat;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
 import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
+import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatPlanBO;
+import com.gic.haoban.manage.service.service.chat.GroupChatPlanService;
 
 @Service("groupChatPlanApiService")
 public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
 
+    @Autowired
+    private GroupChatPlanService groupChatPlanService;
+
+    @Override
+    public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        Page<GroupChatPlanBO> page = this.groupChatPlanService.listPage(qdto, basePageInfo);
+        Page<GroupChatPlanDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatPlanDTO.class);
+        return ServiceResponse.success(resultPage);
+    }
+
+    @Override
+    public ServiceResponse<GroupChatPlanDTO> detail(Long chatPlanId) {
+        GroupChatPlanBO bo = this.groupChatPlanService.getById(chatPlanId);
+        GroupChatPlanDTO dto = EntityUtil.changeEntityByJSON(GroupChatPlanDTO.class, bo);
+        return ServiceResponse.success(dto);
+    }
+
+    @Override
+    public ServiceResponse<GroupChatPlanDTO> save(GroupChatPlanDTO dto) {
+        this.groupChatPlanService.save(dto);
+        return ServiceResponse.success(dto);
+    }
+
 }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gic.haoban.manage.service.dao.mapper.chat.GroupChatPlanMapper">
-  <resultMap type="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan" id="result-map-tabHaobanGroupChatPlan">
-      <result column="plan_id"  property="planId"/>
-      <result column="name"  property="name"/>
-      <result column="remark"  property="remark"/>
-      <result column="chat_content"  property="chatContent"/>
-      <result column="creator_id"  property="creatorId"/>
-      <result column="creator_name"  property="creatorName"/>
-      <result column="modify_id"  property="modifyId"/>
-      <result column="modify_name"  property="modifyName"/>
-      <result column="create_time"  property="createTime"/>
-      <result column="update_time"  property="updateTime"/>
-      <result column="status_flag"  property="statusFlag"/>
-      <result column="send_type"  property="sendType"/>
-      <result column="send_time"  property="sendTime"/>
-      <result column="start_time"  property="startTime"/>
-      <result column="end_time"  property="endTime"/>
-      <result column="expire_days"  property="expireDays"/>
-      <result column="staff_id_list"  property="staffIdList"/>
-      <result column="staff_count"  property="staffCount"/>
-      <result column="send_count"  property="sendCount"/>
-      <result column="success_chat_count"  property="successChatCount"/>
-      <result column="total_chat_count"  property="totalChatCount"/>
-  </resultMap>
-  <sql id="Base_Column_List">
-	  plan_id,
-	  name,
-	  remark,
-	  chat_content,
-	  creator_id,
-	  creator_name,
-	  modify_id,
-	  modify_name,
-	  create_time,
-	  update_time,
-	  status_flag,
-	  send_type,
-	  send_time,
-	  start_time,
-	  end_time,
-	  expire_days,
-	  staff_id_list,
-	  staff_count,
-	  send_count,
-	  success_chat_count,
-	  total_chat_count
-  </sql>
-  <!-- ===================== 新增 ======================== -->
-  <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan">
+<mapper
+	namespace="com.gic.haoban.manage.service.dao.mapper.chat.GroupChatPlanMapper">
+	<resultMap type="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan"
+		id="result-map-tabHaobanGroupChatPlan">
+		<result column="plan_id" property="planId" />
+		<result column="name" property="name" />
+		<result column="remark" property="remark" />
+		<result column="wx_enterprise_id" property="wxEnterpriseId" />
+		<result column="enterprise_id" property="enterpriseId" />
+		<result column="chat_content" property="chatContent" />
+		<result column="creator_id" property="creatorId" />
+		<result column="creator_name" property="creatorName" />
+		<result column="modifier_id" property="modifierId" />
+		<result column="modifier_name" property="modifierName" />
+		<result column="create_time" property="createTime" />
+		<result column="update_time" property="updateTime" />
+		<result column="status_flag" property="statusFlag" />
+		<result column="send_type" property="sendType" />
+		<result column="send_time" property="sendTime" />
+		<result column="start_time" property="startTime" />
+		<result column="end_time" property="endTime" />
+		<result column="expire_days" property="expireDays" />
+		<result column="staff_id_list" property="staffIdList" />
+		<result column="staff_count" property="staffCount" />
+		<result column="send_count" property="sendCount" />
+		<result column="success_chat_count" property="successChatCount" />
+		<result column="total_chat_count" property="totalChatCount" />
+	</resultMap>
+	<sql id="Base_Column_List">
+		plan_id,
+		name,
+		remark,
+		chat_content,
+		creator_id,
+		creator_name,
+		modifier_id,
+		modifier_name,
+		create_time,
+		update_time,
+		status_flag,
+		send_type,
+		send_time,
+		start_time,
+		end_time,
+		expire_days,
+		staff_id_list,
+		staff_count,
+		send_count,
+		success_chat_count,
+		total_chat_count , wx_enterprise_id , enterprise_id
+	</sql>
+	<!-- ===================== 新增 ======================== -->
+	<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan">
   <![CDATA[
   INSERT INTO tab_haoban_group_chat_plan(
 	  plan_id,
@@ -57,8 +61,8 @@
 	  chat_content,
 	  creator_id,
 	  creator_name,
-	  modify_id,
-	  modify_name,
+	  modifier_id,
+	  modifier_name,
 	  create_time,
 	  update_time,
 	  status_flag,
@@ -71,74 +75,69 @@
 	  staff_count,
 	  send_count,
 	  success_chat_count,
-	  total_chat_count
+	  total_chat_count , wx_enterprise_id , enterprise_id
   )VALUES(
-	  #{planId,jdbcType=BIGINT},
-	  #{name,jdbcType=VARCHAR},
-	  #{remark,jdbcType=VARCHAR},
+	  #{planId},
+	  #{name},
+	  #{remark},
 	  #{chatContent},
-	  #{creatorId,jdbcType=VARCHAR},
-	  #{creatorName,jdbcType=VARCHAR},
-	  #{modifyId,jdbcType=VARCHAR},
-	  #{modifyName,jdbcType=VARCHAR},
-	  #{createTime,jdbcType=TIMESTAMP},
-	  #{updateTime,jdbcType=TIMESTAMP},
-	  #{statusFlag,jdbcType=INTEGER},
-	  #{sendType,jdbcType=INTEGER},
-	  #{sendTime,jdbcType=TIMESTAMP},
-	  #{startTime,jdbcType=TIMESTAMP},
-	  #{endTime,jdbcType=TIMESTAMP},
-	  #{expireDays,jdbcType=INTEGER},
-	  #{staffIdList,jdbcType=VARCHAR},
-	  #{staffCount,jdbcType=INTEGER},
-	  #{sendCount,jdbcType=INTEGER},
-	  #{successChatCount,jdbcType=INTEGER},
-	  #{totalChatCount,jdbcType=INTEGER}
+	  #{creatorId},
+	  #{creatorName},
+	  #{modifierId},
+	  #{modifierName},
+	  #{createTime},
+	  #{updateTime},
+	  #{statusFlag},
+	  #{sendType},
+	  #{sendTime},
+	  #{startTime},
+	  #{endTime},
+	  #{expireDays},
+	  #{staffIdList},
+	  #{staffCount},
+	  #{sendCount},
+	  #{successChatCount},
+	  #{totalChatCount} , #{wxEnterpriseId} , #{enterpriseId}
   )
   ]]>
-  </insert>
-  
-   <!-- =====================删除==================== -->
-  <update id="deleteByPrimaryKey" parameterType="long">
-    UPDATE  tab_haoban_group_chat_plan SET delete_flag = 1 WHERE plan_id = #{planId}
-  </update>
-  
-  
-   <!-- ==================更新 ========== -->
-  <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan">
-  <![CDATA[
-  UPDATE tab_haoban_group_chat_plan SET
-	  plan_id=#{planId,jdbcType=BIGINT},
-	  name=#{name,jdbcType=VARCHAR},
-	  remark=#{remark,jdbcType=VARCHAR},
-	  chat_content=#{chatContent},
-	  creator_id=#{creatorId,jdbcType=VARCHAR},
-	  creator_name=#{creatorName,jdbcType=VARCHAR},
-	  modify_id=#{modifyId,jdbcType=VARCHAR},
-	  modify_name=#{modifyName,jdbcType=VARCHAR},
-	  create_time=#{createTime,jdbcType=TIMESTAMP},
-	  update_time=#{updateTime,jdbcType=TIMESTAMP},
-	  status_flag=#{statusFlag,jdbcType=INTEGER},
-	  send_type=#{sendType,jdbcType=INTEGER},
-	  send_time=#{sendTime,jdbcType=TIMESTAMP},
-	  start_time=#{startTime,jdbcType=TIMESTAMP},
-	  end_time=#{endTime,jdbcType=TIMESTAMP},
-	  expire_days=#{expireDays,jdbcType=INTEGER},
-	  staff_id_list=#{staffIdList,jdbcType=VARCHAR},
-	  staff_count=#{staffCount,jdbcType=INTEGER},
-	  send_count=#{sendCount,jdbcType=INTEGER},
-	  success_chat_count=#{successChatCount,jdbcType=INTEGER},
-	  total_chat_count=#{totalChatCount,jdbcType=INTEGER}
-  where plan_id = #{planId}
-  ]]>
-  </update>
-  
-  <!-- ============ 查询=============-->
-  <select id="selectById" parameterType="long" resultMap="result-map-tabHaobanGroupChatPlan">
-  SELECT * FROM tab_haoban_group_chat_plan WHERE plan_id = #{planId}
-  </select>
-  
-  <select id="listAll"  parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan" resultMap="result-map-tabHaobanGroupChatPlan">
-  	 select * from tab_haoban_group_chat_plan 
-  </select>
+	</insert>
+
+	<!-- =====================删除==================== -->
+	<update id="deleteById" parameterType="long">
+		UPDATE tab_haoban_group_chat_plan SET delete_flag = 1 WHERE plan_id = #{planId}
+	</update>
+
+
+	<!-- ==================更新 ========== -->
+	<update id="updateById"
+		parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatPlan">
+		  <![CDATA[
+		  UPDATE tab_haoban_group_chat_plan SET
+			  name=#{name},
+			  remark=#{remark},
+			  chat_content=#{chatContent},
+			  creator_id=#{creatorId},
+			  creator_name=#{creatorName},
+			  modifier_id=#{modifierId},
+			  modifier_name=#{modifierName},
+			  update_time=now(),
+			  send_type=#{sendType},
+			  send_time=#{sendTime},
+			  start_time=#{startTime},
+			  end_time=#{endTime},
+			  expire_days=#{expireDays},
+			  staff_id_list=#{staffIdList}
+		  where plan_id = #{planId}
+		  ]]>
+	</update>
+
+	<!-- ============ 查询============= -->
+	<select id="selectById" parameterType="long" resultMap="result-map-tabHaobanGroupChatPlan">
+		SELECT <include refid="Base_Column_List" /> FROM tab_haoban_group_chat_plan WHERE plan_id = #{planId} and delete_flag = 0
+	</select>
+
+	<select id="list" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO"
+		resultMap="result-map-tabHaobanGroupChatPlan">
+		select  <include refid="Base_Column_List" /> from tab_haoban_group_chat_plan
+	</select>
 </mapper> 
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatController.java

 package com.gic.haoban.manage.web.controller.chat;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.manage.api.dto.chat.GroupChatDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
+import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
+
 /**
  * 
 * @ClassName: GroupChatController
@@ -12,9 +25,40 @@ import org.springframework.web.bind.annotation.RestController;
 *
  */
 @RestController
-@RequestMapping("/chat/hm")
+@RequestMapping("/chat")
 public class GroupChatController {
 
-    //
+    @Autowired
+    private GroupChatApiService groupChatApiService;
+
+    @RequestMapping("set-gic-enterprise")
+    public RestResponse<Object> save(@RequestBody GroupChatHmDTO dto) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        this.groupChatApiService.updateChatEnterpriseId(wxEnterpriseId, enterpriseId, null);
+        return RestResponse.successResult();
+    }
+
+    @RequestMapping("page")
+    public RestResponse<Object> page(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
+        return RestResponse.successResult(page.getResult());
+    }
+
+    @RequestMapping("detail")
+    public RestResponse<Object> detail(Long groupChatId) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        ServiceResponse<GroupChatDTO> linkResp = this.groupChatApiService.detail(loginUser.getWxEnterpriseId(),
+                groupChatId);
+        if (!linkResp.isSuccess()) {
+            return RestResponse.failure("1", "群不存在");
+        }
+        GroupChatDTO dto = linkResp.getResult();
+        return RestResponse.successResult(dto);
+    }
 
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatPlanController.java

 package com.gic.haoban.manage.web.controller.chat;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
+import com.gic.haoban.manage.api.dto.chat.GroupChatPlanDTO;
+import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO;
+import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
+
 /**
  * 
 * @ClassName: GroupChatPlanController
@@ -15,4 +27,48 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/chat/plan")
 public class GroupChatPlanController {
 
+    @Autowired
+    private GroupChatPlanApiService groupChatPlanApiService;
+
+    @RequestMapping("add")
+    public RestResponse<Object> save(@RequestBody GroupChatPlanDTO dto) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        dto.setCreatorId(loginUser.getClerkId());
+        dto.setCreatorName(loginUser.getClerkName());
+        dto.setModifierId(loginUser.getClerkId());
+        dto.setModifierName(loginUser.getClerkName());
+        dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        dto.setEnterpriseId(loginUser.getEnterpriseId());
+        this.groupChatPlanApiService.save(dto);
+        return RestResponse.successResult();
+    }
+
+    @RequestMapping("update")
+    public RestResponse<Object> update(@RequestBody GroupChatPlanDTO dto) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        dto.setModifierId(loginUser.getClerkId());
+        dto.setModifierName(loginUser.getClerkName());
+        this.groupChatPlanApiService.save(dto);
+        return RestResponse.successResult();
+    }
+
+    @RequestMapping("page")
+    public RestResponse<Object> page(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        ServiceResponse<Page<GroupChatPlanDTO>> page = this.groupChatPlanApiService.listPage(qdto, basePageInfo);
+        return RestResponse.successResult(page.getResult());
+    }
+
+    @RequestMapping("detail")
+    public RestResponse<Object> detail(Long planId) {
+        ServiceResponse<GroupChatPlanDTO> linkResp = this.groupChatPlanApiService.detail(planId);
+        if (!linkResp.isSuccess()) {
+            return RestResponse.failure("1", "计划不存在");
+        }
+        GroupChatPlanDTO hm = linkResp.getResult();
+        return RestResponse.successResult(hm);
+    }
+
 }