F

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

@@ -12,6 +12,7 @@ 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;
@@ -66,18 +67,19 @@ public class TaIncompatibleController extends BaseController {
     @GetMapping("/taIncompatible")
     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                         @ApiParam("原岗位") @RequestParam(value ="primaryPost", required = false) String primaryPost,
-                         @ApiParam("目标岗位") @RequestParam(value ="targetPost", required = false) String targetPost,
-                         @ApiParam("规则") @RequestParam(value ="rule", required = false) String rule,
+                         @ApiParam("原岗位") @RequestParam(value = "primaryPost", required = false) String primaryPost,
+                         @ApiParam("目标岗位") @RequestParam(value = "targetPost", required = false) String targetPost,
+                         @ApiParam("规则") @RequestParam(value = "rule", required = false) String rule,
 
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
                          @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
 
+
         IPage<TaIncompatible> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaIncompatible> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtil.isNotEmpty(primaryPost),"primary_post",primaryPost);
-        queryWrapper.eq(StringUtil.isNotEmpty(targetPost),"target_post",targetPost);
-        queryWrapper.eq(StringUtil.isNotEmpty(rule),"rule",rule);
+        queryWrapper.eq(StringUtil.isNotEmpty(primaryPost), "primary_post", primaryPost);
+        queryWrapper.eq(StringUtil.isNotEmpty(targetPost), "target_post", targetPost);
+        queryWrapper.eq(StringUtil.isNotEmpty(rule), "rule", rule);
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaIncompatible> result = taIncompatibleService.page(pg, queryWrapper);

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

@@ -10,7 +10,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.SysOrg;
 import com.lyg.system.mapper.SysOrgMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,8 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
