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

Feature/社群

See merge request !638

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

 package com.gic.haoban.manage.api.dto.chat;
 
 import java.io.Serializable;
-import java.util.Date;
-
 /**
  * 
  * @ClassName: TabHaobanGroupChatPlanOwnerLog

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

@@ -39,6 +39,25 @@ public class GroupChatPlanOwnerLogDTO implements Serializable{
 	private String msgid ;
 	private Date expireDate ;
 	private Date sendTime ; 
+	public Date getStartTime() {
+        return startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    private Date startTime ;
+	private Date endTime ;
+	
 	
 	public Integer getFailCount() {
         return failCount;

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

@@ -7,8 +7,17 @@ import com.gic.haoban.manage.api.dto.qdto.chat.ChatHmSearchQDTO;
 import com.gic.haoban.manage.service.pojo.bo.chat.GroupChatHmBO;
 
 public interface GroupChatHmService {
-
-    public void saveHm(GroupChatHmDTO dto);
+    
+    /**
+     * 
+    * @Title: saveHm
+    * @Description: 新增/更新群活码
+    * @author xugh
+    * @param dto
+    * @return
+    * @throws
+     */
+    public String saveHm(GroupChatHmDTO dto);
 
     GroupChatHmBO getById(Long hmId);
 
@@ -24,6 +33,6 @@ public interface GroupChatHmService {
      */
     public void handleChatOff(Long groupChat);
 
-    public void discard(Long chatHmId, String wxEnterpriseId , String clerkId, String clerkName);
+    public void discard(Long chatHmId, String wxEnterpriseId, String clerkId, String clerkName);
 
 }
\ No newline at end of file

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

@@ -89,13 +89,12 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
         GroupChatHmBO bo = EntityUtil.changeEntityByJSON(GroupChatHmBO.class, hm);
         return bo;
     }
-    
-    
+
     @Override
-    public void discard(Long chatHmId, String wxEnterpriseId , String clerkId, String clerkName) { 
+    public void discard(Long chatHmId, String wxEnterpriseId, String clerkId, String clerkName) {
         this.groupChatHmMapper.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
     }
-    
+
     @Override
     public void handleChatOff(Long groupChatId) {
         List<Long> hmIdList = this.groupChatHmRelationMapper.listChatHmId(groupChatId);
@@ -195,14 +194,14 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     }
 
     @Override
-    public void saveHm(GroupChatHmDTO dto) {
+    public String saveHm(GroupChatHmDTO dto) {
         String wxEnterpriseId = dto.getWxEnterpriseId();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId,
                 SecretTypeEnum.CUSTOMIZED_APP.getVal());
         if (null == secretSetting) {
             logger.info("没有配置代开应用");
-            return;
+            return "没有配置代开应用";
         }
         boolean updateFlag = false;
         Long hmid = dto.getChatHmId();
@@ -266,11 +265,16 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             ServiceResponse<String> addResp = this.qywxChatApiService.addJoinWay(qwDTO.getDkCorpid(),
                     secretSetting.getSecretVal(), joinDTO);
             logger.info("addResp={}", JSON.toJSONString(addResp));
+            if (!addResp.isSuccess()) {
+                return addResp.getMessage();
+            }
             String configId = addResp.getResult();
-
             ServiceResponse<AddJoinWayDTO> getResp = this.qywxChatApiService.getJoinWay(qwDTO.getDkCorpid(),
                     secretSetting.getSecretVal(), configId);
             logger.info("getResp={}", JSON.toJSONString(getResp));
+            if (!getResp.isSuccess()) {
+                return getResp.getMessage();
+            }
             String qrCode = getResp.getResult().getQr_code();
             hm.setWxConfigId(configId);
             hm.setWxQrCode(qrCode);
@@ -284,6 +288,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
             }
             this.groupChatHmRelationMapper.insertBatch(relationList);
         }
+        return null;
     }
 
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -70,7 +71,10 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
 
     @Override
     public ServiceResponse<GroupChatHmDTO> save(GroupChatHmDTO dto) {
-        this.groupChatHmService.saveHm(dto);
+        String result = this.groupChatHmService.saveHm(dto);
+        if(StringUtils.isNotBlank(result)) {
+            return ServiceResponse.failure("9999", result) ;
+        }
         return ServiceResponse.success(dto);
     }
 

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

@@ -29,7 +29,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
 
     @Override
     public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
-        if(null != qdto.getEndDate()) {
+        if (null != qdto.getEndDate()) {
             qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
         }
         Page<GroupChatPlanBO> page = this.groupChatPlanService.listPage(qdto, basePageInfo);
@@ -81,7 +81,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     @Override
     public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo) {
-        if(null != qdto.getEndDate()) {
+        if (null != qdto.getEndDate()) {
             qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
         }
         Page<GroupChatPlanLogDTO> page = this.groupChatPlanService.listLogPage(qdto, basePageInfo);
@@ -91,7 +91,7 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     @Override
     public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo) {
-        if(null != qdto.getEndDate()) {
+        if (null != qdto.getEndDate()) {
             qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
         }
         Page<GroupChatPlanOwnerLogDTO> page = this.groupChatPlanOwnerLogService.listPage(planId, qdto, basePageInfo);

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

@@ -191,6 +191,7 @@
   	 	a.store_id  storeId ,
   	 	a.send_status sendStatus ,
   	 	a.send_count  sendCount , 
+  	 	a.fail_count  failCount ,
   	 	a.send_time   sendTime ,
   	 	a.create_time createTime ,
   	 	b.end_time  expireDate ,

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

@@ -85,8 +85,11 @@ public class GroupChatHmController {
         dto.setModifierName(loginUser.getClerkName());
         dto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         dto.setEnterpriseId(loginUser.getEnterpriseId());
-        this.groupChatHmApiService.save(dto);
-        return RestResponse.successResult();
+        ServiceResponse<GroupChatHmDTO> resp = this.groupChatHmApiService.save(dto);
+        if (resp.isSuccess()) {
+            return RestResponse.successResult();
+        }
+        return RestResponse.failure("1", resp.getMessage());
     }
 
     @RequestMapping("update")
@@ -102,8 +105,11 @@ public class GroupChatHmController {
         dto.setEnterpriseId(loginUser.getEnterpriseId());
         dto.setModifierId(loginUser.getClerkId());
         dto.setModifierName(loginUser.getClerkName());
-        this.groupChatHmApiService.save(dto);
-        return RestResponse.successResult();
+        ServiceResponse<GroupChatHmDTO> resp = this.groupChatHmApiService.save(dto);
+        if (resp.isSuccess()) {
+            return RestResponse.successResult();
+        }
+        return RestResponse.failure("1", resp.getMessage());
     }
 
     @RequestMapping("page")

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

@@ -58,9 +58,9 @@ public class GroupChatPlanController {
         if(null != page.getResult()) {
             page.getResult().forEach(dto->{
                 if(dto.getEndTime().before(new Date())) {
-                    dto.setPlanStatus(1);
-                }else {
                     dto.setPlanStatus(2);
+                }else {
+                    dto.setPlanStatus(1);
                 }
             });
         }