F

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

@@ -5,6 +5,7 @@ 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.entity.TaIncompatible;
+import com.lyg.application.entity.TaRotation;
 import com.lyg.application.service.TaIncompatibleService;
 import com.lyg.common.util.StringUtil;
 import com.lyg.framework.accesslimit.AccessLimit;
@@ -128,51 +129,52 @@ public class TaIncompatibleController extends BaseController {
 
     /**
      * 分页查询
-     *
-     * @return 查询结果
      */
     @OpLog(module = "不相容规则查询", action = "")
     @AccessLimit()
     @ApiOperation("不相容规则查询")
     @GetMapping("/taIncompatible/rule")
     public SaResult listRule(
-            @ApiParam("当前时间") @RequestParam(value = "newTime", required = false) String newTime,
-            @ApiParam("原机构/网点") @RequestParam(value = "orgCode", required = false) String oldOrgCode,
+            @ApiParam("当前时间") @RequestParam(value = "passTime", required = false) String passTime,
+            @ApiParam("原机构/网点") @RequestParam(value = "oldOrgCode", required = false) String oldOrgCode,
             @ApiParam("原岗位") @RequestParam(value = "primaryPost", required = false) String primaryPost,
-            @ApiParam("目标机构/网点") @RequestParam(value = "orgCode", required = false) String newOrgCode,
+            @ApiParam("目标机构/网点") @RequestParam(value = "newOrgCode", required = false) String newOrgCode,
             @ApiParam("目标岗位") @RequestParam(value = "targetPost", required = false) String targetPost) throws Exception {
 
 
         Map<String, String> params = new Hashtable<>();
-        params.put("oldOrgCode", oldOrgCode);
-        params.put("newOrgCode", newOrgCode);
-        params.put("primaryPost", primaryPost);
-        params.put("targetPost", targetPost);
-        if (oldOrgCode != null && newOrgCode != null && primaryPost != null && targetPost != null && newTime != null) {
 
+        if (oldOrgCode != null && newOrgCode != null && primaryPost != null && targetPost != null && passTime != null) {
             //普通规则
             if (oldOrgCode.equals(newOrgCode)) {
                 List<TaIncompatible> taIncompatibleList = taIncompatibleService.getRegularRules(primaryPost, targetPost);
 
                 if (taIncompatibleList.size() == 0) {
-                   return SaResult.data("普通规则:根据不相容设置这两个岗位是相容的");
+                    return SaResult.data("普通规则:根据不相容设置这两个岗位是相容的");
                 } else {
                     return SaResult.data(taIncompatibleList);
                 }
 
             } else {
-//三个月规则
-
-
-                taIncompatibleService.getMonthRules(params);
-
+                params.put("oldOrgCode", oldOrgCode);
+                params.put("newOrgCode", newOrgCode);
+                params.put("primaryPost", primaryPost);
+                params.put("targetPost", targetPost);
+                params.put("passTime", passTime);
+                //三个月规则
+
+                List<TaRotation> repelList = taIncompatibleService.getMonthRules(params);
+                if (repelList.size() == 0) {
+                    return SaResult.data("三个月规则: 这是两个岗位是相容的");
+                } else {
+                    return SaResult.data(repelList);
+                }
 
             }
-        } else {
-            return SaResult.error("请输入岗位或机构号");
         }
+        return SaResult.error("请输入岗位或机构号");
+
 
-        return null;
     }
 
 

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -111,4 +112,26 @@ public class UploadController extends BaseController {
     }
 
 
+
+
+//
+//    @AccessLimit()
+//    @ApiOperation("提示/预警")
+//    @Scheduled(cron = "0 45 2 1 1,4,7,10 ?")
+//    @GetMapping("/prompt/warning")
+//    public SaResult promptWarning() throws Exception {
+//
+//
+//return  SaResult.data("");
+//
+//
+//    }
+
+
+
+
+
+
+
+
 }

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

@@ -1,16 +1,21 @@
 package com.lyg.application.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lyg.application.entity.TaRotation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import com.lyg.application.entity.TaRotation;
 
- /**
+import java.time.LocalDate;
+import java.util.List;
+
+/**
  * 轮岗列表;(ta_rotation)表数据库访问层
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 @Mapper
-public interface TaRotationMapper  extends BaseMapper<TaRotation>{
-    
+public interface TaRotationMapper extends BaseMapper<TaRotation> {
+
+    List<TaRotation> selectRepel(@Param("orgList") List<String> orgList, @Param("targetList") List<String> targetList,@Param("newDate") LocalDate newDate);
 }

application/src/main/java/com/lyg/application/schedule/TaskSchedule.java

@@ -0,0 +1,98 @@
+package com.lyg.application.schedule;
+
+import com.lyg.application.service.TaRotationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class TaskSchedule {
+
+    @Autowired
+    TaRotationService taRotationService;
+
+    @Scheduled(cron = "0 14 18 * * ?")
+    public void lockOver() {
+        System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!");
+
+    }
+
+//    /**
+//     * 每天晚上 11 点 50 执行
+//     * 锁定任务, 并设置为过期
+//     */
+//    @Scheduled(cron = "0 50 23 * * ?")
+//    public void lockOver() {
+//        try {
+//            taTaskService.lockTask();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    /**
+//     * 每天凌晨 1:00 执行
+//     */
+//    @Scheduled(cron = "0 0 1 * * ?")
+//    public void daily() {
+//        try {
+//            String batchId = TaskUtil.getDailyBatchId();
+//            taTaskService.syncTask(batchId, FrequencyEnum.BEFORE_WORK.getValue());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        try {
+//            String batchId = TaskUtil.getDailyBatchId();
+//            taTaskService.syncTask(batchId, FrequencyEnum.AT_WORK.getValue());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        try {
+//            String batchId = TaskUtil.getDailyBatchId();
+//            taTaskService.syncTask(batchId, FrequencyEnum.AFTER_WORK.getValue());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    /**
+//     * 每周一凌晨 2:00 执行
+//     */
+//    @Scheduled(cron = "0 0 2 * * MON")
+//    public void weekly() {
+//        try {
+//            String batchId = TaskUtil.getWeeklyBatchId();
+//            taTaskService.syncTask(batchId, FrequencyEnum.WEEKLY.getValue());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//    /**
+//     * 每月1号凌晨 2:30 执行
+//     */
+//    @Scheduled(cron = "0 30 2 1 * ?")
+//    public void monthly() {
+//        try {
+//            String batchId = TaskUtil.getMonthlyBatchId();
+//            taTaskService.syncTask(batchId, FrequencyEnum.MONTHLY.getValue());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+//
+//
+//    /**
+//     * 每季度第一个月 1号凌晨 2:45 执行
+//     */
+//    @Scheduled(cron = "0 45 2 1 1,4,7,10 ?")
+//    public void quarterly() {
+//        try {
+//            String batchId = TaskUtil.getQuarterlyBatchId();
+//            taTaskService.syncTask(batchId, FrequencyEnum.QUARTERLY.getValue());
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
+}