- /**
+/**
  * 强制休假表;(ta_mandatory_leave)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
@@ -28,15 +28,15 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/")
 public class TaMandatoryLeaveController extends BaseController {
-    
+
     @Autowired
     private TaMandatoryLeaveService taMandatoryLeaveService;
-     @Autowired
-     private SysOrgMapper sysOrgMapper;
+    @Autowired
+    private SysOrgMapper sysOrgMapper;
 
 
-     /**
-     * 通过ID查询单条数据 
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -46,13 +46,19 @@ public class TaMandatoryLeaveController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taMandatoryLeave/{id}")
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return SaResult.data(taMandatoryLeaveService.getById(id));
+        TaMandatoryLeave taMandatoryLeave = taMandatoryLeaveService.getById(id);
+        Boolean b = checkAuth() == null || checkAuth() == taMandatoryLeave.getCreateUser();
+
+        if (b) {
+            return SaResult.data(taMandatoryLeaveService.getById(id));
+        }
+        return SaResult.error("无权限");
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
@@ -60,39 +66,40 @@ public class TaMandatoryLeaveController extends BaseController {
     @AccessLimit()
     @ApiOperation("分页查询")
     @GetMapping("/taMandatoryLeave")
-    public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                         @ApiParam("总行部门/一级分行") @RequestParam(value ="headOfficeOrg",required = false) String headOfficeOrg,
-                         @ApiParam("员工工号") @RequestParam(value ="employeeNum",required = false) String employeeNum,
-                         @ApiParam("员工姓名") @RequestParam(value ="employeeName",required = false) String employeeName,
-                         @ApiParam("所在单位机构号") @RequestParam(value ="orgNum",required = false) String orgNum,
-                         @ApiParam("所在单位名称") @RequestParam(value ="orgName",required = false) String orgName,
-                         @ApiParam("对应机构层次") @RequestParam(value ="counterInstitutionsLevel",required = false) String counterInstitutionsLevel,
-                         @ApiParam("对应重要岗位") @RequestParam(value ="counterImpPost",required = false) String counterImpPost,
-                         @ApiParam("对应总行条线") @RequestParam(value ="counterHeadOfficeLine",required = false) String counterHeadOfficeLine,
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("总行部门/一级分行") @RequestParam(value = "headOfficeOrg", required = false) String headOfficeOrg,
+                         @ApiParam("员工工号") @RequestParam(value = "employeeNum", required = false) String employeeNum,
+                         @ApiParam("员工姓名") @RequestParam(value = "employeeName", required = false) String employeeName,
+                         @ApiParam("所在单位机构号") @RequestParam(value = "orgNum", required = false) String orgNum,
+                         @ApiParam("所在单位名称") @RequestParam(value = "orgName", required = false) String orgName,
+                         @ApiParam("对应机构层次") @RequestParam(value = "counterInstitutionsLevel", required = false) String counterInstitutionsLevel,
+                         @ApiParam("对应重要岗位") @RequestParam(value = "counterImpPost", required = false) String counterImpPost,
+                         @ApiParam("对应总行条线") @RequestParam(value = "counterHeadOfficeLine", required = false) String counterHeadOfficeLine,
 
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", defaultValue = "create_date") String sortAsc,
                          @ApiParam("倒序排列") @RequestParam(value = "sortDesc", required = false) String sortDesc
     ) throws Exception {
-        
+
         IPage<TaMandatoryLeave> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMandatoryLeave> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtil.isNotEmpty(headOfficeOrg),"head_office_org",headOfficeOrg);
-        queryWrapper.eq(StringUtil.isNotEmpty(employeeNum),"employee_num",employeeNum);
-        queryWrapper.like(StringUtil.isNotEmpty(employeeName),"employee_name",employeeName);
-        queryWrapper.eq(StringUtil.isNotEmpty(orgNum),"org_num",orgNum);
-        queryWrapper.like(StringUtil.isNotEmpty(orgName),"org_name",orgName);
-        queryWrapper.like(StringUtil.isNotEmpty(counterInstitutionsLevel),"counter_institutions_level",counterInstitutionsLevel);
-        queryWrapper.like(StringUtil.isNotEmpty(counterImpPost),"counter_imp_post",counterImpPost);
-        queryWrapper.like(StringUtil.isNotEmpty(counterHeadOfficeLine),"counter_head_office_line",counterHeadOfficeLine);
+        queryWrapper.eq(StringUtil.isNotEmpty(checkAuth()), "CREATE_USER", checkAuth());
+        queryWrapper.like(StringUtil.isNotEmpty(headOfficeOrg), "head_office_org", headOfficeOrg);
+        queryWrapper.eq(StringUtil.isNotEmpty(employeeNum), "employee_num", employeeNum);
+        queryWrapper.like(StringUtil.isNotEmpty(employeeName), "employee_name", employeeName);
+        queryWrapper.eq(StringUtil.isNotEmpty(orgNum), "org_num", orgNum);
+        queryWrapper.like(StringUtil.isNotEmpty(orgName), "org_name", orgName);
+        queryWrapper.like(StringUtil.isNotEmpty(counterInstitutionsLevel), "counter_institutions_level", counterInstitutionsLevel);
+        queryWrapper.like(StringUtil.isNotEmpty(counterImpPost), "counter_imp_post", counterImpPost);
+        queryWrapper.like(StringUtil.isNotEmpty(counterHeadOfficeLine), "counter_head_office_line", counterHeadOfficeLine);
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaMandatoryLeave> result = taMandatoryLeaveService.page(pg, queryWrapper);
-        
+
         return SaResult.data(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taMandatoryLeave 实例对象
@@ -106,8 +113,8 @@ public class TaMandatoryLeaveController extends BaseController {
         taMandatoryLeaveService.save(taMandatoryLeave);
         return SaResult.data(taMandatoryLeave);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taMandatoryLeave 实例对象
@@ -118,12 +125,12 @@ public class TaMandatoryLeaveController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taMandatoryLeave/{id}")
     public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaMandatoryLeave taMandatoryLeave,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taMandatoryLeaveService.updateById(taMandatoryLeave);
         return SaResult.data(taMandatoryLeave);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -133,7 +140,7 @@ public class TaMandatoryLeaveController extends BaseController {
     @AccessLimit()
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taMandatoryLeave/{id}")
-    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taMandatoryLeaveService.removeById(id);
         return SaResult.data("success");
     }

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

@@ -42,7 +42,14 @@ public class TaMessageController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taMessage/{id}")
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return SaResult.data(taMessageService.getById(id));
+        TaMessage taMessage = taMessageService.getById(id);
+
+        Boolean b = checkAuth() == null || checkAuth() == taMessage.getCreateUser();
+
+        if (b) {
+            SaResult.data(taMessageService.getById(id));
+        }
+        return SaResult.error("无权限");
     }
 
     /**
@@ -63,6 +70,7 @@ public class TaMessageController extends BaseController {
 
         IPage<TaMessage> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMessage> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtil.isNotEmpty(checkAuth()), "CREATE_USER", checkAuth());
         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/TaRotationController.java

@@ -50,7 +50,15 @@ public class TaRotationController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taRotation/{id}")
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return SaResult.data(taRotationService.getById(id));
+
+        TaRotation taRotation = taRotationService.getById(id);
+
+        Boolean b = checkAuth() == null || checkAuth() == taRotation.getCreateUser();
+        if (b) {
+           return SaResult.data(taRotationService.getById(id));
+        }
+        return SaResult.error("无权限");
+
     }
 
     /**
@@ -82,6 +90,7 @@ public class TaRotationController extends BaseController {
 
         IPage<TaRotation> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaRotation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtil.isNotEmpty(checkAuth()), "CREATE_USER", checkAuth());
         queryWrapper.like(StringUtil.isNotEmpty(headOfficeOrg), "head_office_org", headOfficeOrg);
         queryWrapper.eq(StringUtil.isNotEmpty(employeeNum), "employee_num", employeeNum);
         queryWrapper.like(StringUtil.isNotEmpty(employeeName), "employee_name", employeeName);

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

@@ -4,23 +4,22 @@ 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 java.util.List;
-import com.lyg.common.Constants;
+import com.lyg.application.entity.TaSending;
+import com.lyg.application.service.TaSendingService;
 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.framework.accesslimit.AccessLimit;
 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.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.lyg.application.entity.TaSending;
-import com.lyg.application.service.TaSendingService;
 
- /**
+/**
  * 发送消息;(ta_sending)表控制层
+ *
  * @author : http://njyunzhi.com
  * @date : 2024-3-14
  */
