历史群主

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

@@ -2,8 +2,6 @@ package com.gic.haoban.manage.api.dto.chat;
 
 import java.io.Serializable;
 
-import com.gic.haoban.manage.api.dto.StaffDTO;
-
 /**
  * 
  * @ClassName: TabHaobanGroupChatOwner
@@ -13,13 +11,13 @@ import com.gic.haoban.manage.api.dto.StaffDTO;
  * @Modify
  * @CopyRight 
  */
-public class GroupChatOwnerDTO extends StaffDTO implements Serializable {
+public class GroupChatOwnerDTO  implements Serializable {
 
     private static final long serialVersionUID = 237823065250200L;
 
     /**成员ID*/
     private String staffId;
-    private String staffName;
+    private String staffName ;
     private String wxEnterpriseId;
     /**群数量*/
     private Integer chatCount;

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

+package com.gic.haoban.manage.api.dto.chat;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChatOwnerHistory
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年12月06日 13:19:52
+ * @Modify
+ * @CopyRight 
+ */
+public class GroupChatOwnerHistoryDTO implements Serializable {
+
+    private static final long serialVersionUID = 62032705461900L;
+
+    private Long ownerHistoryId;
+    private String wxEnterpriseId;
+    private Long groupChatId;
+    private String staffId;
+    private String staffName;
+    private java.util.Date createTime;
+    private java.util.Date endTime;
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public void setOwnerHistoryId(Long ownerHistoryId) {
+        this.ownerHistoryId = ownerHistoryId;
+    }
+
+    public Long getOwnerHistoryId() {
+        return ownerHistoryId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setGroupChatId(Long groupChatId) {
+        this.groupChatId = groupChatId;
+    }
+
+    public Long getGroupChatId() {
+        return groupChatId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public java.util.Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setEndTime(java.util.Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public java.util.Date getEndTime() {
+        return endTime;
+    }
+}
\ No newline at end of file

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

@@ -8,6 +8,7 @@ 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.chat.GroupChatOwnerDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
@@ -110,4 +111,16 @@ public interface GroupChatApiService {
      */
     public ServiceResponse<Page<GroupChatOwnerDTO>> listOwnerPage(OwnerSearchQDTO qdto, BasePageInfo basePageInfo);
 
+    /**
+     * 
+    * @Title: listOwnerHistory
+    * @Description: 历史群主
+    * @author xugh
+    * @param groupChatId
+    * @param WxEnterpriseId
+    * @return
+    * @throws
+     */
+    public ServiceResponse<List<GroupChatOwnerHistoryDTO>> listOwnerHistory(Long groupChatId, String WxEnterpriseId);
+
 }

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

+package com.gic.haoban.manage.service.dao.mapper.chat;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
+import com.gic.haoban.manage.service.entity.chat.TabGroupChatOwnerHistory;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChatOwnerHistoryMapper
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年12月06日 13:19:52
+ * @Modify
+ * @CopyRight 
+ */
+public interface GroupChatOwnerHistoryMapper {
+
+    public int insert(TabGroupChatOwnerHistory entity);
+
+    public int updateOwnerEnd(@Param("groupChatId") Long groupChatId, @Param("staffId") String staffId);
+
+    public List<GroupChatOwnerHistoryDTO> listAll(@Param("groupChatId")Long groupChatId,@Param("wxEnterpriseId") String wxEnterpriseId);
+
+}
\ No newline at end of file

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

+package com.gic.haoban.manage.service.entity.chat;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @ClassName: TabHaobanGroupChatOwnerHistory
+ * @Description: TODO
+ * @Author 徐高华
+ * @Date 2022年12月06日 13:19:52
+ * @Modify
+ * @CopyRight 
+ */
+public class TabGroupChatOwnerHistory implements Serializable {
+
+    private static final long serialVersionUID = 62032705461900L;
+
+    private Long ownerHistoryId;
+    private String wxEnterpriseId;
+    private Long groupChatId;
+    private String staffId;
+    private java.util.Date createTime;
+    private java.util.Date endTime;
+
+    public void setOwnerHistoryId(Long ownerHistoryId) {
+        this.ownerHistoryId = ownerHistoryId;
+    }
+
+    public Long getOwnerHistoryId() {
+        return ownerHistoryId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setGroupChatId(Long groupChatId) {
+        this.groupChatId = groupChatId;
+    }
+
+    public Long getGroupChatId() {
+        return groupChatId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setCreateTime(java.util.Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public java.util.Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setEndTime(java.util.Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public java.util.Date getEndTime() {
+        return endTime;
+    }
+}
\ No newline at end of file

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

@@ -5,6 +5,7 @@ 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.chat.GroupChatOwnerDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatBO;
@@ -80,4 +81,16 @@ public interface GroupChatService {
     * @throws
      */
     public Page<GroupChatOwnerDTO> listOwnerPage(OwnerSearchQDTO qdto, BasePageInfo basePageInfo);
+
+    /**
+     * 
+    * @Title: listOwnerHistory
+    * @Description: 群主历史
+    * @author xugh
+    * @param groupChatId
+    * @param WxEnterpriseId
+    * @return
+    * @throws
+     */
+    public List<GroupChatOwnerHistoryDTO> listOwnerHistory(Long groupChatId, String WxEnterpriseId);
 }
\ No newline at end of file

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

@@ -26,6 +26,7 @@ import com.gic.haoban.manage.api.dto.SecretSettingDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
@@ -34,6 +35,7 @@ import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.ChatNoticeMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatMapper;
+import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatOwnerHistoryMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatOwnerMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.GroupChatUserMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
@@ -86,6 +88,9 @@ public class GroupChatServiceImpl implements GroupChatService {
     private Config config;
     @Autowired
     private GroupChatOwnerMapper groupChatOwnerMapper;
+    @Autowired
+    private GroupChatOwnerHistoryMapper groupChatOwnerHistoryMapper;
+
     // 每次拉取成员数
     private int pageSize = 10;
     // 每次拉取群数
@@ -577,4 +582,10 @@ public class GroupChatServiceImpl implements GroupChatService {
         Page<GroupChatOwnerDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatOwnerDTO.class);
         return retPage;
     }
+    
+    @Override
+    public List<GroupChatOwnerHistoryDTO> listOwnerHistory(Long groupChatId , String WxEnterpriseId) {
+        List<GroupChatOwnerHistoryDTO> list = this.groupChatOwnerHistoryMapper.listAll(groupChatId,WxEnterpriseId);
+        return list;
+    }
 }
\ No newline at end of file

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

@@ -17,6 +17,7 @@ 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.chat.GroupChatOwnerDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
@@ -114,4 +115,9 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
         return ServiceResponse.success();
     }
     
+    @Override
+    public ServiceResponse<List<GroupChatOwnerHistoryDTO>> listOwnerHistory(Long groupChatId, String WxEnterpriseId) {
+        return ServiceResponse.success(this.groupChatService.listOwnerHistory(groupChatId, WxEnterpriseId));
+    }
+    
 }

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatOwnerHistoryMapper.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.GroupChatOwnerHistoryMapper">
+  <resultMap type="com.gic.haoban.manage.service.entity.chat.TabGroupChatOwnerHistory" id="result-map-tabHaobanGroupChatOwnerHistory">
+      <result column="owner_history_id"  property="ownerHistoryId"/>
+      <result column="wx_enterprise_id"  property="wxEnterpriseId"/>
+      <result column="group_chat_id"  property="groupChatId"/>
+      <result column="staff_id"  property="staffId"/>
+      <result column="create_time"  property="createTime"/>
+      <result column="end_time"  property="endTime"/>
+  </resultMap>
+  <sql id="Base_Column_List">
+	  owner_history_id,
+	  wx_enterprise_id,
+	  group_chat_id,
+	  staff_id,
+	  create_time,
+	  end_time
+  </sql>
+  <!-- ===================== 新增 ======================== -->
+  <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.chat.TabGroupChatOwnerHistory">
+  <![CDATA[
+  INSERT INTO tab_haoban_group_chat_owner_history(
+	  owner_history_id,
+	  wx_enterprise_id,
+	  group_chat_id,
+	  staff_id,
+	  create_time,
+	  end_time
+  )VALUES(
+	  #{ownerHistoryId},
+	  #{wxEnterpriseId},
+	  #{groupChatId},
+	  #{staffId},
+	  #{createTime},
+	  #{endTime}
+  )
+  ]]>
+  </insert>
+  
+   <!-- ==================更新 ========== -->
+  <update id="updateOwnerEnd">
+  <![CDATA[
+  UPDATE tab_haoban_group_chat_owner_history SET
+	  end_time= now() 
+  where group_chat_id=#{groupChatId} and 
+  ]]>
+  </update>
+  
+  <select id="listAll" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO">
+  	 select a.staff_id staffId , b.staff_name staffName , a.create_time createTime , a.end_time endTime  from tab_haoban_group_chat_owner_history  a LEFT JOIN tab_haoban_staff b on a.staff_id = b.staff_id
+  	 where a.group_chat_id=#{groupChatId} and a.wx_enterprise_id=#{wxEnterpriseId}
+  </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 java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,6 +16,7 @@ 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.chat.GroupChatOwnerDTO;
+import com.gic.haoban.manage.api.dto.chat.GroupChatOwnerHistoryDTO;
 import com.gic.haoban.manage.api.dto.chat.GroupChatUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
@@ -82,4 +85,12 @@ public class GroupChatController {
         return RestResponse.successResult(resp.getResult());
     }
     
+    @RequestMapping("owner-history")
+    public RestResponse<Object> ownerHistory(Long groupChatId) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
+        ServiceResponse<List<GroupChatOwnerHistoryDTO>> resp = this.groupChatApiService.listOwnerHistory(groupChatId, wxEnterpriseId) ;
+        return RestResponse.successResult(resp.getResult());
+    }
+
 }