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

校验

See merge request !626

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

@@ -2,6 +2,10 @@ package com.gic.haoban.manage.web.controller.chat;
 
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,6 +38,8 @@ import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
 @RequestMapping("/chat")
 public class GroupChatController {
 
+    private static Logger logger = LogManager.getLogger(GroupChatController.class);
+
     @Autowired
     private GroupChatApiService groupChatApiService;
 
@@ -42,6 +48,7 @@ public class GroupChatController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         ServiceResponse<Boolean> resp = this.groupChatApiService.getSetGicFlag(wxEnterpriseId);
+        logger.info("是否需要认领gic={},{}", resp.getResult(), wxEnterpriseId);
         return RestResponse.successResult(resp.getResult());
     }
 
@@ -57,6 +64,9 @@ public class GroupChatController {
     @RequestMapping("set-gic-enterprise")
     public RestResponse<Object> save(@RequestBody GroupChatSearchQDTO qdto) {
         List<Long> groupChatIdList = qdto.getGroupChatIdList();
+        if (CollectionUtils.isEmpty(groupChatIdList)) {
+            return RestResponse.failure("1", "请选择认领的群");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         String enterpriseId = loginUser.getEnterpriseId();
@@ -85,6 +95,9 @@ public class GroupChatController {
 
     @RequestMapping("detail")
     public RestResponse<Object> detail(Long groupChatId) {
+        if(null == groupChatId) {
+            return RestResponse.failure("1", "群ID空");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         ServiceResponse<GroupChatDTO> resp = this.groupChatApiService.detail(loginUser.getWxEnterpriseId(),
                 groupChatId);
@@ -105,6 +118,9 @@ public class GroupChatController {
 
     @RequestMapping("owner-history")
     public RestResponse<Object> ownerHistory(Long groupChatId) {
+        if(null == groupChatId) {
+            return RestResponse.failure("1", "群ID空");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         ServiceResponse<List<GroupChatOwnerHistoryDTO>> resp = this.groupChatApiService.listOwnerHistory(groupChatId,
@@ -114,6 +130,12 @@ public class GroupChatController {
 
     @RequestMapping("transfer")
     public RestResponse<Object> transfer(String staffId, List<Long> groupChatIdList) {
+        if(StringUtils.isEmpty(staffId)) {
+            return RestResponse.failure("1", "请选择继承的群主");
+        }
+        if(CollectionUtils.isEmpty(groupChatIdList)) {
+            return RestResponse.failure("1", "请选择继承的群");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         ServiceResponse<Void> resp = this.groupChatApiService.transfer(wxEnterpriseId, staffId, groupChatIdList);

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

@@ -10,7 +10,6 @@ import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -73,6 +72,12 @@ public class GroupChatHmController {
 
     @RequestMapping("add")
     public RestResponse<Object> save(@RequestBody GroupChatHmDTO dto) {
+        if (CollectionUtils.isEmpty(dto.getChatIdList())) {
+            return RestResponse.failure("1", "请选择加入的群");
+        }
+        if (dto.getChatIdList().size() > 4) {
+            return RestResponse.failure("1", "最多可选4个群");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         dto.setCreatorId(loginUser.getClerkId());
         dto.setCreatorName(loginUser.getClerkName());
@@ -86,6 +91,12 @@ public class GroupChatHmController {
 
     @RequestMapping("update")
     public RestResponse<Object> update(@RequestBody GroupChatHmDTO dto) {
+        if (CollectionUtils.isEmpty(dto.getChatIdList())) {
+            return RestResponse.failure("1", "请选择加入的群");
+        }
+        if (dto.getChatIdList().size() > 4) {
+            return RestResponse.failure("1", "最多可选4个群");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         dto.setEnterpriseId(loginUser.getEnterpriseId());
@@ -100,9 +111,9 @@ public class GroupChatHmController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         qdto.setEnterpriseId(loginUser.getEnterpriseId());
-        List<String> creatorIdList = CreatorUtils.getCreatorIdList(0) ;
-        if(CollectionUtils.isNotEmpty(creatorIdList)) {
-            qdto.setCreatorIdList(creatorIdList) ;
+        List<String> creatorIdList = CreatorUtils.getCreatorIdList(0);
+        if (CollectionUtils.isNotEmpty(creatorIdList)) {
+            qdto.setCreatorIdList(creatorIdList);
         }
         ServiceResponse<Page<GroupChatHmDTO>> page = this.groupChatHmApiService.listPage(qdto, basePageInfo);
         return RestResponse.successResult(page.getResult());
@@ -123,6 +134,9 @@ public class GroupChatHmController {
 
     @RequestMapping("discard")
     public RestResponse<Object> discard(Long chatHmId) {
+        if (null == chatHmId) {
+            return RestResponse.failure("1", "群活码ID空");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         String clerkId = loginUser.getClerkId();
@@ -183,6 +197,7 @@ public class GroupChatHmController {
         return RestResponse.successResult(page.getResult());
     }
 
+    @SuppressWarnings("deprecation")
     @RequestMapping("download")
     public RestResponse<Object> download(ChatHmSearchQDTO qdto, @RequestParam(defaultValue = "0") int allFlag) {
         if (allFlag == 0 && CollectionUtils.isEmpty(qdto.getChatHmIdList())) {
@@ -213,7 +228,7 @@ public class GroupChatHmController {
         String enterpriseId = loginUser.getEnterpriseId();
         BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(1);
-        basePageInfo.setPageSize(1000);
+        basePageInfo.setPageSize(Integer.MAX_VALUE);
         qdto.setEnterpriseId(enterpriseId);
         qdto.setWxEnterpriseId(wxEnterpriseId);
         ServiceResponse<Page<GroupChatHmDTO>> resp = this.groupChatHmApiService.listPage(qdto, basePageInfo);

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

@@ -57,8 +57,8 @@ public class GroupChatPlanController {
 
     @RequestMapping("add")
     public RestResponse<Object> save(@RequestBody GroupChatPlanDTO dto) {
-        if(StringUtils.isNotBlank(dto.getStaffIdList())) {
-            return RestResponse.failure("9999", "请选择群主"); 
+        if (StringUtils.isNotBlank(dto.getStaffIdList())) {
+            return RestResponse.failure("9999", "请选择群主");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         dto.setCreatorId(loginUser.getClerkId());
@@ -94,6 +94,9 @@ public class GroupChatPlanController {
         if (null != plan.getSendTime() && plan.getSendTime().before(new Date())) {
             return RestResponse.failure("9999", "已发送的不能编辑");
         }
+        if (plan.getStartTime().before(new Date())) {
+            return RestResponse.failure("9999", "进行中的不能编辑");
+        }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         dto.setModifierId(loginUser.getClerkId());
         dto.setModifierName(loginUser.getClerkName());