F

application/src/main/java/com/lyg/application/controller/TaMessageController.java

@@ -44,10 +44,12 @@ public class TaMessageController extends BaseController {
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
         TaMessage taMessage = taMessageService.getById(id);
 
+
+        System.out.println("checkAuth()" + checkAuth());
         Boolean b = checkAuth() == null || checkAuth() == taMessage.getCreateUser();
 
         if (b) {
-            SaResult.data(taMessageService.getById(id));
+            return SaResult.data(taMessageService.getById(id));
         }
         return SaResult.error("无权限");
     }
@@ -65,12 +67,16 @@ public class TaMessageController extends BaseController {
     @GetMapping("/taMessage")
     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("来源表") @RequestParam(value = "sourceName", required = false) String sourceName,
+                         @ApiParam("内容") @RequestParam(value = "contentSent", required = false) String contentSent,
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
                          @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
 
         IPage<TaMessage> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMessage> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtil.isNotEmpty(checkAuth()), "CREATE_USER", checkAuth());
+        queryWrapper.eq(StringUtil.isNotEmpty(sourceName), "SOURCE_NAME", sourceName);
+        queryWrapper.like(StringUtil.isNotEmpty(contentSent), "content_sent", contentSent);
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaMessage> result = taMessageService.page(pg, queryWrapper);

application/src/main/java/com/lyg/application/controller/TaSendingController.java

