Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -31,7 +31,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jms.core.JmsMessagingTemplate;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -459,9 +458,7 @@ public class AnnualInspectionController {
         File zipFile = null;
         try {
             //获取根目录
-            String export = ResourceUtils.getURL("classpath:export").getPath();
-            String base = "inspection";
-            String dir = StrUtil.join(File.separator, export, base, IdWorker.getIdStr());
+            String dir = StrUtil.join(File.separator, System.getProperty("user.dir"), "inspection", IdWorker.getIdStr());
             String zip = dir + ".zip";
             baseDir = new File(dir);
             zipFile = new File(zip);

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -804,7 +804,7 @@ public class EmergencyRepairController {
     public void export(@Val @RequestBody RepairRequest request, HttpServletResponse response) {
         log.info("headerAlias: {}", headerAlias);
         List<RepairResponse> repairs = emergencyRepairService.listByIdList(request);
-        Validate.notNull(repairs, "急修记录不存在，请核查");
+        Validate.notNull(repairs, ValuePool.EMERGENCY_NOT_EXIST);
 
         fillLiftFaults(repairs);
 
@@ -815,10 +815,9 @@ public class EmergencyRepairController {
         File zipFile = null;
         try {
             //获取根目录
-            String export = ResourceUtils.getURL("classpath:export").getPath();
-            String missing = export + File.separator + "missing.jpg";
-            String base = "repair";
-            String dir = StrUtil.join(File.separator, export, base, IdWorker.getIdStr());
+            String templates = ResourceUtils.getURL("classpath:templates").getPath();
+            String missing = templates + File.separator + "missing.jpg";
+            String dir = StrUtil.join(File.separator, System.getProperty("user.dir"), "repair", IdWorker.getIdStr());
             String zip = dir + ".zip";
             baseDir = new File(dir);
             zipFile = new File(zip);
@@ -893,7 +892,7 @@ public class EmergencyRepairController {
                 //生成急修单
                 String doc = imgDir + "1.急修单.doc";
                 log.info("生成急修单: {}", doc);
-                WordUtil.createWord(dataMap, ResourceUtils.getURL("classpath:templates").getPath(), "repair.doc.ftl", doc);
+                WordUtil.createWord(dataMap, templates, "repair.doc.ftl", doc);
             }
 
             //压缩文件夹

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/job/BusinessJob.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.framework.job;
 
+import cn.com.ty.lift.business.maintenance.dao.entity.MaintenancePlan;
 import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.business.push.entity.InspectionTips;
 import cn.com.ty.lift.business.push.entity.RepairTips;
@@ -42,7 +43,20 @@ public class BusinessJob {
     @Scheduled(cron = "0 0/10 1-3 * * ?")
     public void updateMtPlanJob() {
         log.warn("Starting update maintenance plan overdue job...");
-        maintenancePlanService.updateOverduePlan(1000);
+        long pageNum = 1;
+        long pages;
+        do {
+            IPage<MaintenancePlan> planPages = maintenancePlanService.pageOverduePlan(new Page<>(pageNum, 100));
+            pages = planPages.getPages();
+            List<MaintenancePlan> records = planPages.getRecords();
+            if (!records.isEmpty()) {
+                records.forEach(record -> {
+                    record.setStatus(-1);
+                });
+                maintenancePlanService.updateBatchById(records);
+            }
+            pageNum++;
+        } while (pageNum <= pages);
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenancePlanService.java

@@ -479,9 +479,17 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
         LambdaUpdateWrapper<MaintenancePlan> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
         lambdaUpdateWrapper.lt(MaintenancePlan::getPlanDate, LocalDate.now());
         lambdaUpdateWrapper.isNull(MaintenancePlan::getWorkDate);
-        lambdaUpdateWrapper.ne(MaintenancePlan::getStatus, -1);
+        lambdaUpdateWrapper.notIn(MaintenancePlan::getStatus, Arrays.asList(-1, 3));
         lambdaUpdateWrapper.last("LIMIT " + limit);
         lambdaUpdateWrapper.set(MaintenancePlan::getStatus, -1);
         return update(lambdaUpdateWrapper);
     }
+
+    public IPage<MaintenancePlan> pageOverduePlan(IPage<MaintenancePlan> page){
+        LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.lt(MaintenancePlan::getPlanDate, LocalDate.now());
+        lambdaQueryWrapper.isNull(MaintenancePlan::getWorkDate);
+        lambdaQueryWrapper.notIn(MaintenancePlan::getStatus, Arrays.asList(-1, 3));
+        return page(page, lambdaQueryWrapper);
+    }
 }