application/src/main/java/com/lyg/application/service/TaIncompatibleService.java

@@ -1,7 +1,8 @@
 package com.lyg.application.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import cn.dev33.satoken.util.SaResult;
 import com.lyg.application.entity.TaIncompatible;
+import com.lyg.application.entity.TaRotation;
 import com.lyg.system.service.IBaseService;
 
 import java.util.List;
@@ -17,5 +18,5 @@ public interface TaIncompatibleService extends IBaseService<TaIncompatible> {
 
     List<TaIncompatible> getRegularRules(String primaryPost, String targetPost);
 
-    void getMonthRules(Map<String, String> params);
+    List<TaRotation> getMonthRules(Map<String, String> params);
 }

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

@@ -1,7 +1,10 @@
 package com.lyg.application.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lyg.application.entity.TaIncompatible;
+import com.lyg.application.entity.TaRotation;
 import com.lyg.application.mapper.TaIncompatibleMapper;
+import com.lyg.application.mapper.TaRotationMapper;
 import com.lyg.application.service.TaIncompatibleService;
 import com.lyg.application.util.IncompatibleRule;
 import com.lyg.system.service.impl.BaseServiceImpl;
@@ -9,6 +12,8 @@ import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -23,6 +28,8 @@ import java.util.Map;
 public class TaIncompatibleServiceImpl extends BaseServiceImpl<TaIncompatibleMapper, TaIncompatible> implements TaIncompatibleService {
     @Autowired
     private IncompatibleRule incompatibleRule;
+    @Autowired
+    private TaRotationMapper taRotationMapper;
 
 //    @Override
 //    public List<TaIncompatible> selectRule(String oldOrgName, String newOrgName) {
@@ -38,12 +45,34 @@ public class TaIncompatibleServiceImpl extends BaseServiceImpl<TaIncompatibleMap
     }
 
     @Override