@@ -28,12 +27,12 @@ import com.lyg.application.service.TaSendingService;
 @RestController
 @RequestMapping("/")
 public class TaSendingController extends BaseController {
-    
+
     @Autowired
     private TaSendingService taSendingService;
-    
-    /** 
-     * 通过ID查询单条数据 
+
+    /**
+     * 通过ID查询单条数据
      *
      * @param id 主键
      * @return 实例对象
@@ -43,13 +42,21 @@ public class TaSendingController extends BaseController {
     @ApiOperation("通过ID查询单条数据")
     @GetMapping("/taSending/{id}")
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return SaResult.data(taSendingService.getById(id));
+        TaSending taSending = taSendingService.getById(id);
+
+        Boolean b = checkAuth() == null || checkAuth() == taSending.getCreateUser();
+        if (b) {
+            SaResult.data(taSendingService.getById(id));
+        }
+        return SaResult.error("无权限");
+
+
     }
-    
-    /** 
+
+    /**
      * 分页查询
      *
-     * @param pageNum 当前页码
+     * @param pageNum  当前页码
      * @param pageSize 每页条数
      * @return 查询结果
      */
@@ -57,20 +64,21 @@ public class TaSendingController extends BaseController {
     @AccessLimit()
     @ApiOperation("分页查询")
     @GetMapping("/taSending")
-    public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                            @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                            @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
+    public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                         @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
         IPage<TaSending> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaSending> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtil.isNotEmpty(checkAuth()), "RECIPIENT_ID", checkAuth());
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaSending> result = taSendingService.page(pg, queryWrapper);
-        
+
         return SaResult.data(result);
     }
