Merge remote-tracking branch 'origin/master'

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java

@@ -269,7 +269,7 @@ public class CasesRecommendApi extends ApiBaseController {
         if (StringUtils.isEmpty(casesRecommendPushVo.getCasesRecommendId())) {
             throw new RuntimeException("缺少必要参数");
         }
-        iCasesRecommendService.rePushOrWithdraw(casesRecommendPushVo);
+        iCasesRecommendService.rePushOrWithdraw(casesRecommendPushVo,getCurrent().getAccountId());
         return success(true);
     }
 

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendService.java

@@ -32,6 +32,6 @@ public interface ICasesRecommendService {
      * 撤回或者重新推送
      * @param casesRecommendPushVo
      */
-    void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo);
+    void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo,String userId);
 
 }

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java

@@ -217,6 +217,7 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
                 message.setIsRead(false);
                 message.setMsgTime(LocalDateTime.now());
                 message.setRefId(pushRecords.get(0).getRecommendId());
+                message.setBatchId(pushRecords.get(0).getRecommendId());
                 message.setRefType("99");
                 message.setSendName(pushRecords.get(0).getSysCreateBy());
                 message.setSendType(1);
@@ -258,6 +259,7 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR
                 message.setIsRead(false);
                 message.setMsgTime(LocalDateTime.now());
                 message.setRefId(casesRecommendPushRecord.getId());
+                message.setBatchId(casesRecommendPushRecord.getRecommendId());
                 message.setRefType("99");
                 message.setSendName(casesRecommendPushRecord.getSysCreateBy());
                 message.setSendType(1);

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendServiceImpl.java

@@ -12,6 +12,7 @@ import com.xboe.module.boecase.service.ICasesRecommendPushRecordService;
 import com.xboe.module.boecase.service.ICasesRecommendService;
 import com.xboe.module.boecase.vo.CasesRecommendPushVo;
 import com.xboe.module.boecase.vo.CasesRecommendVo;
+import com.xboe.system.user.dao.MessageDao;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,9 @@ public class CasesRecommendServiceImpl implements ICasesRecommendService {
 
     @Resource
     private CasesRecommendDao casesRecommendDao;
+
+    @Resource
+    private MessageDao messageDao;
     @Resource
     private ICasesRecommendPushRecordService iCasesRecommendPushRecordService;
 
@@ -58,7 +62,7 @@ public class CasesRecommendServiceImpl implements ICasesRecommendService {
     }
 
     @Override
-    public void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo) {
+    public void rePushOrWithdraw(CasesRecommendPushVo casesRecommendPushVo, String userId) {
         // 查询
         CasesRecommend db = casesRecommendDao.get(casesRecommendPushVo.getCasesRecommendId());
         if (CasesPushStatusEnum.PUSH_SUCCESS.getStatus().equals(db.getPushProgress())
@@ -69,6 +73,9 @@ public class CasesRecommendServiceImpl implements ICasesRecommendService {
             iCasesRecommendPushRecordService.rePushOrWithdraw(true, db);
             db.setPushProgress(CasesPushStatusEnum.PUSH_REVOKE.getStatus());
             casesRecommendDao.update(db);
+            messageDao.deleteByFilter(FieldFilters.eq("acceptId", userId), FieldFilters.eq("refType", "99"),
+                    FieldFilters.eq("batchId", casesRecommendPushVo.getCasesRecommendId()));
+
         } else if (CasesPushStatusEnum.PUSH_FAIL.getStatus().equals(db.getPushProgress())
                 || CasesPushStatusEnum.PUSH_REVOKE.getStatus().equals(db.getPushProgress())) {
             // 推送失败或者已撤回时

servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java

@@ -1,18 +1,5 @@
 package com.xboe.system.user.api;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
 import com.xboe.common.utils.IDGenerator;
@@ -24,8 +11,14 @@ import com.xboe.system.user.entity.Message;
 import com.xboe.system.user.service.IMessageService;
 import com.xboe.system.user.service.MessageSender;
 import com.xboe.system.user.vo.BatchMessage;
-
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -227,6 +220,23 @@ public class MessageApi extends ApiBaseController {
     }
 
 
+    @GetMapping("/clearMessageNotCase")
+    public JsonResponse<Integer> clearMessageNotCase(){
+
+        String  aid=getCurrent().getAccountId();
+        if(StringUtils.isBlank(aid)) {
+            return badRequest("获取用户信息异常");
+        }
+        try {
+            Integer type = service.clearMessageNotCase(aid);
+            return success(type);
+        } catch (Exception e) {
+            log.error("清空消息错误",e);
+            return error("清空消息失败",e.getMessage());
+        }
+    }
+
+
     /**
      * 移动端
      * 消息页面，按用户分组返回  暂时不用

servers/boe-server-all/src/main/java/com/xboe/system/user/entity/Message.java

@@ -1,18 +1,16 @@
 package com.xboe.system.user.entity;
 
-import java.time.LocalDateTime;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
 import com.xboe.core.orm.IdEntity;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+
 
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -120,4 +118,10 @@ public class Message extends IdEntity {
     @Column(name = "is_read")
     private Boolean isRead;
 
+    /**
+     * 批次号
+     */
+    @Column(name = "batch_id")
+    private String batchId;
+
 }

servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java

@@ -1,11 +1,10 @@
 package com.xboe.system.user.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.xboe.common.PageList;
 import com.xboe.system.user.entity.Message;
-import com.xboe.system.user.vo.BatchMessage;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 消息接口
@@ -62,6 +61,13 @@ public interface IMessageService {
      */
     void cleanByAcceptId(String aid);
 
+    /**
+     * 清楚消息排除推荐消息
+     * @param aid
+     * @return
+     */
+    Integer clearMessageNotCase(String aid);
+    
     /**
      * 批量设置已读
      * */

servers/boe-server-all/src/main/java/com/xboe/system/user/service/impl/MessageServiceImpl.java

@@ -22,7 +22,7 @@ import java.util.Map;
 
 /**
  * 消息
-* */
+ */
 @Service
 public class MessageServiceImpl implements IMessageService {
 
@@ -164,11 +164,26 @@ public class MessageServiceImpl implements IMessageService {
     }
 
     @Override
+    @Transactional
     public void cleanByAcceptId(String aid) {
         dao.deleteByField("acceptId", aid);
 
     }
 
+    @Override
+    @Transactional
+    public Integer clearMessageNotCase(String aid) {
+        List<Message> caseList = dao.findList(FieldFilters.eq("acceptId", aid), FieldFilters.eq("refType", "99"));
+        List<Message> notCaseList = dao.findList(FieldFilters.eq("acceptId", aid), FieldFilters.ne("refType", "99"));
+        dao.deleteByFilter(FieldFilters.eq("acceptId", aid), FieldFilters.ne("refType", "99"));
+        if (CollectionUtils.isNotEmpty(caseList) && CollectionUtils.isEmpty(notCaseList)) {
+            return 1;
+        } else if (CollectionUtils.isEmpty(caseList) && CollectionUtils.isNotEmpty(notCaseList)) {
+            return 2;
+        }
+        return 3;
+    }
+
     @Override
     @Transactional
     public void batchSave(List<Message> list) {