Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !736

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

@@ -260,43 +260,58 @@ public class GroupChatServiceImpl implements GroupChatService {
     // 处理群通知
     @Override
     public void handChatNotice(String params) {
-        List<Integer> typeList = Arrays.asList(1, 2, 3);
-        Date endTime = new Date();
-        Date startTime = DateUtil.addNumForMinute(endTime, -30);
-        List<TabChatNotice> list = this.chatNoticeMapper.listAll(typeList, startTime, endTime);
-        logger.info("开始群通知定时,count={}", list.size());
-        if (CollectionUtils.isEmpty(list)) {
-            return;
-        }
-        this.chatNoticeMapper.closeAll(typeList, startTime, endTime);
-        for (TabChatNotice item : list) {
-            try {
-                int type = item.getType();
-                String wxEnterpriseId = item.getWxEnterpriseId();
-                Long groupChatId = item.getChatId();
-                WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-                if (type == 1) {
-                    this.updateGroupChatDetail(qwDTO, groupChatId, false);
-                }
-                if (type == 2) {
-                    this.updateChatStatus(qwDTO, groupChatId);
-                }
-                if (type == 3) {
-                    this.updateGroupChatDetail(qwDTO, groupChatId, true);
+        logger.info("企微群定时,处理群通知");
+        String key = "handChatNotice";
+        try {
+            Object o = RedisUtil.getCache(key);
+            if (null != o) {
+                logger.info("有缓存,进行中");
+                return;
+            }
+            RedisUtil.setCache(key, "1");
+            List<Integer> typeList = Arrays.asList(1, 2, 3);
+            Date endTime = new Date();
+            Date startTime = DateUtil.addNumForMinute(endTime, -30);
+            List<TabChatNotice> list = this.chatNoticeMapper.listAll(typeList, startTime, endTime);
+            logger.info("开始群通知定时,count={}", list.size());
+            if (CollectionUtils.isEmpty(list)) {
+                return;
+            }
+            this.chatNoticeMapper.closeAll(typeList, startTime, endTime);
+            for (TabChatNotice item : list) {
+                try {
+                    int type = item.getType();
+                    String wxEnterpriseId = item.getWxEnterpriseId();
+                    Long groupChatId = item.getChatId();
+                    WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
+                    if (type == 1) {
+                        this.updateGroupChatDetail(qwDTO, groupChatId, false);
+                    }
+                    if (type == 2) {
+                        this.updateChatStatus(qwDTO, groupChatId);
+                    }
+                    if (type == 3) {
+                        this.updateGroupChatDetail(qwDTO, groupChatId, true);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            RedisUtil.delCache(key);
         }
     }
 
     @Override
     public void initGroupChatForTimer(String params) {
-        logger.info("企微群定时,初始化");
+        logger.info("企微群定时,群初始化");
         String key = "initGroupChatForTimer";
         try {
             Object o = RedisUtil.getCache(key);
             if (null != o) {
+                logger.info("有缓存,进行中");
                 return;
             }
             RedisUtil.setCache(key, "1");
@@ -359,11 +374,12 @@ public class GroupChatServiceImpl implements GroupChatService {
 
     @Override
     public void initHaobaonGroupChat(String params) {
+        logger.info("企微群定时,整个企业初始化");
         String key = "initHaobaonGroupChat";
         try {
             Object o = RedisUtil.getCache(key);
             if (null != o) {
-                logger.info("企业群初始化进行中");
+                logger.info("有缓存,进行中");
                 return;
             }
             RedisUtil.setCache(key, "1");
@@ -401,6 +417,7 @@ public class GroupChatServiceImpl implements GroupChatService {
 
     // 群主离职列表
     public void ownerDimission() {
+        logger.info("企微群定时,离职群主群状态更新");
         List<GroupChatOwnerDTO> dimissionOwnerList = this.groupChatOwnerMapper.dimissionOwnerList();
         for (GroupChatOwnerDTO dto : dimissionOwnerList) {
             try {
@@ -464,7 +481,7 @@ public class GroupChatServiceImpl implements GroupChatService {
     // 同步群列表
     private void syncGroupChatList(WxEnterpriseQwDTO qwDTO, List<String> userIdList, String cursor,
             boolean syncDetailFlag) {
-        logger.info("qwDTO={},idlist={},cursor={}", JSON.toJSONString(qwDTO), JSON.toJSONString(userIdList), cursor);
+        logger.info("同步群列表={},idlist={},cursor={}", JSON.toJSONString(qwDTO), JSON.toJSONString(userIdList), cursor);
         ServiceResponse<GroupChatListDTO> resp = this.qywxChatApiService.groupchatList3th(qwDTO.getDkCorpid(),
                 config.getWxSuiteid(), userIdList, limit, cursor);
         if (!resp.isSuccess()) {
@@ -494,7 +511,7 @@ public class GroupChatServiceImpl implements GroupChatService {
         Long groupChatId = null;
         if (null != groupChat) {
             groupChatId = groupChat.getGroupChatId();
-            logger.info("更新群状态,wxchatid={},groupChatId={},新老状态={}", wxChatId, groupChatId, chatStatus,
+            logger.info("更新群状态,wxchatid={},groupChatId={},新老状态={}-{}", wxChatId, groupChatId, chatStatus,
                     groupChat.getChatStatus());
             if (groupChat.getChatStatus() != chatStatus) {
                 this.groupChatMapper.updateChatStatus(groupChatId, chatStatus);
@@ -981,11 +998,12 @@ public class GroupChatServiceImpl implements GroupChatService {
 
     @Override
     public void handleHmChatFull(String params) {
+        logger.info("企微群定时,群满");
         List<Integer> typeList = Arrays.asList(4);
         Date endTime = new Date();
         Date startTime = DateUtil.addNumForMinute(endTime, -30);
         List<TabChatNotice> list = this.chatNoticeMapper.listAll(typeList, startTime, endTime);
-        logger.info("开始群加满处理活码定时,count={}", list.size());
+        logger.info("群满处理活码,count={}", list.size());
         if (CollectionUtils.isEmpty(list)) {
             return;
         }
@@ -999,8 +1017,8 @@ public class GroupChatServiceImpl implements GroupChatService {
                 if (null == chat || chat.getHmAddStatus() == 1 || null == chat.getOffTime()) {
                     continue;
                 }
-                if (chat.getOffTime().getTime() + 1000 * 60 * 60 * 24 < new Date().getTime()) {
-                    logger.info("超过一天不再重试groupChatId={}", groupChatId);
+                if (chat.getOffTime().getTime() + 1000 * 60 * 60 * 8 < new Date().getTime()) {
+                    logger.info("超过8小时不重试groupChatId={}", groupChatId);
                     continue;
                 }
                 this.groupChatHmService.handleChatOff(wxEnterpriseId, groupChatId);

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

@@ -96,7 +96,7 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
             if (needClerkReltaion) {
                 List<String> staffIdList = dtoList.stream().filter(dto -> StringUtils.isNotBlank(dto.getStaffId()))
                         .map(dto -> dto.getStaffId()).collect(Collectors.toList());
-                if(CollectionUtils.isNotEmpty(staffIdList)) {
+                if (CollectionUtils.isNotEmpty(staffIdList)) {
                     List<String> relationIdList = this.staffClerkRelationService
                             .listRelationsStaffId(new HashSet<>(staffIdList));
                     dtoList.forEach(one -> {
@@ -131,7 +131,7 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
         }
         List<String> staffIdList = new ArrayList<>(staffIdSet);
         Map<String, TabHaobanStaff> map = new HashMap<>();
-        if(CollectionUtils.isNotEmpty(staffIdList)) {
+        if (CollectionUtils.isNotEmpty(staffIdList)) {
             List<TabHaobanStaff> staffList = this.staffService.listNoStatusByStaffIds(wxEnterpriseId, staffIdList);
             if (CollectionUtils.isNotEmpty(staffList)) {
                 map = staffList.stream().collect(Collectors.toMap(TabHaobanStaff::getStaffId, o -> o, (k1, k2) -> k2));