-    
-    /** 
+
+    /**
      * 新增数据
      *
      * @param taSending 实例对象
@@ -84,8 +92,8 @@ public class TaSendingController extends BaseController {
         taSendingService.save(taSending);
         return SaResult.data(taSending);
     }
-    
-    /** 
+
+    /**
      * 更新数据
      *
      * @param taSending 实例对象
@@ -96,13 +104,13 @@ public class TaSendingController extends BaseController {
     @ApiOperation("更新数据")
     @PutMapping("/taSending/{id}")
     public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaSending taSending,
-                            @ApiParam("对象ID") @PathVariable String id ) throws Exception {
+                         @ApiParam("对象ID") @PathVariable String id) throws Exception {
         taSending.setSendingId(id);
         taSendingService.updateById(taSending);
         return SaResult.data(taSending);
     }
-    
-    /** 
+
+    /**
      * 通过主键删除数据
      *
      * @param id 主键
@@ -112,7 +120,7 @@ public class TaSendingController extends BaseController {
     @AccessLimit()
     @ApiOperation("通过主键删除数据")
     @DeleteMapping("/taSending/{id}")
-    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
+    public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id) {
         taSendingService.removeById(id);
         return SaResult.data("success");
     }

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

@@ -2,12 +2,10 @@ package com.lyg.application.controller;
 
 import cn.dev33.satoken.util.SaResult;
 import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lyg.application.Listener.TaMandatoryLeaveListener;
 import com.lyg.application.Listener.TaRotationListener;
 import com.lyg.application.entity.TaMandatoryLeave;
 import com.lyg.application.entity.TaRotation;
-import com.lyg.application.mapper.TaRotationMapper;
 import com.lyg.application.service.TaMandatoryLeaveService;
 import com.lyg.application.service.TaRotationService;
 import com.lyg.application.service.impl.TaMandatoryLeaveServiceImpl;
@@ -18,6 +16,8 @@ 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.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -39,20 +39,19 @@ import java.util.List;
 public class UploadController extends BaseController {
 
 
+    @Value("${yz.warningTmp}")
+    String warning;
+    @Value("${yz.promptTmp}")
+    String prompt;
     @Autowired
     private TaRotationService taRotationService;
-
-
-
     @Autowired
     private TaRotationServiceImpl taRotationServiceImpl;
     @Autowired
     private TaMandatoryLeaveService taMandatoryLeaveService;
-
     @Autowired
     private TaMandatoryLeaveServiceImpl taMandatoryLeaveServiceImpl;
 
-
     @AccessLimit()
     @ApiOperation("上传文件")
     @PostMapping("/upload/taRotation")
@@ -119,21 +118,14 @@ 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 {
+    @Scheduled(cron = "0 0 8 * * *")
+    @GetMapping("/as/holiday")
+    public void promptWarning() throws Exception {
 
         taRotationService.selectGetWaring();
 
-
-
-
-        return SaResult.data("");
-
-
     }
 
-
 }

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

@@ -40,7 +40,7 @@ public class TaMessage implements Serializable,Cloneable{
     private String remark ;
 
     @ApiModelProperty(name = "预警 waring  提示 prompt",notes = "预警 超过轮岗截止日期  提示提前一个月提醒")
-    private String waringStatus ;
+    private String waringType ;
 
     @ApiModelProperty(name = "状态 1正常 0不正常",notes = "")
     private Integer status ;

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

@@ -0,0 +1,28 @@
+package com.lyg.application.job;
+
+
+import com.lyg.application.service.TaMandatoryLeaveService;
+import com.lyg.application.service.TaRotationService;
+import com.lyg.framework.accesslimit.AccessLimit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MandatoryJobTime {
+
+    @Autowired
+    private TaMandatoryLeaveService taMandatoryLeaveService;
+
+    /**
+     *  定时提醒   每年12月20号8点
+     * @throws Exception
+     */
+    @AccessLimit()
+    @Scheduled(cron = "0 0 8 20 12 *")
+    public void promptWarning() throws Exception {
+        taMandatoryLeaveService.selectGetPrompt();
+    }
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.lyg.application.job;
+
+
+import com.lyg.application.service.TaRotationService;
+import com.lyg.framework.accesslimit.AccessLimit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Component
+public class TotationJobTime {
+
+    @Autowired
+    private TaRotationService taRotationService;
+
+
+    /**
+     * 每天8点执行一次
+     * @return
+     * @throws Exception
+     */
+
+    @AccessLimit()
+    @Scheduled(cron = "0 0 8 * * *")
+    public void promptWarning() throws Exception {
+
+        taRotationService.selectGetWaring();
+
+    }
+
+
+}