-    public void getMonthRules(Map<String, String> params) {
-        String primaryPost=params.get("primaryPost");
-        String targetPost=params.get("targetPost");
-        List<String> oldPostList = baseMapper.getMonthRulesPrimary(primaryPost);//原来岗位+不容岗位
-        List<String> newPostList = baseMapper.getMonthRulesTarget(targetPost);//目标岗位+不容岗位
+    public List<TaRotation> getMonthRules(Map<String, String> params) {
+        List<TaRotation> repelList = new ArrayList<>();
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+        QueryWrapper<TaRotation> queryWrapper = new QueryWrapper<>();
+        String primaryPost = params.get("primaryPost");
+        String targetPost = params.get("targetPost");
+        String passTime = params.get("passTime");
+        LocalDate newDate = LocalDate.parse(passTime, formatter).minusMonths(3);
+
+        List<String> oldPostList = baseMapper.getMonthRulesPrimary(primaryPost);//原来岗位+目标不相容岗位
+        List<String> newPostList = baseMapper.getMonthRulesTarget(targetPost);//目标岗位+原来不相容岗位
+
+        if (oldPostList.size() == 0 && newPostList.size() == 0) {
+            return repelList;
+        } else {
+            List<String> orgList = newPostList;//原来岗位 不相容的
+            orgList.add(orgList.size() - 1, primaryPost);
+
+            List<String> targetList = oldPostList;//目标岗位 不相容的
+            targetList.add(targetList.size() - 1, targetPost);
+
+            //                拿到数据 不相容轮岗数据
+            repelList = taRotationMapper.selectRepel(orgList, targetList,newDate);
 
+            return repelList;
+        }
 
     }
 }

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

@@ -13,7 +13,7 @@
     </select>
 
     <select id="getMonthRulesPrimary" resultType="java.lang.String">
-        SELECT * FROM TA_INCOMPATIBLE i
+        SELECT i.TARGET_POST FROM TA_INCOMPATIBLE i
         WHERE
         i.PRIMARY_POST=#{primaryPost}
         and
@@ -23,5 +23,13 @@
     </select>
 
 
-    <select id="getMonthRulesTarget" resultType="java.lang.String"></select>
+    <select id="getMonthRulesTarget" resultType="java.lang.String">
+        SELECT i.PRIMARY_POST FROM TA_INCOMPATIBLE i
+        WHERE
+        i.TARGET_POST=#{targetPost}
+        and
+        i.DELETED=0
+        and
+        i.RULE='monthRules'
+    </select>
 </mapper>

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

@@ -2,5 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.lyg.application.mapper.TaRotationMapper">
-    
+    <select id="selectRepel" resultType="com.lyg.application.entity.TaRotation">
+        SELECT r.counter_imp_positions, r.counter_imp_post_rotation, r.*
+        FROM TA_ROTATION r
+        WHERE
+        r.rotation_exe_time IS NOT NULL
+        and r.rotation_exe_time &lt;=#{newDate}
+        and r.counter_imp_positions IN
+        <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND
+        r.counter_imp_post_rotation IN
+        <foreach item="item" index="index" collection="targetList" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>