f

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

@@ -18,6 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
 /**
  * 强制休假表;(ta_mandatory_leave)表控制层
  *
@@ -77,12 +80,25 @@ public class TaMandatoryLeaveController extends BaseController {
                          @ApiParam("对应重要岗位") @RequestParam(value = "counterImpPost", required = false) String counterImpPost,
                          @ApiParam("对应总行条线") @RequestParam(value = "counterHeadOfficeLine", required = false) String counterHeadOfficeLine,
 
+                         @ApiParam("休假起始时间开始") @RequestParam(value = "startVacation", required = false) String startVacation,
+                         @ApiParam("休假起始时间结束") @RequestParam(value = "endVacation", required = false) String endVacation,
+
+
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", defaultValue = "create_date") String sortAsc,
                          @ApiParam("倒序排列") @RequestParam(value = "sortDesc", required = false) String sortDesc
     ) throws Exception {
-
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 定义日期格式化模式
+        LocalDate startDate = null;
+        LocalDate endDate = null;
+        if (StringUtil.isNotEmpty(startVacation)) {
+            startDate = LocalDate.parse(startVacation, formatter);
+            endDate = LocalDate.parse(endVacation, formatter);
+        }
         IPage<TaMandatoryLeave> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaMandatoryLeave> queryWrapper = new QueryWrapper<>();
+
+        queryWrapper.between(startDate != null, "start_time_vacation", startDate, endDate);
+
         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);

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

@@ -4,10 +4,8 @@ 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;
@@ -21,8 +19,8 @@ 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;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 /**
  * 轮岗列表;(ta_rotation)表控制层
@@ -87,15 +85,36 @@ public class TaRotationController extends BaseController {
                          @ApiParam("对应机构层次") @RequestParam(value = "counterInstitutionsLevel", required = false) String counterInstitutionsLevel,
                          @ApiParam("对应重要岗位") @RequestParam(value = "counterImpPositions", required = false) String counterImpPositions,
                          @ApiParam("对应总行条线") @RequestParam(value = "counterHeadOfficeLine", required = false) String counterHeadOfficeLine,
+                         @ApiParam("轮岗截止日期开始") @RequestParam(value = "startDeadline", required = false) String startDeadline,
+                         @ApiParam("轮岗截止日期结束") @RequestParam(value = "endDeadline", required = false) String endDeadline,
 
+                         @ApiParam("轮岗执行时间开始") @RequestParam(value = "startExeTime", required = false) String startExeTime,
+                         @ApiParam("轮岗执行时间结束") @RequestParam(value = "endExeTime", required = false) String endExeTime,
 
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", defaultValue = "create_date") String sortAsc,
                          @ApiParam("倒序排列") @RequestParam(value = "sortDesc", required = false) String sortDesc
     ) throws Exception {
 
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 定义日期格式化模式
+        LocalDate startDate = null;
+        LocalDate endDate = null;
+        if (StringUtil.isNotEmpty(startDeadline)) {
+            startDate = LocalDate.parse(startDeadline, formatter);
+            endDate = LocalDate.parse(endDeadline, formatter);
+        }
+        if (StringUtil.isNotEmpty(startExeTime)) {
+            startDate = LocalDate.parse(startExeTime, formatter);
+            endDate = LocalDate.parse(endExeTime, formatter);
+        }
+
+
         IPage<TaRotation> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaRotation> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtil.isNotEmpty(checkAuth()), "CREATE_USER", checkAuth());
+        queryWrapper.between(startDate != null, "rotation_deadline", startDate, endDate);
+        queryWrapper.between(startDate != null, "rotation_exe_time", startDate, endDate);
+
+
         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/UploadController.java

@@ -125,7 +125,7 @@ public class UploadController extends BaseController {
     public void promptWarning() throws Exception {
 
 //        taRotationService.selectGetWaring();
-//        taMandatoryLeaveService.selectGetPrompt();
+        taMandatoryLeaveService.selectGetPrompt();
 
     }
 

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

@@ -2,9 +2,9 @@ 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.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -14,12 +14,13 @@ public class MandatoryJobTime {
     @Autowired
     private TaMandatoryLeaveService taMandatoryLeaveService;
 
+
     /**
      *  定时提醒   每年12月20号8点
      * @throws Exception
      */
     @AccessLimit()
-    @Scheduled(cron = "0 0 8 20 12 *")
+    @Scheduled(cron = "${yz.job.task2}")
     public void promptWarning() throws Exception {
         taMandatoryLeaveService.selectGetPrompt();
     }

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

