F

application/src/main/java/com/lyg/application/DTO/ErrorDto.java

@@ -5,12 +5,12 @@ import lombok.Data;
 
 @Data
 public class ErrorDto {
-    private String regularRules;//普通规则 提示
+    private String rules;//普通规则 提示
     private String primaryPost; //原来的岗位
     private String targetPost;// 轮岗之后的岗位
 
 
-    private String monthRules;//三个月规则 提示
+//    private String monthRules;//三个月规则 提示
     private  String employeeNum;//员工工号
     private  String employeeName;//员工姓名
 

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

@@ -12,7 +12,6 @@ import com.lyg.common.util.StringUtil;
 import com.lyg.framework.accesslimit.AccessLimit;
 import com.lyg.framework.log.OpLog;
 import com.lyg.system.controller.BaseController;
-import com.lyg.system.entity.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -148,8 +147,6 @@ public class TaIncompatibleController extends BaseController {
             @ApiParam("原岗位") @RequestParam(value = "primaryPost", required = false) String primaryPost,
             @ApiParam("目标机构/网点") @RequestParam(value = "newOrgCode", required = false) String newOrgCode,
             @ApiParam("目标岗位") @RequestParam(value = "targetPost", required = false) String targetPost) throws Exception {
-
-
         Map<String, String> params = new Hashtable<>();
 
         if (oldOrgCode != null && newOrgCode != null && primaryPost != null && targetPost != null && passTime != null) {

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

@@ -4,8 +4,10 @@ import cn.dev33.satoken.util.SaResult;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.lyg.application.DTO.ErrorDto;
 import com.lyg.application.entity.TaRotation;
 import com.lyg.application.service.TaRotationService;
+import com.lyg.application.util.CreateResponse;
 import com.lyg.application.util.Rule;
 import com.lyg.common.util.StringUtil;
 import com.lyg.framework.accesslimit.AccessLimit;
@@ -19,6 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 轮岗列表;(ta_rotation)表控制层
  *
@@ -55,7 +60,7 @@ public class TaRotationController extends BaseController {
 
         Boolean b = checkAuth() == null || checkAuth() == taRotation.getCreateUser();
         if (b) {
-           return SaResult.data(taRotationService.getById(id));
+            return SaResult.data(taRotationService.getById(id));
         }
         return SaResult.error("无权限");
 
@@ -120,7 +125,26 @@ public class TaRotationController extends BaseController {
     public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaRotation taRotation) throws Exception {
         taRotationService.save(taRotation);
         Object result = rule.taRotationRule(taRotation);
-        return SaResult.data(result);
+
+//        LocalDate localDate = LocalDate.now();
+//        DateTimeFormatter ft = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//        String oldOrgCode = taRotation.getSpecificOrgNum();
+//        String newOrgCode = taRotation.getOrgNumJobRotation();
+//        String primaryPost = taRotation.getCounterImpPositions();
+//        String targetPost = taRotation.getCounterImpPostRotation();
+//        String passTime = localDate.format(ft);
+//        if (oldOrgCode != null && newOrgCode != null && primaryPost != null && targetPost != null && passTime != null) {
+//
+//            Map<String, String> params = new HashMap<>();
+//            params.put("oldOrgCode", oldOrgCode);
+//            params.put("newOrgCode", newOrgCode);
+//            params.put("primaryPost", primaryPost);
+//            params.put("targetPost", targetPost);
+//            params.put("passTime", passTime);
+//
+//            List<ErrorDto> result = rule.siftRule(params);
+//        }
+        return (SaResult) result;
     }
 
     /**
@@ -139,7 +163,29 @@ public class TaRotationController extends BaseController {
         taRotation.setRotationId(id);
         taRotationService.updateById(taRotation);
         Object result = rule.taRotationRule(taRotation);
-        return SaResult.data(result);
+//        boolean isAllCompatible = true;
+//        if (result instanceof List) {
+//            ArrayList<ErrorDto> resultList = (ArrayList<ErrorDto>) rule.taRotationRule(taRotation);
+//            for (ErrorDto errorDto : resultList) {
+//                String regularRuleMessage = errorDto.getRegularRules();
+//                String monthRules = errorDto.getMonthRules();
+//                if (regularRuleMessage != null||monthRules != null) {
+//                    // 判断并添加相容/不相容信息到消息中
+//                    if (regularRuleMessage.contains("是不相容的")|| monthRules.contains("是不相容的")) {
+//                        isAllCompatible = true;
+//                    } else if (regularRuleMessage.contains("是相容的")|| monthRules.contains("是相容的")) {
+//                        isAllCompatible = false;
+//                    }
+//                }
+//            }
+//        } else if (result instanceof TaRotation) {
+//
+//        }
+
+
+// 设置规则的 id（假设 You
+
+        return (SaResult) result;
 
     }
 

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

@@ -120,11 +120,12 @@ public class UploadController extends BaseController {
 
 
     @AccessLimit()
-    @Scheduled(cron = "0 0 8 * * *")
+//    @Scheduled(cron = "0 0 8 * * *")
     @GetMapping("/as/holiday")
     public void promptWarning() throws Exception {
 
         taRotationService.selectGetWaring();
+//        taMandatoryLeaveService.selectGetPrompt();
 
     }
 

application/src/main/java/com/lyg/application/entity/TaRotation.java

@@ -36,7 +36,6 @@ public class TaRotation implements Serializable, Cloneable {
     private String sort;
 
     @ExcelProperty(index = 1)
-    @NotBlank(message = "总行部门不能为空")
     @ApiModelProperty(name = "总行部门/一级分行", notes = "")
     private String headOfficeOrg;
 

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

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 不相容;(ta_incompatible)表数据库访问层
@@ -16,7 +17,7 @@ import java.util.List;
 @Mapper
 public interface TaIncompatibleMapper extends BaseMapper<TaIncompatible> {
 
-    List<TaIncompatible> getRegularRules(@Param("oldOrgName") String oldOrgName, @Param("newOrgName") String newOrgName, @Param("regularRule") String regularRule);
+    List<TaIncompatible> getRegularRules(@Param("params") Map<String, String> params, @Param("regularRule") String regularRule);
 
     List<String> getMonthRulesPrimary(@Param("primaryPost") String primaryPost, @Param("monthRule") String monthRule);
 

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

@@ -122,10 +122,10 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
         }
 
 
-        if (orgName != null && specificNameOrgRotation != null && rotationName != null && counterImpPostRotation != null) {
-            Object result = rule.taRotationRule(entity);
-            errorMessages.add(result);
-        }
+//        if (orgName != null && specificNameOrgRotation != null && rotationName != null && counterImpPostRotation != null) {
+//            Object result = rule.taRotationRule(entity);
+//            errorMessages.add(result);
+//        }
 
         return entity;
     }

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

@@ -0,0 +1,24 @@
+package com.lyg.application.util;
+
+import cn.dev33.satoken.util.SaResult;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CreateResponse {
+
+
+    public static SaResult createResponse(int code, Object data, String msg) {
+        // 创建一个SaResult实例
+        SaResult result = new SaResult();
+
+        // 设置code和msg
+        result.setCode(code);
+        result.setMsg(msg);
+
+        // 设置数据内容
+        result.setData(data);
+
+        // 返回包含了msg、code和data的结果对象
+        return result;
+    }
+}

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

@@ -79,7 +79,7 @@ public class MessageHandle {
         // 使用描述性强的常量代替硬编码值
         stringBuilder.append(tmp); // 假设warningTmp或promptTmp已经定义且包含插入点
         stringBuilder.insert(Constants.numI, item.getEmployeeNum());
-        int insertPos = Constants.numI + item.getEmployeeNum().length() + Constants.nameI;
+        int insertPos = item.getEmployeeNum().length() + Constants.nameI;
         stringBuilder.insert(insertPos, item.getEmployeeName());
         taMessage.setContentSent(stringBuilder.toString());
         taMessage.setSourceName(sourceName);
@@ -120,7 +120,7 @@ public class MessageHandle {
         // 使用描述性强的常量代替硬编码值
         stringBuilder.append(tmp); // 假设warningTmp或promptTmp已经定义且包含插入点
         stringBuilder.insert(Constants.numI, item.getEmployeeNum());
-        int insertPos = Constants.numI + item.getEmployeeNum().length() + Constants.nameI;
+        int insertPos = item.getEmployeeNum().length() + Constants.nameI;
         stringBuilder.insert(insertPos, item.getEmployeeName());
         taMessage.setContentSent(stringBuilder.toString());
         taMessage.setSourceName(sourceName);

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

@@ -1,6 +1,7 @@
 package com.lyg.application.util;
 
 
+import cn.dev33.satoken.util.SaResult;
 import com.lyg.application.DTO.ErrorDto;
 import com.lyg.application.entity.TaIncompatible;
 import com.lyg.application.entity.TaRotation;
@@ -25,7 +26,7 @@ public class Rule {
     TaIncompatibleMapper taIncompatibleMapper;
     @Autowired
     TaRotationMapper taRotationMapper;
-
+    private static final String COMPATIBLE_TEXT = "根据不相容设置这两个岗位是相容的";
 
     //这是在controller中使用的
     public Object taRotationRule(TaRotation taRotation) {
@@ -39,32 +40,48 @@ public class Rule {
             LocalDate newDate = LocalDate.now();
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             String passTime = newDate.format(formatter);
-            params.put("oldOrgCode", taRotation.getSpecificOrgName());
-            params.put("newOrgCode", taRotation.getSpecificNameOrgRotation());
+            params.put("oldOrgCode", taRotation.getSpecificOrgNum());
+            params.put("newOrgCode", taRotation.getOrgNumJobRotation());
             params.put("primaryPost", taRotation.getCounterImpPositions());
             params.put("targetPost", taRotation.getCounterImpPostRotation());
             params.put("passTime", passTime);
 
-
             List<ErrorDto> result = siftRule(params);
+            boolean isRulesCompatible = true;
+            if (!result.isEmpty()) {
+                isRulesCompatible = result.stream()
+                        .allMatch(error -> error.getRules() != null && error.getRules().contains(COMPATIBLE_TEXT));
+
+
+            }
+
+            String message = (isRulesCompatible  ? "不相容" : "相容";
+
+
+                int statusCode = 200; // HTTP状态码
+                // 自定义消息
+                SaResult response = CreateResponse.createResponse(statusCode, result, message);
+
+                return response;
 
-            return result;
         }
-        return taRotation;
+        return SaResult.data(taRotation);
     }
 
 
     public List<ErrorDto> siftRule(Map<String, String> params) {
-        String primaryPost = params.get("primaryPost");
-        String targetPost = params.get("targetPost");
-
+        List<TaIncompatible> taIncompatibleList = new ArrayList<>();
+        if (params.get("oldOrgCode").equals(params.get("newOrgCode"))) {
+//        普通规则
+            taIncompatibleList = regularRules(params);
+        }
+//        三个月规则
         List<TaRotation> repelList = getMonthRules(params);
 
-        List<TaIncompatible> taIncompatibleList = regularRules(primaryPost, targetPost);
 
-        RuleDetail ruleDetail=new RuleDetail();
+        RuleDetail ruleDetail = new RuleDetail();
 
-        List<ErrorDto> result = ruleDetail.planRuleType(taIncompatibleList,repelList);
+        List<ErrorDto> result = ruleDetail.planRuleType(taIncompatibleList, repelList);
 
 
         return result;
@@ -73,8 +90,8 @@ public class Rule {
     }
 
 
-    public List<TaIncompatible> regularRules(String primaryPost, String targetPost) {
-        return taIncompatibleMapper.getRegularRules(primaryPost, targetPost, Constants.REGULAR_RULE);
+    public List<TaIncompatible> regularRules(Map<String, String> params) {
+        return taIncompatibleMapper.getRegularRules(params, Constants.REGULAR_RULE);
 
     }
 
@@ -102,7 +119,7 @@ public class Rule {
             targetList.add(targetPost);
 
             //拿到数据 不相容轮岗数据
-            repelList = taRotationMapper.selectRepel(orgList, targetList, newDate,params);
+            repelList = taRotationMapper.selectRepel(orgList, targetList, newDate, params);
 
             return repelList;
         }

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

@@ -12,20 +12,19 @@ public class RuleDetail {
 
     public List<ErrorDto> planRuleType(List<TaIncompatible> taIncompatibleList, List<TaRotation> repelList) {
 
-        ErrorDto errorDto = new ErrorDto();
         List<ErrorDto> result = new ArrayList<>();
 
         //普通规则
         // 处理 taIncompatibleList
-        if (taIncompatibleList.size() != 0) {
+//        if (taIncompatibleList.size() != 0) {
             result.addAll(processTaIncompatibleList(taIncompatibleList));
-        }
+//        }
 
 
         // 处理 repelList
-        if (repelList.size() != 0) {
+//        if (repelList.size() != 0) {
             result.addAll(processTaRotationList(repelList));
-        }
+//        }
         return result;
 
 
@@ -37,7 +36,7 @@ public class RuleDetail {
 
         // 当列表为空，直接添加一个具有默认信息的 ErrorDto
         if (repelList.isEmpty()) {
-            errorDto.setMonthRules("根据不相容设置这两个岗位是相容的");
+            errorDto.setRules("根据不相容设置这两个岗位是相容的");
             resultList.add(errorDto);
             return resultList;
         }
@@ -46,6 +45,7 @@ public class RuleDetail {
         for (TaRotation item : repelList) {
             ErrorDto dto = new ErrorDto();
             // 设置属性
+            dto.setRules("根据不相容设置这两个岗位是不相容的");
             dto.setCounterImpPositions(item.getCounterImpPositions());
             dto.setCounterImpPost(item.getCounterImpPostRotation());
             dto.setSpecificOrgName(item.getSpecificOrgName());
@@ -68,7 +68,7 @@ public class RuleDetail {
 
         // 当列表为空，直接添加一个具有默认信息的 ErrorDto
         if (taIncompatibleList.isEmpty()) {
-            errorDto.setRegularRules("根据不相容设置这两个岗位是相容的");
+            errorDto.setRules("根据不相容设置这两个岗位是相容的");
             resultList.add(errorDto);
             return resultList;
         }
@@ -76,6 +76,7 @@ public class RuleDetail {
         // 对每个 item 进行处理，创建新的 ErrorDto 实例
         for (TaIncompatible item : taIncompatibleList) {
             ErrorDto dto = new ErrorDto();
+            dto.setRules("根据不相容设置这两个岗位是不相容的");
             dto.setPrimaryPost(item.getPrimaryPost());
             dto.setTargetPost(item.getTargetPost());
             resultList.add(dto);

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

@@ -8,7 +8,7 @@
         FROM
         TA_INCOMPATIBLE i
         WHERE
-        i.PRIMARY_POST=#{oldOrgName} AND i.TARGET_POST=#{newOrgName}
+        i.PRIMARY_POST=#{params.primaryPost} AND i.TARGET_POST=#{params.targetPost}
         AND i.DELETED=0 AND i.Rule=#{regularRule}
     </select>
 

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

@@ -14,7 +14,7 @@ public class Constants {
 
 
     //普通规则
-    public final static String REGULAR_RULE = "regularRule";
+    public final static String REGULAR_RULE = "regularRules";
 
     //三个月规则
     public final static String MONTH_RULE = "monthRules";