Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

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

@@ -125,7 +125,7 @@ public class AnnualInspectionController {
     @PostMapping("toConfirm")
     @Verifier(fields = {"mtCompanyId"})
     public RestResponse toConfirm(@Ver @RequestBody InspectionRequest request){
-        IPage<LiftAnnualInspectionResponse> pages = liftService.toConfirmAnnualInspection(request.getPage(), request.getMtCompanyId());
+        IPage<LiftAnnualInspectionResponse> pages = liftService.toConfirmAnnualInspection(request.getPage(), request.getMtCompanyId(), 45);
         return RestResponse.success(pages);
     }
 
@@ -248,8 +248,7 @@ public class AnnualInspectionController {
         boolean ai = annualInspectionService.saveOrUpdate(old);
         if(ai){
             InspectionResponse ins = annualInspectionService.infoById(entity);
-            PushMessage pushMessage = PushMessage.inspectionConfirmCheckDate(ins.getProjectName(), ins.getDevicePosition(), ins.getRegistrationCode(), ins.getCheckDate());
-            pushMessage.sendAllOnPlatform(jmsMessagingTemplate);
+            PushMessage.inspectionConfirmCheckDate(ins.getProjectName(), ins.getDevicePosition(), ins.getRegistrationCode(), ins.getCheckDate()).sendAllOnPlatform(jmsMessagingTemplate);
         }
         return RestResponse.success(ai);
     }
@@ -289,7 +288,7 @@ public class AnnualInspectionController {
             old.setStepStatus(3);
             old.setStepName(2);//转回阶段2
             old.setCheckResultImg("");
-            old.setNextInspectionTime(null);
+            old.setNextInspectionTime(LocalDate.of(1970, 1,1));
         }
         return annualInspectionService.stepThree(old, entity.getProjectId(), entity.getIsCheckGoverner(), entity.getLoadInspectionSetting());
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/dto/InspectionRequest.java

@@ -134,7 +134,7 @@ public class InspectionRequest extends PageRequest {
      * 联系电话
      */
     @NotEmpty(message = "请设置联系电话")
-    @Pattern(regexp = "^1[34578]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$",message = "联系电话格式有误")
+    @Pattern(regexp = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$",message = "联系电话格式有误")
     private String telephone;
 
     /**

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

@@ -203,7 +203,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         liftHistory.setDescription("修改电梯年检日期");
         liftHistory.setContent(StrUtil.format("电梯年检日期由:{}修改成{}", oldInspectionDate, nextInspectionTime));
         //fixme:获取当前登录用户
-        liftHistory.setOperatorId(entity.getCreatorId());
+        liftHistory.setOperatorId(entity.getUpdateId());
         liftHistory.setOperateDate(LocalDateTime.now());
         boolean lh = liftHistoryService.save(liftHistory);
         //插入电梯记录成功，直接返回true,否则手动事务回滚，返回false
@@ -282,126 +282,4 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
                 .eq(AnnualInspection::getMtCompanyId, mtCompanyId);
         return getOne(lambdaQueryWrapper);
     }
-
-    /**
-     * 阶段2 修改电梯的业务状态为年检中
-     * 阶段3 如果合格，修改电梯的业务状态为正常，
-     * 完成年检，如果是不合格，清空维保计划，如果是合格，直接更新
-     * @param entity AnnualInspection
-     * @return boolean
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public boolean modify(AnnualInspection entity, Long projectId) {
-        //更新年检
-        boolean up = updateById(entity);
-        //更新失败，直接返回false
-        if (!up) {
-            return false;
-        }
-
-        Integer stepStatus = entity.getStepStatus();
-        Integer stepName = entity.getStepName();
-        Long mtCompanyId = entity.getMtCompanyId();
-        Long liftId = entity.getLiftId();
-
-        //阶段2 修改电梯的业务状态为年检中
-        if (Verify.Inspection.stepTwo(stepName)) {
-            PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
-            if (null == relevance) {
-                return false;
-            }
-            //如果电梯在急修中，关掉急修，开始年检
-            if (relevance.getLiftCompanyStatus().equals(CommonEnum.LiftStatus.EMERGENCY_REPAIR.getCode())) {
-                EmergencyRepair repair = emergencyRepairService.findRepairing(mtCompanyId, liftId, projectId);
-                if (null != repair) {
-                    repair.setCloseReason("开启年检，关闭急修");
-                    //新状态（-1 暂停中，0 待修理；1 修理中；2 已完成 3 已关闭）
-                    entity.setStatus(Verify.Repair.STATUS_CLOSE);
-                    boolean cl = emergencyRepairService.updateById(repair);
-                    if (!cl) {
-                        rollback();
-                        return false;
-                    }
-                }
-            }
-            relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.ANNUAL_INSPECTION.getCode());
-            boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
-            if (re) {
-                return true;
-            } else {
-                //强制手动事务回滚
-                rollback();
-                return false;
-            }
-        }
-
-        //阶段3 如果合格，修改电梯的业务状态为正常，
-        if (Verify.Inspection.stepThree(stepName)) {
-            PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
-            if (null == relevance) {
-                return false;
-            }
-            relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.NORMAL.getCode());
-            boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
-            if (re) {
-                return true;
-            } else {
-                //强制手动事务回滚
-                rollback();
-                return false;
-            }
-        }
-
-        //阶段4 年检结果不合格 or 合格
-        if (Verify.Inspection.stepFour(stepName)) {
-            //todo 不合格：流程结束，电梯扭转到不合格状态列表，电梯停保，清理维保计划记录
-            if (Verify.Inspection.statusCertificateReportUnqualified(stepStatus)) {
-                boolean mp = maintenancePlanService.cleanPlan(mtCompanyId, liftId);
-                if (mp) {
-                    return true;
-                } else {
-                    //强制手动事务回滚
-                    rollback();
-                    return false;
-                }
-            }
-            //todo:合格：修改电梯的年检时间lift-annual_inspection_date，增加lift_history记录
-            if (Verify.Inspection.statusCertificateReportQualified(stepStatus)) {
-                //电梯不存在，说明数据有误，直接返回false
-                Lift lift = liftService.getById(liftId);
-                if (null == lift) {
-                    return false;
-                }
-                //更新电梯之前获取旧的年检时间
-                LocalDate oldInspectionDate = lift.getAnnualInspectionDate();
-                LocalDate nextInspectionTime = entity.getNextInspectionTime();
-                lift.setAnnualInspectionDate(nextInspectionTime);
-                boolean li = liftService.updateById(lift);
-                //更新电梯失败，返回false
-                if (!li) {
-                    return false;
-                }
-                //更新电梯成功，插入电梯操作记录
-                LiftHistory liftHistory = new LiftHistory();
-                liftHistory.setId(IdWorker.getId());
-                liftHistory.setMtCompanyId(mtCompanyId);
-                liftHistory.setLiftId(liftId);
-                liftHistory.setCode(lift.getLiftCode());
-                liftHistory.setDescription("修改电梯年检日期");
-                liftHistory.setContent(StrUtil.format("电梯年检日期由:{}修改成{}", oldInspectionDate, nextInspectionTime));
-                //fixme:获取当前登录用户
-                liftHistory.setOperatorId(entity.getCreatorId());
-                liftHistory.setOperateDate(LocalDateTime.now());
-                boolean lh = liftHistoryService.save(liftHistory);
-                //插入电梯记录成功，直接返回true,否则手动事务回滚，返回false
-                if (lh) {
-                    return true;
-                } else {
-                    rollback();
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
 }

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

@@ -182,8 +182,7 @@ public class EmergencyRepairController {
         boolean result = emergencyRepairService.save(entity);
         if (result) {
             RepairResponse info = emergencyRepairService.infoById(entity.getId());
-            PushMessage emergencyAssign = PushMessage.emergencyAssign(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getIsTrapped(), info.getCallerFaultDescription(), info.getWorkerName());
-            emergencyAssign.sendAllOnPlatform(jmsMessagingTemplate);
+            PushMessage.emergencyAssign(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getIsTrapped(), info.getCallerFaultDescription(), info.getWorkerName()).sendAllOnPlatform(jmsMessagingTemplate);
         }
         return RestResponse.success(result);
     }
@@ -202,15 +201,7 @@ public class EmergencyRepairController {
         return RestResponse.success(CountPage.getCountPage(count, pages));
     }
 
-    /**
-     * 根据条件分页查询
-     *
-     * @param request RepairRequest
-     * @return RestResponse
-     */
-    @PostMapping("page")
-    @Verifier(fields = "mtCompanyId")
-    public RestResponse page(@Ver @RequestBody RepairRequest request) {
+    private RestResponse pageByCondition(RepairRequest request){
         LocalDate repairBegin = request.getRepairBegin();
         LocalDate repairEnd = request.getRepairEnd();
         if (Objects.nonNull(repairBegin) && Objects.nonNull(repairEnd)) {
@@ -229,6 +220,24 @@ public class EmergencyRepairController {
         return RestResponse.success(CountPage.getCountPage(count, pages));
     }
 
+    /**
+     * 根据条件分页查询
+     *
+     * @param request RepairRequest
+     * @return RestResponse
+     */
+    @PostMapping("page")
+    @Verifier(fields = {"status","mtCompanyId"})
+    public RestResponse page(@Ver @RequestBody RepairRequest request) {
+        return pageByCondition(request);
+    }
+
+    @PostMapping("pageCost")
+    @Verifier(fields = {"mtCompanyId"})
+    public RestResponse pageCost(@Ver @RequestBody RepairRequest request) {
+        return pageByCondition(request);
+    }
+
     /**
      * 根据条件分页查询
      *
@@ -262,11 +271,9 @@ public class EmergencyRepairController {
         boolean result = emergencyRepairService.saveOrUpdate(entity);
         if (result) {
             RepairResponse info = emergencyRepairService.infoById(request.getId());
-            PushMessage emergencyTransfer = PushMessage.emergencyTransfer(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getIsTrapped(), info.getCallerFaultDescription(), info.getWorkerName());
-            emergencyTransfer.sendAllOnPlatform(jmsMessagingTemplate);
+            PushMessage.emergencyTransfer(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getIsTrapped(), info.getCallerFaultDescription(), info.getWorkerName()).sendAllOnPlatform(jmsMessagingTemplate);
             //【原被派单人】收到消息：
-            PushMessage forOriginal = PushMessage.emergencyTransferForOriginal(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getWorkerName());
-            forOriginal.sendAllOnPlatform(jmsMessagingTemplate);
+            PushMessage.emergencyTransferForOriginal(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getWorkerName()).sendAllOnPlatform(jmsMessagingTemplate);
         }
         return RestResponse.success(result);
     }
@@ -323,8 +330,7 @@ public class EmergencyRepairController {
         RestResponse result = emergencyRepairService.taking(entity);
         if (Objects.equals("1", result.getStatusCode())) {
             RepairResponse info = emergencyRepairService.infoById(request.getId());
-            PushMessage emergencyTaking = PushMessage.emergencyTaking(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate());
-            emergencyTaking.sendAllOnPlatform(jmsMessagingTemplate);
+            PushMessage.emergencyTaking(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate()).sendAllOnPlatform(jmsMessagingTemplate);
         }
         return result;
     }
@@ -348,8 +354,7 @@ public class EmergencyRepairController {
         boolean result = emergencyRepairService.updateById(entity);
         if (result) {
             RepairResponse info = emergencyRepairService.infoById(request.getId());
-            PushMessage emergencyArrive = PushMessage.emergencyArrive(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getArriveTime());
-            emergencyArrive.sendAllOnPlatform(jmsMessagingTemplate);
+            PushMessage.emergencyArrive(info.getAreaName(), info.getProjectName(), info.getDevicePosition(), info.getRegistrationCode(), info.getCallerDate(), info.getArriveTime()).sendAllOnPlatform(jmsMessagingTemplate);
         }
         return RestResponse.success(result);
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/dto/RepairRequest.java

@@ -74,6 +74,7 @@ public class RepairRequest extends PageRequest {
     /**
      * 急修单状态
      */
+    @NotNull(message = "急修状态不能为空")
     private Integer status;
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/entity/EmergencyRepair.java

@@ -90,7 +90,7 @@ public class EmergencyRepair extends BaseEntity {
      * 报修人电话
      */
     @NotEmpty(message = "报修人电话不能为空")
-    @Pattern(regexp = "^1[34578]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$", message = "请输入有效的电话")
+    @Pattern(regexp = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$", message = "请输入有效的电话")
     private String callerTel;
 
     /**

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

@@ -24,10 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * <p>
@@ -110,7 +107,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(entity.getMtCompanyId(), entity.getLiftId());
-        if (null == relevance) {
+        if (Objects.isNull(relevance)) {
             return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态改成急修中
@@ -198,7 +195,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse startMaintenance(Long mtCompanyId, Long liftId) {
         // 如果急修单不存在，直接返回，
         EmergencyRepair emergencyRepair = findByMtCompanyAndLift(mtCompanyId, liftId);
-        if (null == emergencyRepair) {
+        if (Objects.isNull(emergencyRepair)) {
             return RestResponse.success(true);
         }
         //如果存在，不在急修中
@@ -212,7 +209,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
-        if (null == relevance) {
+        if (Objects.isNull(relevance)) {
             return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态改成维保中
@@ -237,7 +234,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
     public RestResponse stopMaintenance(Long mtCompanyId, Long liftId) {
         //如果急修单不存在，直接返回，
         EmergencyRepair emergencyRepair = findByMtCompanyAndLift(mtCompanyId, liftId);
-        if (null == emergencyRepair) {
+        if (Objects.isNull(emergencyRepair)) {
             return RestResponse.success(true);
         }
         //如果急修单不在暂停中，直接返回true
@@ -251,7 +248,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
-        if (null == relevance) {
+        if (Objects.isNull(relevance)) {
             return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态改成急修中
@@ -291,6 +288,10 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         }
     }
 
+    private String formatCostContent(ErRecordCost erRecordCost){
+        return String.format("应收：%.2f, 实收：%.2f, 开票：%.2f", erRecordCost.getCostMoney(), erRecordCost.getPayMoney(), erRecordCost.getInvoiceMoney());
+    }
+
     /**
      * 插入急修收费项，同时更新急修记录总金额
      *
@@ -313,13 +314,18 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
                 history.setOperate("新增收费项");
                 history.setDescription(erRecordCost.getCostName());
                 history.setBeforeContent("--");
-                history.setAfterContent(String.format("应收：%s, 实收：%s, 开票：%s", erRecordCost.getCostMoney(), erRecordCost.getPayMoney(), erRecordCost.getInvoiceMoney()));
-                history.setOperatorId(1l);
+                history.setAfterContent(formatCostContent(erRecordCost));
+                history.setOperatorId(repair.getUpdateId());
                 history.setOperateDate(LocalDateTime.now());
                 histories.add(history);
             }
-            emergencyHistoryService.saveBatch(histories, histories.size());
-            return RestResponse.success(true);
+            boolean his = emergencyHistoryService.saveBatch(histories, histories.size());
+            if(his){
+                return RestResponse.success(true);
+            }else{
+                rollback();
+                return RestResponse.fail("插入急修操作记录失败，请稍后重试");
+            }
         } else {
             //强制手动事务回滚
             rollback();
@@ -348,9 +354,9 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
                 EmergencyHistory history = new EmergencyHistory();
                 history.setErRecordId(repair.getId());
                 history.setDescription(erRecordCost.getCostName());
-                String afterContent = String.format("应收：%s, 实收：%s, 开票：%s", erRecordCost.getCostMoney(), erRecordCost.getPayMoney(), erRecordCost.getInvoiceMoney());
+                String afterContent = formatCostContent(erRecordCost);
                 history.setAfterContent(afterContent);
-                history.setOperatorId(1l);
+                history.setOperatorId(repair.getUpdateId());
                 history.setOperateDate(LocalDateTime.now());
                 if(erRecordCost.getId() == null){
                     history.setOperate("新增收费项");
@@ -361,9 +367,9 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
                     Optional<ErRecordCost> first = oldRecordCosts.stream().filter(cost -> cost.getId().equals(erRecordCost.getId())).findFirst();
                     if(first.isPresent()){
                         ErRecordCost cost = first.get();
-                        String beforeContent = String.format("应收：%s, 实收：%s, 开票：%s", cost.getCostMoney(), cost.getPayMoney(), cost.getInvoiceMoney());
+                        String beforeContent = formatCostContent(cost);
                         history.setBeforeContent(beforeContent);
-                        if(!afterContent.equals(beforeContent)){
+                        if(!Objects.equals(beforeContent, afterContent)){
                             histories.add(history);
                         }
                     }else{
@@ -372,8 +378,13 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
                     }
                 }
             }
-            emergencyHistoryService.saveBatch(histories, histories.size());
-            return RestResponse.success(true);
+            boolean his = emergencyHistoryService.saveBatch(histories, histories.size());
+            if(his){
+                return RestResponse.success(true);
+            }else{
+                rollback();
+                return RestResponse.fail("插入急修操作记录失败，请稍后重试");
+            }
         } else {
             //强制手动事务回滚
             rollback();
@@ -400,12 +411,17 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             history.setErRecordId(repair.getId());
             history.setOperate("删除收费项");
             history.setDescription(erRecordCost.getCostName());
-            history.setBeforeContent(String.format("应收：%s, 实收：%s, 开票：%s", erRecordCost.getCostMoney(), erRecordCost.getPayMoney(), erRecordCost.getInvoiceMoney()));
+            history.setBeforeContent(formatCostContent(erRecordCost));
             history.setAfterContent("--");
-            history.setOperatorId(1l);
+            history.setOperatorId(repair.getUpdateId());
             history.setOperateDate(LocalDateTime.now());
-            emergencyHistoryService.save(history);
-            return RestResponse.success(true);
+            boolean his = emergencyHistoryService.save(history);
+            if(his){
+                return RestResponse.success(true);
+            }else{
+                rollback();
+                return RestResponse.fail("插入急修操作记录失败，请稍后重试");
+            }
         } else {
             //强制手动事务回滚
             rollback();
@@ -443,7 +459,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return RestResponse.fail("修改急修失败，请稍后重试");
         }
         PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(repair.getMtCompanyId(), repair.getLiftId());
-        if (null == relevance) {
+        if (Objects.isNull(relevance)) {
             return RestResponse.fail("平台公司电梯关联信息不存在，请核查");
         }
         //电梯业务状态如果在急修中 改成正常

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

@@ -0,0 +1,75 @@
+package cn.com.ty.lift.business.framework.job;
+
+import cn.com.ty.lift.business.library.dao.entity.model.response.LiftAnnualInspectionResponse;
+import cn.com.ty.lift.business.library.service.LiftService;
+import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
+import cn.com.ty.lift.common.model.PushMessage;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.jms.core.JmsMessagingTemplate;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 定时任务
+ *
+ * @author wcz
+ * @since 2020/1/18 17:16
+ */
+@Slf4j
+@Component
+@EnableScheduling
+@AllArgsConstructor
+public class BusinessJob {
+
+    private MaintenancePlanService maintenancePlanService;
+    private LiftService            liftService;
+    private JmsMessagingTemplate   jmsMessagingTemplate;
+    /**
+     * 更新维保计划过期状态job：每天1-3点，每10分钟执行一次
+     */
+    @Scheduled(cron = "0 0/10 1-3 * * ?")
+    public void updateMtPlanJob(){
+        log.trace("Starting update maintenance Plan Job");
+        maintenancePlanService.updateOverduePlan(1000);
+    }
+
+    @Scheduled(cron = "0 0 8 * * ?")
+    public void inspection45days() {
+        log.trace("Starting inspection 45days");
+        sendAnnualInspection(45);
+    }
+
+    private void sendAnnualInspection(int days) {
+        int pageNum = 1;
+        long pages;
+        do {
+            IPage<LiftAnnualInspectionResponse> confirms = liftService.toConfirmAnnualInspection(new Page<>(pageNum, 10), 1L, days);
+            pages = confirms.getPages();
+            List<LiftAnnualInspectionResponse> records = confirms.getRecords();
+            if (records.size() > 0) {
+                if (days == 45) {
+                    for (LiftAnnualInspectionResponse record : records) {
+                        PushMessage.inspectionAdvance45daysNotice(record.getProjectName(), record.getDevicePosition(), record.getRegistrationCode()).sendAllOnPlatform(jmsMessagingTemplate);
+                    }
+                } else {
+                    for (LiftAnnualInspectionResponse record : records) {
+                        PushMessage.inspectionAdvance15daysNotice(record.getProjectName(), record.getDevicePosition(), record.getRegistrationCode()).sendAllOnPlatform(jmsMessagingTemplate);
+                    }
+                }
+            }
+            pageNum++;
+        } while (pageNum <= pages);
+    }
+
+    @Scheduled(cron = "0 0 8 * * ?")
+    public void inspection15days() {
+        log.trace("Starting inspection 15days");
+        sendAnnualInspection(15);
+    }
+}

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

@@ -1,32 +0,0 @@
-package cn.com.ty.lift.business.framework.job;
-
-import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
-import cn.hutool.core.date.DateUtil;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * 更新过期维保计划状态
- *
- * @author wcz
- * @since 2020/1/18 17:16
- */
-@Slf4j
-@Component
-@EnableScheduling
-@AllArgsConstructor
-public class StatusUpdateJob {
-
-    private MaintenancePlanService maintenancePlanService;
-    /**
-     * 更新维保计划过期状态job：每天1-3点，每10分钟执行一次
-     */
-    @Scheduled(cron = "0 0/10 1-3 * * ?")
-    public void updateMtPlanJob(){
-        log.info("Starting update maintenance Plan Job : {}",DateUtil.now());
-        maintenancePlanService.updateOverduePlan(1000);
-    }
-}

lift-business-service/src/main/java/cn/com/ty/lift/business/library/dao/mapper/LiftMapper.java

@@ -44,5 +44,5 @@ public interface LiftMapper extends BaseMapper<Lift> {
     /**
      * 查询待确认的年检信息
      */
-    IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, @Param("mtCompanyId") Long mtCompanyId);
+    IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, @Param("mtCompanyId") Long mtCompanyId, @Param("days") int days);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -456,8 +456,8 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * 待确认年检计划，提前45天提醒
      * @return
      */
-    public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId){
-        return baseMapper.toConfirmAnnualInspection(page, mtCompanyId);
+    public IPage<LiftAnnualInspectionResponse> toConfirmAnnualInspection(IPage<LiftAnnualInspectionResponse> page, Long mtCompanyId, int days){
+        return baseMapper.toConfirmAnnualInspection(page, mtCompanyId, days);
     }
 
     /**

lift-business-service/src/main/resources/application-web.yml

@@ -33,9 +33,9 @@ spring:
       #true表示使用连接池；false时，每发送一条数据创建一个连接
       enabled: true
       #连接池最大连接数
-      max-connections: 10
+      max-connections: 30
       #空闲的连接过期时间，默认为30秒
-      idle-timeout: 300s
+      idle-timeout: 3000s
   jms:
     #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
     pub-sub-domain: false

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -216,7 +216,7 @@
         </foreach>
     </select>
 
-    <!--lift中的年检时间都是月初, 所以相隔时间(45 - 30 = 15)-->
+    <!--lift中的年检时间都是月初, 所以相隔时间(45)-->
     <select id="toConfirmAnnualInspection" parameterType="java.lang.Long" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftAnnualInspectionResponse">
         SELECT
             li.id                     AS lift_id,
@@ -237,7 +237,7 @@
         LEFT JOIN user_info ui ON re.user_id = ui.user_id
         LEFT JOIN annual_inspection ai ON ai.lift_id = li.id AND ai.mt_company_id = plr.mt_company_id
         WHERE
-            li.annual_inspection_date &lt;= date_add(curdate(), INTERVAL 15 DAY)
+            li.annual_inspection_date &lt;= date_add(curdate(), INTERVAL #{days} DAY)
         AND li.annual_inspection_date &gt;= curdate() AND isnull(ai.id)
         <if test="mtCompanyId != null and mtCompanyId > 0">
             AND plr.mt_company_id = #{mtCompanyId}

lift-common/src/main/java/cn.com.ty.lift.common/model/PushMessage.java

@@ -36,32 +36,32 @@ public class PushMessage implements Serializable {
         this.content = content;
     }
 
-    private static PushMessage newMessage(String title, String content) {
+    private static PushMessage create(String title, String content) {
         return new PushMessage(title, content);
     }
 
     private static PushMessage team(String content) {
-        return newMessage("团队消息", content);
+        return create("团队消息", content);
     }
 
     private static PushMessage work(String content) {
-        return newMessage("工作消息", content);
+        return create("工作消息", content);
     }
 
     private static PushMessage maintain(String content) {
-        return newMessage("保养消息", content);
+        return create("保养消息", content);
     }
 
     private static PushMessage emergency(String content) {
-        return newMessage("急修消息", content);
+        return create("急修消息", content);
     }
 
     private static PushMessage manager(String content) {
-        return newMessage("提醒", content);
+        return create("提醒", content);
     }
 
     private static PushMessage inspection(String content) {
-        return newMessage("年检消息", content);
+        return create("年检消息", content);
     }
 
     /**
@@ -101,6 +101,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 区域主管（项目所属）、所有文员
      * 物业申请项目
      * 物业【申请人】申请【项目名称】【评价/查看】权限。
@@ -112,6 +113,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 区域主管（项目所属）
      * 物业获得权限
      * 物业【申请人】成功获得【项目名称】【评价/查看】权限。
@@ -123,6 +125,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 区域主管（项目所属）
      * 取消物业权限
      * 物业【申请人】失去【项目名称】【评价/查看】权限。
@@ -134,6 +137,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 新增项目
      * 【区域名称】新增【项目名称】项目，共计【台量】台，生效时间【生效时间】，区域主管【区域主管】。
@@ -145,6 +149,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 项目开始生效
      * 【区域名称】【项目名称】项目进入服务期。
@@ -156,6 +161,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 项目逾期
      * 【区域名称】【项目名称】已经逾期，请尽快办理合同续签或停止服务手续。
@@ -167,6 +173,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 停止服务
      * 【区域名称】【项目名称】已经停止服务，共计【台量】台。
@@ -178,6 +185,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 恢复逾期
      * 【区域名称】【项目名称】已经续签完毕。
@@ -189,6 +197,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 区域更换负责人
      * 【区域名称】的负责人，由【原区域主管】变更为【新区域主管】
@@ -200,6 +209,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 创建电梯
      * 【创建人】为【项目名称】新增电梯位于【电梯位置】，注册代码【注册代码】
@@ -211,6 +221,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 更新电梯信息（除定位、更换负责人）
      * 【更新人】更新【项目名称】【电梯位置】的电梯信息，注册代码【注册代码】
@@ -222,6 +233,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）
      * 更新电梯定位
      * 【更新人】更新【项目名称】【电梯位置】的电梯定位为【电梯位置新】，注册代码【注册代码】
@@ -233,6 +245,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 超管、区域主管（项目所属）、所有文员（项目所属）、相关维保工
      * 电梯更换主要负责人
      * 【区域名称】的【项目名称】的【电梯位置】电梯，【注册代码】，主要负责人由【原负责人】更换为【新负责人】。
@@ -260,6 +273,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 区域主管、相关维保工
      * 制定保养计划
      * 维保计划制定：【区域名称】【项目名称】的【电梯位置】电梯，【注册代码】，保养间隔时间【x】天，下次保养时间【下次保养时间】，保养类型【保养类型】，负责人【电梯负责人】。制定人【操作人】
@@ -272,6 +286,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 区域主管、相关维保工
      * 修改保养计划
      * 维保计划修改：【区域名称】【项目名称】的【电梯位置】电梯，【注册代码】，保养间隔时间【x】天，下次保养时间【下次保养时间】，保养类型【保养类型】，负责人【电梯负责人】。修改人【操作人】
@@ -283,6 +298,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 相关维保工
      * 每天有维保任务
      * 您今天有需要保养的电梯【x】台，请查看任务!
@@ -298,6 +314,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 总经理、区域主管（项目所属）、相关维保工
      * 急修指派
      * 【区域名称】的【项目名称】的【电梯位置】电梯，注册代码【注册代码】，于【报修时间】接到召修信息，【已/未】困人，请【被派单人】立即响应。
@@ -309,6 +326,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 总经理、区域主管（项目所属）、所有文员（项目所属）、相关维保工
      * 物业发起急修
      * 【区域名称】的【项目名称】的【电梯位置】电梯，注册代码【注册代码】，物业端于【报修时间】发出召修信息，【已/未】困人，请【电梯主要负责人】立即响应。
@@ -320,6 +338,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 总经理、区域主管（项目所属）、相关维保工
      * 转派
      * 【区域名称】的【项目名称】的【电梯位置】电梯，注册代码【注册代码】，物业端于【报修时间】发出召修信息，【已/未】困人，请【被派单人】立即响应。
@@ -332,6 +351,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 【原被派单人】收到消息：【区域名称】的【项目名称】的【电梯位置】电梯，注册代码【注册代码】，急修信息已经转派给【被派单人】。
      */
     public static PushMessage emergencyTransferForOriginal(String areaName, String projectName, String devicePosition, String registrationCode, String workerName) {
@@ -341,6 +361,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 总经理、区域主管（项目所属）、所有文员（项目所属）
      * 维保工接收急修通知
      * 【区域名称】的【项目名称】的【电梯位置】电梯，注册代码【注册代码】，于【报修时间】接到召修信息，维保工已确认。
@@ -352,6 +373,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 总经理、区域主管（项目所属）、所有文员（项目所属）
      * 维保工到达现场
      * 【区域名称】的【项目名称】的【电梯位置】电梯，注册代码【注册代码】，于【报修时间】接到召修信息，维保工已于【到达时间】到达现场。
@@ -363,6 +385,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 总经理、区域主管（项目所属）、所有文员（项目所属）
      * 维保工提交急修单
      * 【区域名称】的【项目名称】的【电梯位置】电梯，注册代码【注册代码】，于【报修时间】接到召修信息，电梯已于【恢复时间】恢复正常。
@@ -374,15 +397,17 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 所有人
      * 公司发送公告
      * 有一条公司公告，请查收
      */
     public static PushMessage announcementNotice() {
-        return newMessage("公司公告", "有一条公司公告，请查收");
+        return create("公司公告", "有一条公司公告，请查收");
     }
 
     /**
+     * PC
      * 所有文员
      * 早上8点
      * 即时提醒：今天计划有X台电梯需保养，X台电梯正在维修中。
@@ -394,22 +419,24 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * 移动端
      * 区域主管（项目所属）
      * 下午4点
      * 即时提醒：【区域名称】今天共发生急修X次，已维修完毕X次，X次仍在处理中；X台电梯计划保养未完成。
      */
-    public static PushMessage managerEmergencyForRegionChargerDaily(String areaName, int total, int finish, int doings, int todos) {
+    public static PushMessage managerTaskForRegionChargerDaily(String areaName, int total, int finish, int doings, int todos) {
         String message = "即时提醒：%s今天共发生急修%s次，已维修完毕%s次，%s次仍在处理中；%s台电梯计划保养未完成。";
         String content = String.format(message, areaName, total, finish, doings, todos);
         return manager(content);
     }
 
     /**
+     * 移动端
      * 总经理
      * 下午4点
      * 即时提醒：今天共发生急修X次，已维修完毕X次，X次仍在处理中；X台电梯计划保养未完成。
      */
-    public static PushMessage managerEmergencyForLeaderDaily(String areaName, int total, int finish, int doings, int todos) {
+    public static PushMessage managerTaskForLeaderDaily(String areaName, int total, int finish, int doings, int todos) {
         String message = "即时提醒：%s今天共发生急修%s次，已维修完毕%s次，%s次仍在处理中；%s台电梯计划保养未完成。";
         String content = String.format(message, areaName, total, finish, doings, todos);
         return manager(content);
@@ -417,6 +444,7 @@ public class PushMessage implements Serializable {
 
 
     /**
+     * 移动端
      * 总经理，区域主管（项目所属）
      * 晚上8点
      * 日报：截止目前，今天应保养X台，已完成X台，X台即将超期；今天共发起急修X起，已处理完成X起，X起正在处理中。
@@ -428,6 +456,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 区域主管（项目所属），文员（所属文员），电梯主要负责人
      * 年检到期前45天
      * 【项目名称】的【电梯位置】电梯，注册代码【注册代码】，将于45日后年检到期。
@@ -439,6 +468,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 区域主管（项目所属），文员（所属文员），电梯主要负责人
      * 年检到期前15天
      * 【项目名称】的【电梯位置】电梯，注册代码【注册代码】，仍未启动年检，将于15日后年检到期。
@@ -450,6 +480,7 @@ public class PushMessage implements Serializable {
     }
 
     /**
+     * PC/移动端
      * 区域主管（项目所属），电梯负责人
      * 确认现场检验时间
      * 【项目名称】的【电梯位置】电梯，注册代码【注册代码】，已确认现场检验时间为【现场检验时间】。
@@ -461,13 +492,15 @@ public class PushMessage implements Serializable {
     }
 
     /**
-     * 所有人		【新闻标题】
+     * 移动端
+     * 所有人
+     * 【新闻标题】
      */
     public static PushMessage newsNotice(String title) {
-        return newMessage("发布新闻", title);
+        return create("发布新闻", title);
     }
 
-    public boolean isSplit() {
+    public boolean needSplit() {
         return toList != null && toList.size() > ValuePool.PUSH_MAX_SIZE;
     }
 

lift-common/src/main/java/cn.com.ty.lift.common/sql/SqlIllegalInterceptor.java

@@ -779,11 +779,11 @@ public class SqlIllegalInterceptor implements Interceptor {
         }
 
         private String fixCatalog() {
-            return null == this.catalog ? "<catalog>" : this.catalog;
+            return Objects.isNull(this.catalog) ? "<catalog>" : this.catalog;
         }
 
         private String fixSchema() {
-            return null == this.schema ? "<schema>" : this.schema;
+            return Objects.isNull(this.schema) ? "<schema>" : this.schema;
         }
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/dto/AttendanceResponse.java

@@ -155,14 +155,14 @@ public class AttendanceResponse extends Attendance{
     private String clockDate;
     private String clockTime;
     public String getClockDate(){
-        if(null == this.getCreateDate()){
+        if(Objects.isNull(this.getCreateDate())){
             return "无";
         }else{
             return String.format("%tF", this.getCreateDate());
         }
     }
     public String getClockTime(){
-        if(null == this.getCreateDate()){
+        if(Objects.isNull(this.getCreateDate())){
             return "无";
         }else{
             return String.format("%tT", this.getCreateDate());

lift-enterprise-service/src/main/resources/application-web.yml

@@ -33,9 +33,9 @@ spring:
       #true表示使用连接池；false时，每发送一条数据创建一个连接
       enabled: true
       #连接池最大连接数
-      max-connections: 10
+      max-connections: 30
       #空闲的连接过期时间，默认为30秒
-      idle-timeout: 300s
+      idle-timeout: 3000s
   jms:
     #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
     pub-sub-domain: false

lift-push/src/main/java/cn/com/ty/lift/push/PushApplication.java

@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.jms.annotation.EnableJms;
 
 /**
- * TODO
+ * 消息推送
  *
  * @author wcz
  * @since 2020/4/13

lift-push/src/main/java/cn/com/ty/lift/push/app/PushConsumer.java

@@ -63,7 +63,7 @@ public class PushConsumer {
     }
 
     private void process(String destination, PushMessage pushMessage){
-        if(pushMessage.isSplit()){
+        if(pushMessage.needSplit()){
             List<ArrayList<String>> doSplit = pushMessage.doSplit(ValuePool.PUSH_MAX_SIZE);
             for (ArrayList<String> list : doSplit) {
                 pushMessage.setToList(list);

lift-push/src/main/resources/application-dev.yml

@@ -33,9 +33,9 @@ spring:
       #true表示使用连接池；false时，每发送一条数据创建一个连接
       enabled: true
       #连接池最大连接数
-      max-connections: 10
+      max-connections: 30
       #空闲的连接过期时间，默认为30秒
-      idle-timeout: 300s
+      idle-timeout: 3000s
   jms:
     #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
     pub-sub-domain: false

lift-push/src/main/resources/application-web.yml

@@ -33,9 +33,9 @@ spring:
       #true表示使用连接池；false时，每发送一条数据创建一个连接
       enabled: true
       #连接池最大连接数
-      max-connections: 10
+      max-connections: 30
       #空闲的连接过期时间，默认为30秒
-      idle-timeout: 300s
+      idle-timeout: 3000s
   jms:
     #如果是点对点（queue），那么此处默认应该是false，如果发布订阅，那么一定设置为true
     pub-sub-domain: false

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/IPushUserMapper.java

@@ -44,5 +44,5 @@ public interface IPushUserMapper extends BaseMapper<PushUserInfo> {
      */
     @SelectProvider(type = MybatisSqlUtils.class, method = "getPushUserInfoByIdsSql")
     List<PushUserInfo> getPushUserInfoByUserIds(@Param("companyId") Long companyId,
-                                                @Param("companyId") List<Long> userIdList);
+                                                @Param("userIdList") List<Long> userIdList);
 }