@@ -46,7 +46,7 @@ public class TaSendingController extends BaseController {
 
         Boolean b = checkAuth() == null || checkAuth() == taSending.getCreateUser();
         if (b) {
-            SaResult.data(taSendingService.getById(id));
+            return SaResult.data(taSendingService.getById(id));
         }
         return SaResult.error("无权限");
 

application/src/main/java/com/lyg/application/job/TotationJobTime.java

@@ -24,7 +24,6 @@ public class TotationJobTime {
     @AccessLimit()
     @Scheduled(cron = "0 0 8 * * *")
     public void promptWarning() throws Exception {
-
         taRotationService.selectGetWaring();
 
     }

application/src/main/java/com/lyg/application/mapper/TaMessageMapper.java

@@ -3,6 +3,9 @@ package com.lyg.application.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lyg.application.entity.TaMessage;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * 消息表;(ta_massage)表数据库访问层
@@ -13,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaMessageMapper extends BaseMapper<TaMessage> {
 
+    void updateBySourceId(@Param("id") String leaveId, @Param("params") Map<String, String> params);
 }

application/src/main/java/com/lyg/application/service/impl/TaMandatoryLeaveServiceImpl.java

@@ -1,15 +1,12 @@
 package com.lyg.application.service.impl;
 
 import com.lyg.application.entity.TaMandatoryLeave;
-import com.lyg.application.entity.TaMessage;
-import com.lyg.application.entity.TaSending;
 import com.lyg.application.mapper.TaMandatoryLeaveMapper;
 import com.lyg.application.mapper.TaMessageMapper;
 import com.lyg.application.mapper.TaSendingMapper;
 import com.lyg.application.service.TaMandatoryLeaveService;
 import com.lyg.application.service.TaMessageService;
-import com.lyg.common.util.StringUtil;
-import com.lyg.system.entity.SysUser;
+import com.lyg.application.util.MessageHandle;
 import com.lyg.system.mapper.SysPositionMapper;
 import com.lyg.system.mapper.SysUserMapper;
 import com.lyg.system.service.SysOrgService;
@@ -22,6 +19,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
 
 /**
  * 强制休假表;(ta_mandatory_leave)表服务实现类
@@ -32,8 +30,13 @@ import java.util.List;
 @Service
 public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeaveMapper, TaMandatoryLeave> implements TaMandatoryLeaveService {
     private final List<String> errorMessages = new ArrayList<>();
+
+    private static final String MESSAGE_SOURCE_NAME = "taMandatoryLeave";
+    private static final String PROMPT_TYPE = "prompt";
+
     @Value("${yz.holidayTmp}")
     String holidayTmp;
+
     @Autowired
     private SysOrgService sysOrgService;
     @Autowired
@@ -49,6 +52,9 @@ public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeav
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private MessageHandle messageHandle;
+
     @Override
     public TaMandatoryLeave handleEntity(TaMandatoryLeave entity, Integer index) throws Exception {
 //校验验证
@@ -114,55 +120,43 @@ public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeav
     public void selectGetPrompt() {
         LocalDate localDate = LocalDate.now();
 
-        List<TaMandatoryLeave> promptList = baseMapper.prompt(localDate);
-        Integer numI = 3;
-        Integer nameI = 8;
-
-        if (promptList.size() != 0) {
-            for (TaMandatoryLeave item : promptList) {
-                TaMessage taMessage = new TaMessage();
-                String uuid = StringUtil.UUID();
-                taMessage.setMessageId(uuid);
-                taMessage.setSourceId(item.getLeaveId());
-                StringBuilder sb = new StringBuilder(holidayTmp);
-                sb.insert(numI, item.getEmployeeNum());
-                Integer i = item.getEmployeeNum().length() + nameI;
-                sb.insert(i, item.getEmployeeName());
-                taMessage.setContentSent(sb.toString());
-                taMessage.setSourceName("taMandatoryLeave");
-                taMessage.setWaringType("prompt");
-
-
-                Long count = taMessageService.countBy("source_id", item.getLeaveId(), true);
-                if (count == 0) {
-                    taMessageMapper.insert(taMessage);
-                    insertIntoTaSending(item.getCreateUser(), uuid);
-                }
-
-            }
-        }
+//        messageHandle.handleMandatoryLeaves(localDate, holidayTmp, PROMPT_TYPE);
+        // 提示消息处理
+        messageHandle.handleMandatoryLeaves(localDate, holidayTmp, PROMPT_TYPE,MESSAGE_SOURCE_NAME, baseMapper::prompt);
+//        List<TaMandatoryLeave> promptList = baseMapper.prompt(localDate);
+//
+//        if (promptList.size() != 0) {
+//            for (TaMandatoryLeave item : promptList) {
+//                Map<String,String> params = new HashMap<>();
+//                TaMessage taMessage = new TaMessage();
+//                String uuid = StringUtil.UUID();
+//                taMessage.setMessageId(uuid);
+//                taMessage.setSourceId(item.getLeaveId());
+//                StringBuilder sb = new StringBuilder(holidayTmp);
+//                sb.insert(Constants.numI, item.getEmployeeNum());
+//                Integer i = item.getEmployeeNum().length() + Constants.nameI;
+//                sb.insert(i, item.getEmployeeName());
+//                taMessage.setContentSent(sb.toString());
+//                taMessage.setSourceName("taMandatoryLeave");
+//                taMessage.setWaringType("prompt");
+//                params.put("taMandatoryLeave","taMandatoryLeave");
+//                params.put("prompt","prompt");
+//                params.put("stringBuilder",sb.toString());
+//
+//
+//                Long count = taMessageService.countBy("source_id", item.getLeaveId(), true);
+//                if (count == 0) {
+//                    taMessageMapper.insert(taMessage);
+//                    insertIntoTaSending(item.getCreateUser(), uuid);
+//                }else{
+//                    taMessageMapper.updateBySourceId(item.getLeaveId(),params);
+//                }
+//
+//            }
+//        }
 
 
     }
 
-    public void insertIntoTaSending(String createUser, String uuid) {
 
-        //                item.getCreateUser()  就是新增这个数据的人
-        //现在需要去重 创建人和管理员  是一个人只能往  Tasending插入一条数据否则是两条数据
-        SysUser sysUserAdmin = sysUserMapper.getAdmin(createUser);
-//                如果为空 就不是管理员创建的;
-        List<String> userIdList = new ArrayList<>();
-
-        if (sysUserAdmin == null) {
-            userIdList.add(createUser);
-        }
-        userIdList = sysUserMapper.allAdmin();
-        for (String it : userIdList) {
-            TaSending taSending = new TaSending();
-            taSending.setMessageId(uuid);
-            taSending.setRecipientId(it);
-            taSendingMapper.insert(taSending);
-        }
-
-    }
 }

application/src/main/java/com/lyg/application/service/impl/TaRotationServiceImpl.java

@@ -1,16 +1,13 @@
 package com.lyg.application.service.impl;
 
-import com.lyg.application.entity.TaMessage;
 import com.lyg.application.entity.TaRotation;
-import com.lyg.application.entity.TaSending;
 import com.lyg.application.mapper.TaMessageMapper;
 import com.lyg.application.mapper.TaRotationMapper;
 import com.lyg.application.mapper.TaSendingMapper;
 import com.lyg.application.service.TaMessageService;
 import com.lyg.application.service.TaRotationService;
+import com.lyg.application.util.MessageHandle;
 import com.lyg.application.util.Rule;
-import com.lyg.common.util.StringUtil;
-import com.lyg.system.entity.SysUser;
 import com.lyg.system.mapper.SysPositionMapper;
 import com.lyg.system.mapper.SysUserMapper;
 import com.lyg.system.service.SysOrgService;
@@ -35,6 +32,9 @@ import java.util.List;
 
 public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaRotation> implements TaRotationService {
 
+    private static final String WARNING_TYPE = "waring";
+    private static final String PROMPT_TYPE = "prompt";
+    private static final String MESSAGE_SOURCE_NAME = "taRotation";
     private final List<Object> errorMessages = new ArrayList<>();
     @Autowired
     Rule rule;
@@ -59,6 +59,10 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private MessageHandle messageHandle;
+
+
     public TaRotation handleEntity(TaRotation entity, Integer index) throws Exception {
 //校验验证
         System.out.println("******************************entity**************************************");
@@ -140,85 +144,68 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
 
     @Override
     public void selectGetWaring() {
+//
+////预警 消息
+//        List<TaRotation> earlyWaringList = baseMapper.waring(localDate);
+//
+//        if (!earlyWaringList.isEmpty()) {
+//            for (TaRotation item : earlyWaringList) {
+//                TaMessage taMessage = new TaMessage();
+//                String uuid = StringUtil.UUID();
+//                taMessage.setMessageId(uuid);
+//                taMessage.setSourceId(item.getRotationId());
+//                StringBuilder sb = new StringBuilder(warningTmp);
+//                sb.insert(Constants.numI, item.getEmployeeNum());
+//                Integer i = item.getEmployeeNum().length() + Constants.nameI;
+//                sb.insert(i, item.getEmployeeName());
+//                taMessage.setContentSent(sb.toString());
+//                taMessage.setSourceName("taRotation");
+//                taMessage.setWaringType("waring");
+//
+//                Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
+//                if (count == 0) {
+//                    taMessageMapper.insert(taMessage);
+//                    insertIntoTaSending(item.getCreateUser(), uuid);
+//                }
+//
+//            }
+//        }
+////提示消息
+//        List<TaRotation> earlyPromptList = baseMapper.prompt(localDate);
+//
+//        if (earlyPromptList.size() != 0) {
+//            for (TaRotation item : earlyPromptList) {
+//                TaMessage taMessage = new TaMessage();
+//                String uuid = StringUtil.UUID();
+//                taMessage.setMessageId(uuid);
+//                taMessage.setSourceId(item.getRotationId());
+//                StringBuilder sb = new StringBuilder(promptTmp);
+//                sb.insert(Constants.numI, item.getEmployeeNum());
+//                Integer i = item.getEmployeeNum().length() + Constants.nameI;
+//                sb.insert(i, item.getEmployeeName());
+//                taMessage.setContentSent(sb.toString());
+//                taMessage.setSourceName("taRotation");
+//                taMessage.setWaringType("prompt");
+//
+//                Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
+//                if (count == 0) {
+//                    taMessageMapper.insert(taMessage);
+//                    insertIntoTaSending(item.getCreateUser(), uuid);
+//                }
+//
+//            }
+//        }
+
+//        return;
         LocalDate localDate = LocalDate.now();
-        Integer numI = 3;
-        Integer nameI = 8;
-//预警 消息
-        List<TaRotation> earlyWaringList = baseMapper.waring(localDate);
-
-        if (earlyWaringList.size() != 0) {
-            for (TaRotation item : earlyWaringList) {
-                TaMessage taMessage = new TaMessage();
-                String uuid = StringUtil.UUID();
-                taMessage.setMessageId(uuid);
-                taMessage.setSourceId(item.getRotationId());
-                StringBuilder sb = new StringBuilder(warningTmp);
-                sb.insert(numI, item.getEmployeeNum());
-                Integer i = item.getEmployeeNum().length() + nameI;
-                sb.insert(i, item.getEmployeeName());
-                taMessage.setContentSent(sb.toString());
-                taMessage.setSourceName("taRotation");
-                taMessage.setWaringType("waring");
-
-                Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
-                if (count == 0) {
-                    taMessageMapper.insert(taMessage);
-                    insertIntoTaSending(item.getCreateUser(), uuid);
-                }
-
-            }
-        }
-//提示消息
-        List<TaRotation> earlyPromptList = baseMapper.prompt(localDate);
-
-        if (earlyPromptList.size() != 0) {
-            for (TaRotation item : earlyPromptList) {
-                TaMessage taMessage = new TaMessage();
-                String uuid = StringUtil.UUID();
-                taMessage.setMessageId(uuid);
-                taMessage.setSourceId(item.getRotationId());
-                StringBuilder sb = new StringBuilder(promptTmp);
-                sb.insert(numI, item.getEmployeeNum());
-                Integer i = item.getEmployeeNum().length() + nameI;
-                sb.insert(i, item.getEmployeeName());
-                taMessage.setContentSent(sb.toString());
-                taMessage.setSourceName("taRotation");
-                taMessage.setWaringType("prompt");
-
-                Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
-                if (count == 0) {
-                    taMessageMapper.insert(taMessage);
-                    insertIntoTaSending(item.getCreateUser(), uuid);
-                }
-
-            }
-        }
 
+        // 预警消息处理
+        messageHandle.handleMessages(localDate, warningTmp,WARNING_TYPE,MESSAGE_SOURCE_NAME ,baseMapper::waring);
 
-        return;
+        // 提示消息处理
+        messageHandle.handleMessages(localDate,promptTmp, PROMPT_TYPE, MESSAGE_SOURCE_NAME ,baseMapper::prompt);
     }
 
-    public void insertIntoTaSending(String createUser, String uuid) {
-
-        //                item.getCreateUser()  就是新增这个数据的人
-        //现在需要去重 创建人和管理员  是一个人只能往  Tasending插入一条数据否则是两条数据
-        SysUser sysUserAdmin = sysUserMapper.getAdmin(createUser);
-//                如果为空 就不是管理员创建的;
-        List<String> userIdList = new ArrayList<>();
-
-        if (sysUserAdmin == null) {
-            userIdList.add(createUser);
-        }
-        userIdList = sysUserMapper.allAdmin();
-
-        for (String it : userIdList) {
-            TaSending taSending = new TaSending();
-            taSending.setMessageId(uuid);
-            taSending.setRecipientId(it);
-            taSendingMapper.insert(taSending);
-        }
-
-    }
 
     public List<Object> getErrorMessages() {
         return errorMessages;

application/src/main/java/com/lyg/application/util/MessageHandle.java

@@ -0,0 +1,164 @@
+package com.lyg.application.util;
+
+import com.lyg.application.entity.TaMandatoryLeave;
+import com.lyg.application.entity.TaMessage;
+import com.lyg.application.entity.TaRotation;
+import com.lyg.application.entity.TaSending;
+import com.lyg.application.mapper.TaMandatoryLeaveMapper;
+import com.lyg.application.mapper.TaMessageMapper;
+import com.lyg.application.mapper.TaSendingMapper;
+import com.lyg.application.service.TaMessageService;
+import com.lyg.common.Constants;
+import com.lyg.common.util.StringUtil;
+import com.lyg.system.entity.SysUser;
+import com.lyg.system.mapper.SysUserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+@Component
+public class MessageHandle {
+
+    private static final String MESSAGE_SOURCE_NAME = "taRotation";
+
+
+    @Autowired
+    private TaMessageService taMessageService;
+    @Autowired
+    private TaMessageMapper taMessageMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    @Autowired
+    private TaSendingMapper taSendingMapper;
+
+    @Autowired
+    private TaMandatoryLeaveMapper taMandatoryLeaveMapper;
+
+    /**
+     * 处理消息的通用逻辑
+     *
+     * @param localDate        日期
+     * @param messageType      消息类型
+     * @param dataFetchingFunc 数据获取的函数
+     */
+    public void handleMessages(LocalDate localDate, String tmp, String messageType, String sourceName, Function<LocalDate, List<TaRotation>> dataFetchingFunc) {
+        List<TaRotation> messageList = dataFetchingFunc.apply(localDate);
+
+        if (!messageList.isEmpty()) {
+            // 在循环外初始化StringBuilder
+
+            for (TaRotation item : messageList) {
+                processItem(item, tmp, messageType, sourceName);
+            }
+        }
+    }
+
+
+    /**
+     * 处理每个项目的消息逻辑
+     *
+     * @param item        数据项
+     * @param messageType 消息类型
+     */
+    private void processItem(TaRotation item, String tmp, String messageType, String sourceName) {
+        StringBuilder stringBuilder = new StringBuilder();
+        TaMessage taMessage = new TaMessage();
+        Map<String, String> params = new HashMap<>();
+
+
+        String uuid = StringUtil.UUID();
+        taMessage.setMessageId(uuid);
+        taMessage.setSourceId(item.getRotationId());
+
+        // 使用描述性强的常量代替硬编码值
+        stringBuilder.append(tmp); // 假设warningTmp或promptTmp已经定义且包含插入点
+        stringBuilder.insert(Constants.numI, item.getEmployeeNum());
+        int insertPos = Constants.numI + item.getEmployeeNum().length() + Constants.nameI;
+        stringBuilder.insert(insertPos, item.getEmployeeName());
+        taMessage.setContentSent(stringBuilder.toString());
+        taMessage.setSourceName(sourceName);
+        taMessage.setWaringType(messageType);
+        params.put("sourceName", sourceName);
+        params.put("waringType", messageType);
+        params.put("contentSent", stringBuilder.toString());
+        Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
+        if (count == 0) {
+            taMessageMapper.insert(taMessage);
+            insertIntoTaSending(item.getCreateUser(), uuid);
+        } else {
+            taMessageMapper.updateBySourceId(item.getRotationId(), params);
+        }
+    }
+
+
+    public void handleMandatoryLeaves(LocalDate localDate, String tmp, String messageType, String sourceName, Function<LocalDate, List<TaMandatoryLeave>> dataFetchingFunc) {
+        List<TaMandatoryLeave> messageList = dataFetchingFunc.apply(localDate);
+
+        if (!messageList.isEmpty()) {
+
+            for (TaMandatoryLeave item : messageList) {
+                processItemLeaves(item, tmp, messageType, sourceName);
+            }
+        }
+    }
+
+    private void processItemLeaves(TaMandatoryLeave item, String tmp, String messageType, String sourceName) {
+        StringBuilder stringBuilder = new StringBuilder();
+        TaMessage taMessage = new TaMessage();
+        Map<String, String> params = new HashMap<>();
+
+        String uuid = StringUtil.UUID();
+        taMessage.setMessageId(uuid);
+        taMessage.setSourceId(item.getLeaveId());
+
+        // 使用描述性强的常量代替硬编码值
+        stringBuilder.append(tmp); // 假设warningTmp或promptTmp已经定义且包含插入点
+        stringBuilder.insert(Constants.numI, item.getEmployeeNum());
+        int insertPos = Constants.numI + item.getEmployeeNum().length() + Constants.nameI;
+        stringBuilder.insert(insertPos, item.getEmployeeName());
+        taMessage.setContentSent(stringBuilder.toString());
+        taMessage.setSourceName(sourceName);
+        taMessage.setWaringType(messageType);
+        params.put("sourceName", "taMandatoryLeave");
+        params.put("waringType", "prompt");
+        params.put("contentSent", stringBuilder.toString());
+        Long count = taMessageService.countBy("source_id", item.getLeaveId(), true);
+        if (count == 0) {
+            taMessageMapper.insert(taMessage);
+            insertIntoTaSending(item.getCreateUser(), uuid);
+        } else {
+            taMessageMapper.updateBySourceId(item.getLeaveId(), params);
+        }
+    }
+
+
+    public void insertIntoTaSending(String createUser, String uuid) {
+
+        //                item.getCreateUser()  就是新增这个数据的人
+        //现在需要去重 创建人和管理员  是一个人只能往  Tasending插入一条数据否则是两条数据
+        SysUser sysUserAdmin = sysUserMapper.getAdmin(createUser);
+//                如果为空 就不是管理员创建的;
+        List<String> userIdList = new ArrayList<>();
+
+        if (sysUserAdmin == null) {
+            userIdList.add(createUser);
+        }
+        userIdList = sysUserMapper.allAdmin();
+
+        for (String it : userIdList) {
+            TaSending taSending = new TaSending();
+            taSending.setMessageId(uuid);
+            taSending.setRecipientId(it);
+            taSendingMapper.insert(taSending);
+        }
+
+    }
+
+
+}

application/src/main/java/com/lyg/application/util/RuleDetail.java

@@ -5,6 +5,7 @@ import com.lyg.application.entity.TaIncompatible;
 import com.lyg.application.entity.TaRotation;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 public class RuleDetail {
@@ -15,33 +16,73 @@ public class RuleDetail {
         List<ErrorDto> result = new ArrayList<>();
 
         //普通规则
-        if (taIncompatibleList.size() == 0) {
-            errorDto.setRegularRules("普通规则:根据不相容设置这两个岗位是相容的");
-        } else {
-            for (TaIncompatible item : taIncompatibleList) {
-                errorDto.setPrimaryPost(item.getPrimaryPost());
-                errorDto.setTargetPost(item.getTargetPost());
-
-            }
+        // 处理 taIncompatibleList
+        if (taIncompatibleList.size() != 0) {
+            result.addAll(processTaIncompatibleList(taIncompatibleList));
         }
 
 
-        if (repelList.size() == 0) {
-            errorDto.setMonthRules("三个月规则: 这是两个岗位是相容的");
-        } else {
-            for (TaRotation item : repelList) {
-                errorDto.setCounterImpPositions(item.getCounterImpPositions());
-                errorDto.setCounterImpPost(item.getCounterImpPostRotation());
-                errorDto.setSpecificOrgName(item.getSpecificOrgName());
-                errorDto.setSpecificOrgNum(item.getSpecificOrgNum());
-                errorDto.setSpecificNameOrgRotation(item.getSpecificNameOrgRotation());
-                errorDto.setOrgNumJobRotation(item.getOrgNumJobRotation());
-                errorDto.setEmployeeNum(item.getEmployeeNum());
-                errorDto.setEmployeeName(item.getEmployeeName());
-            }
+        // 处理 repelList
+        if (repelList.size() != 0) {
+            result.addAll(processTaRotationList(repelList));
         }
-        result.add(errorDto);
         return result;
+
+
+    }
+
+    private Collection<? extends ErrorDto> processTaRotationList(List<TaRotation> repelList) {
+        List<ErrorDto> resultList = new ArrayList<>();
+        ErrorDto errorDto = new ErrorDto();
+
+        // 当列表为空，直接添加一个具有默认信息的 ErrorDto
+        if (repelList.isEmpty()) {
+            errorDto.setMonthRules("根据不相容设置这两个岗位是相容的");
+            resultList.add(errorDto);
+            return resultList;
+        }
+
+        // 对每个 item 进行处理，创建新的 ErrorDto 实例
+        for (TaRotation item : repelList) {
+            ErrorDto dto = new ErrorDto();
+            // 设置属性
+            dto.setCounterImpPositions(item.getCounterImpPositions());
+            dto.setCounterImpPost(item.getCounterImpPostRotation());
+            dto.setSpecificOrgName(item.getSpecificOrgName());
+            dto.setSpecificOrgNum(item.getSpecificOrgNum());
+            dto.setSpecificNameOrgRotation(item.getSpecificNameOrgRotation());
+            dto.setOrgNumJobRotation(item.getOrgNumJobRotation());
+            dto.setEmployeeNum(item.getEmployeeNum());
+            dto.setEmployeeName(item.getEmployeeName());
+            resultList.add(dto);
+        }
+
+        return resultList;
+
+    }
+
+    private Collection<? extends ErrorDto> processTaIncompatibleList(List<TaIncompatible> taIncompatibleList) {
+
+        List<ErrorDto> resultList = new ArrayList<>();
+        ErrorDto errorDto = new ErrorDto();
+
+        // 当列表为空，直接添加一个具有默认信息的 ErrorDto
+        if (taIncompatibleList.isEmpty()) {
+            errorDto.setRegularRules("根据不相容设置这两个岗位是相容的");
+            resultList.add(errorDto);
+            return resultList;
+        }
+
+        // 对每个 item 进行处理，创建新的 ErrorDto 实例
+        for (TaIncompatible item : taIncompatibleList) {
+            ErrorDto dto = new ErrorDto();
+            dto.setPrimaryPost(item.getPrimaryPost());
+            dto.setTargetPost(item.getTargetPost());
+            resultList.add(dto);
+        }
+
+        return resultList;
+
     }
 
 }

application/src/main/resources/mapper/TaMessageMapper.xml

@@ -2,5 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.lyg.application.mapper.TaMessageMapper">
-    
+
+    <update id="updateBySourceId">
+        update TA_MESSAGE m
+        <set>
+            <if test="params.contentSent != null and params.contentSent != ''">
+                m.CONTENT_SENT = #{params.contentSent},
+            </if>
+            <if test="params.sourceName != null and params.sourceName != ''">
+                m.SOURCE_NAME = #{params.sourceName},
+            </if>
+            <if test="params.waringType != null and params.waringType != ''">
+                m.WARING_TYPE = #{params.waringType}
+            </if>
+        </set>
+        WHERE m.source_id = #{id}
+        AND m.deleted = 0
+    </update>
 </mapper>

common/src/main/java/com/lyg/common/Constants.java

@@ -19,4 +19,9 @@ public class Constants {
     //三个月规则
     public final static String MONTH_RULE = "monthRules";
 
+
+    //TaMessage
+    public final static Integer numI = 3;
+    public final static Integer nameI = 8;
+
 }