@@ -22,7 +22,7 @@ public class TotationJobTime {
      */
 
     @AccessLimit()
-    @Scheduled(cron = "0 0 8 * * *")
+    @Scheduled(cron = "${yz.job.task1}")
     public void promptWarning() throws Exception {
         taRotationService.selectGetWaring();
 

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

@@ -29,11 +29,11 @@ import java.util.function.Function;
  */
 @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";
-
+    private final List<String> errorMessages = new ArrayList<>();
+    
+    @Autowired
     @Value("${yz.holidayTmp}")
     String holidayTmp;
 
@@ -122,8 +122,8 @@ public class TaMandatoryLeaveServiceImpl extends BaseServiceImpl<TaMandatoryLeav
 
 //        messageHandle.handleMandatoryLeaves(localDate, holidayTmp, PROMPT_TYPE);
         // 提示消息处理
-        messageHandle.handleMandatoryLeaves(localDate, holidayTmp, PROMPT_TYPE,MESSAGE_SOURCE_NAME, baseMapper::prompt);
-//        List<TaMandatoryLeave> promptList = baseMapper.prompt(localDate);
+        messageHandle.handleMandatoryLeaves(localDate, holidayTmp, PROMPT_TYPE, MESSAGE_SOURCE_NAME, baseMapper::prompt);
+//        List<TaMandatoryLeave> promptList = baseMapper.prompt(localDate)PROMPT_TYPE;
 //
 //        if (promptList.size() != 0) {
 //            for (TaMandatoryLeave item : promptList) {

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

@@ -67,7 +67,7 @@ public class MessageHandle {
      * @param messageType 消息类型
      */
     private void processItem(TaRotation item, String tmp, String messageType, String sourceName) {
-        StringBuilder stringBuilder = new StringBuilder();
+        String newTmp = null;
         TaMessage taMessage = new TaMessage();
         Map<String, String> params = new HashMap<>();
 
@@ -76,17 +76,19 @@ public class MessageHandle {
         taMessage.setMessageId(uuid);
         taMessage.setSourceId(item.getRotationId());
 
-        // 使用描述性强的常量代替硬编码值
-        stringBuilder.append(tmp); // 假设warningTmp或promptTmp已经定义且包含插入点
-        stringBuilder.insert(Constants.numI, item.getEmployeeNum());
-        int insertPos = item.getEmployeeNum().length() + Constants.nameI;
-        stringBuilder.insert(insertPos, item.getEmployeeName());
-        taMessage.setContentSent(stringBuilder.toString());
+//        // 使用描述性强的常量代替硬编码值
+//        stringBuilder.insert(Constants.numI, item.getEmployeeNum());
+//        int insertPos = item.getEmployeeNum().length() + Constants.nameI;
+//        stringBuilder.insert(insertPos, item.getEmployeeName());
+        String employeeNum = item.getEmployeeNum();
+        String employeeName = item.getEmployeeName();
+        newTmp = tmp.replace("code", employeeNum).replace("name", employeeName);
+        taMessage.setContentSent(newTmp);
         taMessage.setSourceName(sourceName);
         taMessage.setWaringType(messageType);
         params.put("sourceName", sourceName);
         params.put("waringType", messageType);
-        params.put("contentSent", stringBuilder.toString());
+        params.put("contentSent", newTmp);
         Long count = taMessageService.countBy("source_id", item.getRotationId(), true);
         if (count == 0) {
             taMessageMapper.insert(taMessage);
@@ -109,7 +111,6 @@ public class MessageHandle {
     }
 
     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<>();
 
@@ -117,17 +118,22 @@ public class MessageHandle {
         taMessage.setMessageId(uuid);
         taMessage.setSourceId(item.getLeaveId());
 
-        // 使用描述性强的常量代替硬编码值
-        stringBuilder.append(tmp); // 假设warningTmp或promptTmp已经定义且包含插入点
-        stringBuilder.insert(Constants.numI, item.getEmployeeNum());
-        int insertPos = item.getEmployeeNum().length() + Constants.nameI;
-        stringBuilder.insert(insertPos, item.getEmployeeName());
-        taMessage.setContentSent(stringBuilder.toString());
+//        // 使用描述性强的常量代替硬编码值
+        StringBuilder sb = new StringBuilder(tmp);
+        // 假设warningTmp或promptTmp已经定义且包含插入点
+//        stringBuilder.insert(Constants.numI, item.getEmployeeNum());
+//        int insertPos = item.getEmployeeNum().length() + Constants.nameI;
+//        stringBuilder.insert(insertPos, item.getEmployeeName());
+        String employeeNum = item.getEmployeeNum();
+        String employeeName = item.getEmployeeName();
+        String newTmp = null;
+        newTmp = tmp.replace("code", employeeNum).replace("name", employeeName);
+        taMessage.setContentSent(newTmp);
         taMessage.setSourceName(sourceName);
         taMessage.setWaringType(messageType);
         params.put("sourceName", "taMandatoryLeave");
         params.put("waringType", "prompt");
-        params.put("contentSent", stringBuilder.toString());
+        params.put("contentSent", newTmp);
         Long count = taMessageService.countBy("source_id", item.getLeaveId(), true);
         if (count == 0) {
             taMessageMapper.insert(taMessage);

application/src/main/resources/application.yml

@@ -1,4 +1,3 @@
-
 # 端口
 server:
   port: 8001
@@ -16,7 +15,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   datasource:
-    url: jdbc:oracle:thin:@192.168.89.10:1521:orcl
+    url: jdbc:oracle:thin:@192.168.89.147:1521:orcl
     username: job_waring
     password: job_waring@ABCD1234
     driver-class-name: oracle.jdbc.OracleDriver
@@ -49,9 +48,12 @@ spring:
 ###
 yz:
   appid: job_warning
-  warningTmp: 工号：, 名字：, 超过轮岗截止日期, 请及时处理
-  promptTmp: 工号：, 名字：, 即将轮岗, 请及时处理
-  holidayTmp: 工号：, 名字：, 还未休假, 请及时处理
+  warningTmp: 工号：code, 名字：name, 超过轮岗截止日期, 请及时处理
+  promptTmp: 工号：code, 名字：name, 即将轮岗, 请及时处理
+  holidayTmp: 工号：code, 名字：name, 还未休假, 请及时处理
+  job:
+    task1: 0 0 8 * * *
+    task2: 0 30 8 20 12 *
   upload:
     path: E:\work\public-upload
   sso: