活码查询

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

@@ -24,6 +24,8 @@ public class GroupChatSearchQDTO extends PageQo implements Serializable {
     private String staffId ;
     private int gicFlag = 1 ;
     private Long chatHmId ;
+    // 查询活码关联是否包含下线的1是0否
+    private int includeOff ;
     private List<Long> groupChatIdList ;
     private String sortColumn ;
     private String sortType = "desc" ;
@@ -34,6 +36,14 @@ public class GroupChatSearchQDTO extends PageQo implements Serializable {
     // 筛选激活或者开启联系我的群主
     private Integer canUseFlag ;
     
+    public int getIncludeOff() {
+        return includeOff;
+    }
+
+    public void setIncludeOff(int includeOff) {
+        this.includeOff = includeOff;
+    }
+
     public String getDepartmentId() {
         return departmentId;
     }

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

@@ -246,8 +246,12 @@ public class GroupChatServiceImpl implements GroupChatService {
     @Override
     public Page<GroupChatDTO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
         if (null != qdto.getChatHmId()) {
-            List<TabGroupChatHmRelation> list = this.groupChatHmRelationMapper
-                    .listByChatHmIdIncludeOff(qdto.getChatHmId());
+            List<TabGroupChatHmRelation> list = null;
+            if (qdto.getIncludeOff() == 1) {
+                list = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
+            } else {
+                list = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
+            }
             if (CollectionUtils.isEmpty(list)) {
                 return new Page<GroupChatDTO>();
             }

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

@@ -74,7 +74,7 @@ import com.google.common.collect.Sets;
 public class GroupChatHmController {
 
     private static Logger logger = LogManager.getLogger(GroupChatHmController.class);
-    
+
     @Autowired
     private GroupChatHmApiService groupChatHmApiService;
     @Autowired
@@ -131,7 +131,8 @@ public class GroupChatHmController {
         if (!oldResp.isSuccess()) {
             return RestResponse.failure(oldResp.getCode(), oldResp.getMessage());
         }
-        List<Long> oldIdList = this.groupChatHmApiService.listHmGroupChatId(loginUser.getWxEnterpriseId(), dto.getChatHmId()).getResult() ;
+        List<Long> oldIdList = this.groupChatHmApiService
+                .listHmGroupChatId(loginUser.getWxEnterpriseId(), dto.getChatHmId()).getResult();
         GroupChatHmDTO oldDTO = oldResp.getResult();
         dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         dto.setEnterpriseId(loginUser.getEnterpriseId());
@@ -140,7 +141,7 @@ public class GroupChatHmController {
         dto.setWxConfigId(oldDTO.getWxConfigId());
         ServiceResponse<GroupChatHmDTO> resp = this.groupChatHmApiService.save(dto);
         if (resp.isSuccess()) {
-            String logContent = this.getUpdateLog(oldDTO, dto,oldIdList);
+            String logContent = this.getUpdateLog(oldDTO, dto, oldIdList);
             if (StringUtils.isNotBlank(logContent)) {
                 GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
                 GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
@@ -153,7 +154,7 @@ public class GroupChatHmController {
         return RestResponse.failure("1", resp.getMessage());
     }
 
-    private String getUpdateLog(GroupChatHmDTO oldDTO, GroupChatHmDTO newDTO,List<Long> oldIdList) {
+    private String getUpdateLog(GroupChatHmDTO oldDTO, GroupChatHmDTO newDTO, List<Long> oldIdList) {
         String wxEnterpriseId = newDTO.getWxEnterpriseId();
         String enterpriseId = newDTO.getEnterpriseId();
         StringBuilder content = new StringBuilder();
@@ -165,32 +166,32 @@ public class GroupChatHmController {
         if (null != b) {
             content.append(b);
         }
-        
-        String o = null ;
-        List<Long> newIdList = newDTO.getChatIdList() ;
-        
+
+        String o = null;
+        List<Long> newIdList = newDTO.getChatIdList();
+
         Sets.SetView<Long> delView = Sets.difference(Sets.newHashSet(oldIdList), Sets.newHashSet(newIdList));
         List<Long> delIdList = delView.stream().collect(Collectors.toList());
         logger.info("删除的群={}", delIdList);
         if (CollectionUtils.isNotEmpty(delIdList)) {
-            String chats = this.getGroupChatName(wxEnterpriseId, delIdList) ;
-            if(StringUtils.isNotBlank(chats)) {
-               o =  "删除可加入群聊【" + chats + "】";
-               content.append(o);
+            String chats = this.getGroupChatName(wxEnterpriseId, delIdList);
+            if (StringUtils.isNotBlank(chats)) {
+                o = "删除可加入群聊【" + chats + "】";
+                content.append(o);
             }
         }
-        String p = null ;
+        String p = null;
         Sets.SetView<Long> addView = Sets.difference(Sets.newHashSet(newIdList), Sets.newHashSet(oldIdList));
         List<Long> addIdList = addView.stream().collect(Collectors.toList());
         logger.info("增加的群={}", addIdList);
-        if(CollectionUtils.isNotEmpty(addIdList)) {
-            String chats = this.getGroupChatName(wxEnterpriseId, addIdList) ;
-            if(StringUtils.isNotBlank(chats)) {
-               p =  "新增可加入群聊【" + chats + "】";
-               content.append(p);
+        if (CollectionUtils.isNotEmpty(addIdList)) {
+            String chats = this.getGroupChatName(wxEnterpriseId, addIdList);
+            if (StringUtils.isNotBlank(chats)) {
+                p = "新增可加入群聊【" + chats + "】";
+                content.append(p);
             }
         }
-        
+
         String c = null;
         if (oldDTO.getAutoCreateRoom() == 1 && newDTO.getAutoCreateRoom() == 0) {
             c = "关闭自动建群功能";
@@ -214,7 +215,7 @@ public class GroupChatHmController {
                 content.append(f);
             }
         }
-        if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d, e, f,o,p)) {
+        if (org.apache.commons.lang3.StringUtils.isAllBlank(a, b, c, d, e, f, o, p)) {
             return null;
         }
         StringBuilder sb = new StringBuilder("编辑群活码").append("【").append(oldDTO.getChatHmCode()).append("-")
@@ -222,21 +223,23 @@ public class GroupChatHmController {
         return sb.append(content).toString();
     }
 
-    private String getGroupChatName(String wxEnterpriseId , List<Long> groupChatIdList) {
-        ServiceResponse<List<GroupChatDTO>>  resp =  this.groupChatApiService.listChatByIdList(wxEnterpriseId, groupChatIdList) ;
-        List<GroupChatDTO> list = resp.getResult() ;
-        String names = list.stream().map(dto->joint(dto.getWxChatId(),"-",dto.getName())).collect(Collectors.joining(",")) ;
-        return names ;
+    private String getGroupChatName(String wxEnterpriseId, List<Long> groupChatIdList) {
+        ServiceResponse<List<GroupChatDTO>> resp = this.groupChatApiService.listChatByIdList(wxEnterpriseId,
+                groupChatIdList);
+        List<GroupChatDTO> list = resp.getResult();
+        String names = list.stream().map(dto -> joint(dto.getWxChatId(), "-", dto.getName()))
+                .collect(Collectors.joining(","));
+        return names;
     }
-    
+
     private String joint(String... arr) {
-        StringBuilder sb = new StringBuilder() ;
-        for(String s :  arr) {
-            sb.append(s) ;
+        StringBuilder sb = new StringBuilder();
+        for (String s : arr) {
+            sb.append(s);
         }
-        return sb.toString() ;
+        return sb.toString();
     }
-    
+
     public String comp(String wxEnterpriseId, String enterpriseId, String title, String oldValue, String newValue,
             int type) {
         StringBuilder sb = new StringBuilder();
@@ -255,7 +258,7 @@ public class GroupChatHmController {
 
     @RequestMapping("page")
     public RestResponse<Object> page(@RequestBody ChatHmSearchQDTO qdto) {
-        BasePageInfo basePageInfo = new BasePageInfo() ;
+        BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(qdto.getPageNum());
         basePageInfo.setPageSize(qdto.getPageSize());
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
@@ -366,7 +369,8 @@ public class GroupChatHmController {
     * @throws
      */
     @RequestMapping("group-relation")
-    public RestResponse<Object> groupRelation(Long chatHmId, BasePageInfo basePageInfo) {
+    public RestResponse<Object> groupRelation(Long chatHmId, BasePageInfo basePageInfo,
+            @RequestParam(defaultValue = "0") int includeOff) {
         if (null == chatHmId) {
             return RestResponse.failure("1", "群活码ID空");
         }
@@ -376,6 +380,7 @@ public class GroupChatHmController {
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
         qdto.setChatHmId(chatHmId);
+        qdto.setIncludeOff(includeOff);
         ServiceResponse<Page<GroupChatDTO>> page = this.groupChatApiService.listPage(qdto, basePageInfo);
         return RestResponse.successResult(page.getResult());
     }