application/src/main/java/com/lyg/application/mapper/TaMandatoryLeaveMapper.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.TaMandatoryLeave;
 
- /**
+import java.time.LocalDate;
+import java.util.List;
+
+/**
  * 强制休假表;(ta_mandatory_leave)表数据库访问层
  * @author : http://njyunzhi.com
  * @date : 2024-3-6
  */
 @Mapper
 public interface TaMandatoryLeaveMapper  extends BaseMapper<TaMandatoryLeave>{
-    
-}
+
+     List<TaMandatoryLeave> prompt(@Param("localDate") LocalDate localDate);
+ }

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

@@ -1,98 +0,0 @@
-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/TaMandatoryLeaveService.java

@@ -15,4 +15,6 @@ import java.util.List;
 public interface TaMandatoryLeaveService extends IBaseService<TaMandatoryLeave> {
  TaMandatoryLeave handleEntity(TaMandatoryLeave entity, Integer index) throws Exception;
  void saveEntityBatch(List<TaMandatoryLeave> entityList);
+
+    void selectGetPrompt();
 }

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

@@ -1,13 +1,22 @@
 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.system.mapper.SysPositionMapper;
+import com.lyg.system.mapper.SysUserMapper;
 import com.lyg.system.service.SysOrgService;
 import com.lyg.system.service.SysPositionService;
 import com.lyg.system.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -23,12 +32,22 @@ import java.util.List;
 @Service
 public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeaveMapper, TaMandatoryLeave> implements TaMandatoryLeaveService {
     private final List<String> errorMessages = new ArrayList<>();
+    @Value("${yz.holidayTmp}")
+    String holidayTmp;
     @Autowired
     private SysOrgService sysOrgService;
     @Autowired
     private SysPositionService sysPositionService;
     @Autowired
     private SysPositionMapper sysPositionMapper;
+    @Autowired
+    private TaMessageService taMessageService;
+    @Autowired
+    private TaMessageMapper taMessageMapper;
+    @Autowired
+    private TaSendingMapper taSendingMapper;
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
     @Override
     public TaMandatoryLeave handleEntity(TaMandatoryLeave entity, Integer index) throws Exception {
@@ -85,8 +104,65 @@ public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeav
         }
     }
 
+
     public List<String> getErrorMessages() {
         return errorMessages;
 
     }
+
+    @Override
+    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);
+                }
+
+            }
+        }
+
+
+    }
+
+    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

@@ -6,6 +6,7 @@ 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.Rule;
 import com.lyg.common.util.StringUtil;
@@ -17,6 +18,7 @@ import com.lyg.system.service.SysPositionService;
 import com.lyg.system.service.SysUserService;
 import com.lyg.system.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -36,6 +38,10 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
     private final List<Object> errorMessages = new ArrayList<>();
     @Autowired
     Rule rule;
+    @Value("${yz.warningTmp}")
+    String warningTmp;
+    @Value("${yz.promptTmp}")
+    String promptTmp;
     @Autowired
     private SysOrgService sysOrgService;
     @Autowired
@@ -45,8 +51,9 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
     @Autowired
     private TaMessageMapper taMessageMapper;
     @Autowired
+    private TaMessageService taMessageService;
+    @Autowired
     private TaSendingMapper taSendingMapper;
-
     @Autowired
     private SysUserService sysUserService;
     @Autowired
@@ -134,53 +141,56 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
     @Override
     public void selectGetWaring() {
         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());
-                String contentSent = "工号：" + item.getEmployeeNum() + ", 名字：" + item.getEmployeeName() + ", 业务条线：" + item.getCounterHeadOfficeLine() + ", 超过轮岗截止日期, 请及时处理";
-                taMessage.setContentSent(contentSent);
+                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.setWaringStatus("waring");
-                taMessageMapper.insert(taMessage);
-
-
-//                item.getCreateUser()  就是新增这个数据的人
-                //现在需要去重 创建人和管理员  是一个人只能往  Tasending插入一条数据否则是两条数据
-                SysUser sysUserAdmin = sysUserMapper.getAdmin(item.getCreateUser());
-//                如果为空 就不是管理员创建的;
-                List<String> userIdList = new ArrayList<>();
+                taMessage.setWaringType("waring");
 
