人群回显

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkChatDTO.java

@@ -35,6 +35,16 @@ public class HmLinkChatDTO implements Serializable {
     private String name;
     private Integer linkCount ;
     private String esId ;
+    // 用于人群回显
+    private String searchJson;
+
+    public String getSearchJson() {
+        return searchJson;
+    }
+
+    public void setSearchJson(String searchJson) {
+        this.searchJson = searchJson;
+    }
 
     public String getEsId() {
         return esId;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkChatServiceImpl.java

@@ -58,7 +58,7 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
                 TabHmLinkChat entity = EntityUtil.changeEntityByJSON(TabHmLinkChat.class, item);
                 this.hmLinkChatMapper.update(entity);
                 if (item.getMemberType() == 0) {
-                    screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), item.getFilterJson());
+                    screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), item.getSearchJson());
                 }
             }
         }
@@ -71,7 +71,7 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
                 entity.setLinkId(linkId);
                 this.hmLinkChatMapper.insert(entity);
                 if (dto.getMemberType() == 0) {
-                    screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), dto.getFilterJson());
+                    screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), dto.getSearchJson());
                 }
             }
         }

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

@@ -47,7 +47,7 @@ import com.gic.log.record.util.GicLogRecordOptTypeEnum;
 /**
  * 
 * @ClassName: GroupChatPlanController
-* @Description: 群群发计划
+* @Description: 群群发任务
 * @author xugh
 * @date 2022年11月26日 上午9:32:56
 *
@@ -92,12 +92,12 @@ public class GroupChatPlanController {
     public RestResponse<Object> del(Long planId) {
         if (null == planId) {
             GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("9999", "计划ID空");
+            return RestResponse.failure("9999", "任务ID空");
         }
         ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
         if (!planResp.isSuccess()) {
             GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("1", "计划不存在");
+            return RestResponse.failure("1", "任务不存在");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         this.groupChatPlanApiService.del(loginUser.getClerkId(), loginUser.getClerkName(), planId);
@@ -121,16 +121,21 @@ public class GroupChatPlanController {
     public RestResponse<Object> stop(Long planId) {
         if (null == planId) {
             GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("9999", "计划ID空");
+            return RestResponse.failure("9999", "任务ID空");
         }
         ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
         if (!planResp.isSuccess()) {
             GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("1", "计划不存在");
+            return RestResponse.failure("1", "任务不存在");
+        }
+        GroupChatPlanDTO plan = planResp.getResult() ;
+        if(plan.getEndTime().getTime()<=new Date().getTime()) {
+            GicLogRecordEvaluationContext.noWriteLog();
+            return RestResponse.failure("1", "任务已结束");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         this.groupChatPlanApiService.stop(loginUser.getClerkId(), loginUser.getClerkName(), planId);
-        String logContent = "终止客户群群发【" + planResp.getResult().getName() + "】";
+        String logContent = "终止客户群群发【" + plan.getName() + "】";
         GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
         GicLogRecordEvaluationContext.putOptTargetId(AuthWebRequestUtil.getLoginUser().getClerkId());
         return RestResponse.successResult();
@@ -144,7 +149,7 @@ public class GroupChatPlanController {
         GroupChatPlanDTO oldPlan = oldResp.getResult();
         if (null == oldPlan) {
             GicLogRecordEvaluationContext.noWriteLog();
-            return RestResponse.failure("9999", "计划不存在");
+            return RestResponse.failure("9999", "任务不存在");
         }
         if (oldPlan.getSendType() == 1) {
             GicLogRecordEvaluationContext.noWriteLog();
@@ -286,7 +291,7 @@ public class GroupChatPlanController {
     public RestResponse<Object> detail(Long planId, @RequestParam(defaultValue = "0") int updteFlag) {
         ServiceResponse<GroupChatPlanDTO> planResp = this.groupChatPlanApiService.detail(planId);
         if (!planResp.isSuccess()) {
-            return RestResponse.failure("1", "计划不存在");
+            return RestResponse.failure("1", "任务不存在");
         }
         GroupChatPlanDTO plan = planResp.getResult();
         plan.getStaffIdList();
@@ -328,14 +333,14 @@ public class GroupChatPlanController {
     @RequestMapping("owner-log")
     public RestResponse<Object> ownerLog(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
         if (null == planId) {
-            return RestResponse.failure("9999", "计划ID空");
+            return RestResponse.failure("9999", "任务ID空");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> resp = this.groupChatPlanApiService.listOwnerLogPage(planId,
                 qdto, basePageInfo);
         if (!resp.isSuccess()) {
-            return RestResponse.failure("1", "计划不存在");
+            return RestResponse.failure("1", "任务不存在");
         }
         return RestResponse.successResult(resp.getResult());
     }
@@ -343,14 +348,14 @@ public class GroupChatPlanController {
     @RequestMapping("log")
     public RestResponse<Object> log(Long planId, GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
         if (null == planId) {
-            return RestResponse.failure("9999", "计划ID空");
+            return RestResponse.failure("9999", "任务ID空");
         }
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
         ServiceResponse<Page<GroupChatPlanLogDTO>> resp = this.groupChatPlanApiService.listLogPage(planId, qdto,
                 basePageInfo);
         if (!resp.isSuccess()) {
-            return RestResponse.failure("1", "计划不存在");
+            return RestResponse.failure("1", "任务不存在");
         }
         return RestResponse.successResult(resp.getResult());
     }