-                if (sysUserAdmin == null) {
-                    userIdList = sysUserMapper.allAdmin();
-                    userIdList.add(sysUserAdmin.getUserId());
-                }
-                for (String it : userIdList) {
-                    TaSending taSending = new TaSending();
-                    taSending.setMessageId(uuid);
-                    taSending.setRecipientId(it);
-                    taSendingMapper.insert(taSending);
+                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());
-                String contentSent = "工号：" + item.getEmployeeNum() + ", 名字：" + item.getEmployeeName() + ", 业务条线：" + item.getCounterHeadOfficeLine() + ",即将轮岗, 请及时处理";
-                taMessage.setContentSent(contentSent);
+                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.setWaringStatus("prompt");
-                taMessageMapper.insert(taMessage);
+                taMessage.setWaringType("prompt");
+
+                Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
+                if (count == 0) {
+                    taMessageMapper.insert(taMessage);
+                    insertIntoTaSending(item.getCreateUser(), uuid);
+                }
+
             }
         }
 
@@ -188,6 +198,27 @@ public class TaRotationServiceImpl extends BaseServiceImpl<TaRotationMapper, TaR
         return;
     }
 
+    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/resources/application.yml

@@ -48,7 +48,10 @@ spring:
 
 ###
 yz:
-  appid: maintenance
+  appid: job_warning
+  warningTmp: 工号：, 名字：, 超过轮岗截止日期, 请及时处理
+  promptTmp: 工号：, 名字：, 即将轮岗, 请及时处理
+  holidayTmp: 工号：, 名字：, 还未休假, 请及时处理
   upload:
     path: E:\work\public-upload
   sso:

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

@@ -2,5 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.lyg.application.mapper.TaMandatoryLeaveMapper">
-    
+
+    <select id="prompt" resultType="com.lyg.application.entity.TaMandatoryLeave">
+        SELECT
+        *
+        FROM
+        TA_MANDATORY_LEAVE l
+        WHERE
+        l.DELETED = 0
+        AND l.START_TIME_VACATION IS NULL
+        AND l.VACATION_DEADLINE IS NULL
+    </select>
 </mapper>

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

@@ -23,11 +23,15 @@
     </select>
     <select id="waring" resultType="com.lyg.application.entity.TaRotation">
         SELECT * FROM TA_ROTATION r
-        WHERE r.rotation_deadline &lt; #{localDate}
+        WHERE r.rotation_deadline &lt;  #{localDate}
+        ORDER BY
+        r.ROTATION_DEADLINE DESC
     </select>
     <select id="prompt" resultType="com.lyg.application.entity.TaRotation">
         SELECT * FROM TA_ROTATION r
-        WHERE r.rotation_deadline>=ADD_MONTHS(#{localDate} , -1)
-        AND r.rotation_deadline &lt; #{localDate}
+        WHERE r.rotation_deadline&lt;= ADD_MONTHS(#{localDate},+1)
+        AND r.rotation_deadline &gt;= #{localDate}
+        ORDER BY
+        r.ROTATION_DEADLINE DESC
     </select>
 </mapper>

system/src/main/java/com/lyg/system/controller/BaseController.java

@@ -1,6 +1,7 @@
 package com.lyg.system.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lyg.common.Constants;
 import com.lyg.common.util.StringUtil;
 import com.lyg.system.entity.SysUser;
@@ -31,17 +32,12 @@ public class BaseController {
      */
 
     @SneakyThrows
-    public void checkAuth() {
+    public String checkAuth() {
         SysUser sysUser = currentUser();
-        Integer isAdmin = sysUser.getIsAdmin();
-        if (isAdmin.equals(1)) {
-            //是超级管理员
-
-        } else {
-//            不是管理员
-            String userId = sysUser.getUserId();
+        if (sysUser.getIsAdmin() != 1) {
+            return sysUser.getUserId();
         }
-
+        return null;
     }
 
     /**