Quellcode durchsuchen

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

wucizhong vor 5 Jahren
Ursprung
Commit
79987457f5
16 geänderte Dateien mit 239 neuen und 241 gelöschten Zeilen
  1. 33 33
      lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java
  2. 3 3
      lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/AnnualInspectionService.java
  3. 10 10
      lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java
  4. 6 6
      lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/EmergencyRepairService.java
  5. 6 6
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java
  6. 3 3
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MtRecordRequest.java
  7. 3 3
      lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceOptionService.java
  8. 161 159
      lift-common/src/main/java/cn.com.ty.lift.common/utils/ValuePool.java
  9. 3 3
      lift-common/src/main/java/cn.com.ty.lift.common/verify/Validate.java
  10. 2 4
      lift-common/src/main/java/cn.com.ty.lift.common/verify/Validator.java
  11. 4 4
      lift-enterprise-service/pom.xml
  12. 1 1
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AnnouncementController.java
  13. 1 1
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java
  14. 0 2
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/Announcement.java
  15. 2 2
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/service/AnnouncementService.java
  16. 1 1
      lift-enterprise-service/src/main/resources/application.yml

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

@@ -152,8 +152,8 @@ public class AnnualInspectionController {
             Validate.notTrue(deadline.isBefore(entity.getPlanDate()), "上次年检" + current.getPlanDate() + ",计划年检设置" + deadline + "之前有效");
         }
 
-        entity.setStatus(ValuePool.INSPECTION_NOT_START);
-        entity.setStepStatus(1);
+        entity.setStatus(ValuePool.INSPECTION_STATUS_TO_DO);
+        entity.setStepStatus(ValuePool.INSPECTION_STAGE_CONFIRM);
         entity.setStepName(ValuePool.INSPECTION_STEP_ONE);
         boolean ai = annualInspectionService.saveOrUpdate(entity);
         return RestResponse.success(ai);
@@ -190,11 +190,11 @@ public class AnnualInspectionController {
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Validate.notNull(old, ValuePool.INSPECTION_NOT_EXIST);
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 1);
-        Validate.equals(oldStepName, 1, "年检第一阶段才能修改");
+        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, "年检第一阶段才能修改");
         old.setIsCheckGoverner(entity.getIsCheckGoverner());
         old.setLoadInspectionSetting(entity.getLoadInspectionSetting());
 
-        old.setStepStatus(1);
+        old.setStepStatus(ValuePool.INSPECTION_STAGE_CONFIRM);
         old.setStepName(ValuePool.INSPECTION_STEP_ONE);
         boolean ai = annualInspectionService.saveOrUpdate(old);
         return RestResponse.success(ai);
@@ -212,15 +212,15 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 1);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 2);
         Integer stepStatus = entity.getStepStatus();
-        Validate.equals(oldStepName, 1, "请先完成确认操作再进行第一阶段");
-        Validate.between(oldStepStatus, 1, 2, "请进行第一阶段操作");
-        Validate.equals(stepStatus,2, "请进行第一阶段操作");
+        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, "请先完成确认操作再进行第一阶段");
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM, ValuePool.INSPECTION_STAGE_SELFCHECK, "请进行第一阶段操作");
+        Validate.equals(stepStatus,ValuePool.INSPECTION_STAGE_SELFCHECK, "请进行第一阶段操作");
 
         old.setSelfcheckReportImg(entity.getSelfcheckReportImg());
         old.setSelfcheckDate(entity.getSelfcheckDate());
         old.setStepStatus(entity.getStepStatus());
 
-        old.setStepName(2);//流转到阶段2
+        old.setStepName(ValuePool.INSPECTION_STEP_TWO);//流转到阶段2
 
         boolean ai = annualInspectionService.saveOrUpdate(old);
         return RestResponse.success(ai);
@@ -237,16 +237,16 @@ public class AnnualInspectionController {
         Validate.notNull(old, ValuePool.INSPECTION_NOT_EXIST);
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 2);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 2);
-        Validate.between(oldStepName, 1,2, "请先完成第一阶段再进行第二阶段");
-        Validate.between(oldStepStatus, 2, 3, "请进行第二阶段操作");
+        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_ONE,ValuePool.INSPECTION_STEP_TWO, "请先完成第一阶段再进行第二阶段");
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, "请进行第二阶段操作");
 
         old.setCheckDate(entity.getCheckDate());
         old.setInspector(entity.getInspector());
         old.setOperator(entity.getOperator());
         old.setTelephone(entity.getTelephone());
 
-        old.setStepStatus(3);
-        old.setStepName(3);//流转到阶段3
+        old.setStepStatus(ValuePool.INSPECTION_STAGE_CONFIRM_CHECK);
+        old.setStepName(ValuePool.INSPECTION_STEP_THREE);//流转到阶段3
 
         boolean ai = annualInspectionService.saveOrUpdate(old);
         if(ai){
@@ -286,9 +286,9 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 2);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 3);
         Integer stepStatus = entity.getStepStatus();
-        Validate.between(oldStepName,2, 3, "请先完成第二阶段再进行第三阶段");
-        Validate.between(oldStepStatus,3,7, "请进行第三阶段操作");
-        Validate.between(stepStatus,4,7, "请进行第三阶段操作");
+        Validate.between(oldStepName,ValuePool.INSPECTION_STEP_TWO, ValuePool.INSPECTION_STEP_THREE, "请先完成第二阶段再进行第三阶段");
+        Validate.between(oldStepStatus,ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, "请进行第三阶段操作");
+        Validate.between(stepStatus,ValuePool.INSPECTION_STAGE_UPLOAD_CHECK,ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, "请进行第三阶段操作");
         if(Objects.nonNull(old.getPlanDate())){
             LocalDate deadline = old.getPlanDate().plusDays(DateUtils.daysOfYear());
             Validate.notTrue(deadline.isBefore(entity.getNextInspectionTime()), "上次年检" + old.getPlanDate() + ",下次年检设置" + deadline + "之前有效");
@@ -299,11 +299,11 @@ public class AnnualInspectionController {
         old.setNextInspectionTime(entity.getNextInspectionTime());
 
         //企业文员确认检验结果-整改 --> 回到第二阶段
-        if(stepStatus == 5 || stepStatus == 7){
-            old.setStepName(4);//流转到阶段4
-        } else if(stepStatus == 6){
-            old.setStepStatus(3);
-            old.setStepName(2);//转回阶段2
+        if(stepStatus == ValuePool.INSPECTION_STAGE_CHECK_QUALIFIED || stepStatus == ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED){
+            old.setStepName(ValuePool.INSPECTION_STEP_FOUR);//流转到阶段4
+        } else if(stepStatus == ValuePool.INSPECTION_STAGE_CHECK_RECTIFICATION){
+            old.setStepStatus(ValuePool.INSPECTION_STAGE_CONFIRM_CHECK);
+            old.setStepName(ValuePool.INSPECTION_STEP_TWO);//转回阶段2
             old.setCheckResultImg("");
             old.setNextInspectionTime(LocalDate.of(1970, 1,1));
         }
@@ -323,22 +323,22 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 3);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 5);
         Integer stepStatus = entity.getStepStatus();
-        Validate.between(oldStepName,3, 4, "请先完成第三阶段再进行第四阶段");
-        Validate.between(oldStepStatus,5,10, "请进行第四阶段操作");
-        Validate.between(stepStatus,8,10, "请进行第四阶段操作");
+        Validate.between(oldStepName,ValuePool.INSPECTION_STEP_THREE, ValuePool.INSPECTION_STEP_FOUR, "请先完成第三阶段再进行第四阶段");
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CHECK_QUALIFIED, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, "请进行第四阶段操作");
+        Validate.between(stepStatus,ValuePool.INSPECTION_STAGE_UPLOAD_CERT_REPORT,ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, "请进行第四阶段操作");
 
         old.setStepStatus(entity.getStepStatus());
         old.setAnnualInspectionImg(entity.getAnnualInspectionImg());
         old.setCertificateImgUrl(entity.getCertificateImgUrl());
 
-        if(stepStatus == 9){
-            old.setStatus(1);//已完成
+        if(stepStatus == ValuePool.INSPECTION_STAGE_CERT_REPORT_QUALIFIED){
+            old.setStatus(ValuePool.INSPECTION_STATUS_COMPLETE);//已完成
             old.setFinishTime(LocalDateTime.now());
-        } else if(stepStatus == 10){
-            old.setStatus(2);//超期
+        } else if(stepStatus == ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED){
+            old.setStatus(ValuePool.INSPECTION_STATUS_OVERDUE);//超期
             old.setFinishTime(LocalDateTime.now());
         }
-        old.setStepName(4);
+        old.setStepName(ValuePool.INSPECTION_STEP_FOUR);
         return annualInspectionService.stepFour(old);
     }
 
@@ -386,7 +386,7 @@ public class AnnualInspectionController {
 
         entity.setSelfcheckDate(request.getSelfcheckDate());
         entity.setSelfcheckReportImg(request.getSelfcheckReportImg());
-        entity.setStepStatus(2);
+        entity.setStepStatus(ValuePool.INSPECTION_STAGE_SELFCHECK);
         entity.setStepName(ValuePool.INSPECTION_STEP_ONE);
 
         boolean result = annualInspectionService.updateById(entity);
@@ -407,7 +407,7 @@ public class AnnualInspectionController {
 
         entity.setCheckDate(request.getCheckDate());
         entity.setCheckResultImg(request.getCheckResultImg());
-        entity.setStepStatus(4);
+        entity.setStepStatus(ValuePool.INSPECTION_STAGE_UPLOAD_CHECK);
         entity.setStepName(ValuePool.INSPECTION_STEP_THREE);
 
         boolean result = annualInspectionService.updateById(entity);
@@ -428,7 +428,7 @@ public class AnnualInspectionController {
 
         entity.setCertificateImgUrl(request.getCertificateImgUrl());
         entity.setAnnualInspectionImg(request.getAnnualInspectionImg());
-        entity.setStepStatus(8);
+        entity.setStepStatus(ValuePool.INSPECTION_STAGE_UPLOAD_CERT_REPORT);
         entity.setStepName(ValuePool.INSPECTION_STEP_FOUR);
 
         boolean result = annualInspectionService.updateById(entity);
@@ -498,7 +498,7 @@ public class AnnualInspectionController {
             FileUtil.del(zipFile);
             FileUtil.del(baseDir);
             log.error("生成文件失败", e);
-            throw Validate.verifyException("生成文件失败");
+            throw Validate.validateException("生成文件失败");
         }
         //下载压缩文件
         if (FileUtil.exist(zipFile)) {
@@ -516,7 +516,7 @@ public class AnnualInspectionController {
                 }
             } catch (Exception e) {
                 log.error("下载文件失败", e);
-                throw Validate.verifyException("下载文件失败");
+                throw Validate.validateException("下载文件失败");
             }finally {
                 //删除临时根目录和zip文件
                 FileUtil.del(zipFile);

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

@@ -157,7 +157,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
             if (Objects.nonNull(repair)) {
                 repair.setCloseReason("开启年检,关闭急修");
                 //新状态(-1 暂停中,0 待修理;1 修理中;2 已完成 3 已关闭)
-                entity.setStatus(ValuePool.EMERGENCY_CLOSE);
+                entity.setStatus(ValuePool.EMERGENCY_STATE_CLOSE);
                 boolean cl = emergencyRepairService.updateById(repair);
                 if (!cl) {
                     rollback();
@@ -237,7 +237,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
             return RestResponse.fail("平台公司电梯关联信息不存在,请核查");
         }
         //todo 不合格:流程结束,电梯扭转到不合格状态列表,电梯停保,清理维保计划记录
-        if (stepStatus == 10) {
+        if (stepStatus == ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED) {
             //如果不合格,修改电梯的业务状态为停保
             relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.STOP_INSURANCE.getCode());
             boolean re = platformCompanyLiftRelevanceService.updateById(relevance);
@@ -256,7 +256,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
             }
         }
         //todo:合格:修改电梯的业务状态为正常
-        if (stepStatus == 9) {
+        if (stepStatus == ValuePool.INSPECTION_STAGE_CERT_REPORT_QUALIFIED) {
             //如果合格,修改电梯的业务状态为正常
             relevance.setLiftCompanyStatus(CommonEnum.LiftStatus.NORMAL.getCode());
             boolean re = platformCompanyLiftRelevanceService.updateById(relevance);

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

@@ -283,7 +283,7 @@ public class EmergencyRepairController {
         Validate.notNull(entity, ValuePool.EMERGENCY_NOT_EXIST);
 
         //如果已经接单,在急修中了不能被转派
-        Validate.notEquals(entity.getStatus(), ValuePool.EMERGENCY_DOING, ValuePool.EMERGENCY_HAD_TAKEN);
+        Validate.notEquals(entity.getStatus(), ValuePool.EMERGENCY_STATE_DOING, ValuePool.EMERGENCY_HAD_TAKEN);
         Long originId = entity.getWorkerId1();
         //本急修单的负责维保工
         entity.setWorkerId1(request.getWorkerId());
@@ -331,7 +331,7 @@ public class EmergencyRepairController {
 
         entity.setCloseReason(request.getCloseReason());
         //新状态(-1 暂停中,0 待修理;1 修理中;2 已完成 3 已关闭)
-        entity.setStatus(ValuePool.EMERGENCY_CLOSE);
+        entity.setStatus(ValuePool.EMERGENCY_STATE_CLOSE);
 
         return emergencyRepairService.close(entity);
     }
@@ -362,10 +362,10 @@ public class EmergencyRepairController {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Validate.notNull(entity, ValuePool.EMERGENCY_NOT_EXIST);
 
-        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_TO_DO, ValuePool.EMERGENCY_MUST_TO_DO);
+        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_TO_DO, ValuePool.EMERGENCY_MUST_TO_DO);
         entity.setTakingTime(request.getTakingTime());
         //todo:修改电梯的业务状态为急修中,如果存在维保中,要修改
-        entity.setStatus(ValuePool.EMERGENCY_DOING);
+        entity.setStatus(ValuePool.EMERGENCY_STATE_DOING);
         RestResponse result = emergencyRepairService.taking(entity);
         if (Objects.equals("1", result.getStatusCode())) {
             Long id = entity.getId();
@@ -401,7 +401,7 @@ public class EmergencyRepairController {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Validate.notNull(entity, ValuePool.EMERGENCY_NOT_EXIST);
 
-        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
+        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
         entity.setArriveTime(request.getArriveTime());
         entity.setPosition(request.getPosition());
 
@@ -440,7 +440,7 @@ public class EmergencyRepairController {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Validate.notNull(entity, ValuePool.EMERGENCY_NOT_EXIST);
 
-        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
+        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
         entity.setStopDate(request.getStopDate());
         entity.setSafetyConfirm(request.getSafetyConfirm());
 
@@ -597,7 +597,7 @@ public class EmergencyRepairController {
         EmergencyRepair repair = emergencyRepairService.getById(recordId);
         Validate.notNull(repair, ValuePool.EMERGENCY_NOT_EXIST);
 
-        Validate.equals(repair.getStatus(), ValuePool.EMERGENCY_COMPLETE, ValuePool.EMERGENCY_MUST_COMPLETE);
+        Validate.equals(repair.getStatus(), ValuePool.EMERGENCY_STATE_COMPLETE, ValuePool.EMERGENCY_MUST_COMPLETE);
         Validate.notEquals(repair.getHasEvaluate(), 1, ValuePool.EMERGENCY_HAD_EVALUATE);
 
         //来源(1 维保;2 急修)
@@ -624,7 +624,7 @@ public class EmergencyRepairController {
         Long id = request.getId();
         EmergencyRepair entity = emergencyRepairService.getById(id);
         Validate.notNull(entity, ValuePool.EMERGENCY_NOT_EXIST);
-        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
+        Validate.equals(entity.getStatus(), ValuePool.EMERGENCY_STATE_DOING, ValuePool.EMERGENCY_MUST_IN_DOING);
         List<ErRecordImg> erRecordImgs = new ArrayList<>();
         List<String> erRecordImg = request.getErRecordImg();
         for (int i = 0; i < erRecordImg.size(); i++) {
@@ -863,7 +863,7 @@ public class EmergencyRepairController {
             FileUtil.del(zipFile);
             FileUtil.del(baseDir);
             log.error("生成文件失败", e);
-            throw Validate.verifyException("生成文件失败");
+            throw Validate.validateException("生成文件失败");
         }
         //下载压缩文件
         if (FileUtil.exist(zipFile)) {
@@ -881,7 +881,7 @@ public class EmergencyRepairController {
                 }
             } catch (Exception e) {
                 log.error("下载文件失败", e);
-                throw Validate.verifyException("下载文件失败");
+                throw Validate.validateException("下载文件失败");
             } finally {
                 //删除临时根目录和zip文件
                 FileUtil.del(zipFile);

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

@@ -167,7 +167,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         LambdaQueryWrapper<EmergencyRepair> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.eq(EmergencyRepair::getLiftId, liftId);
-        lambdaQueryWrapper.in(EmergencyRepair::getStatus, Arrays.asList(ValuePool.EMERGENCY_TO_DO, ValuePool.EMERGENCY_DOING));
+        lambdaQueryWrapper.in(EmergencyRepair::getStatus, Arrays.asList(ValuePool.EMERGENCY_STATE_TO_DO, ValuePool.EMERGENCY_STATE_DOING));
         return count(lambdaQueryWrapper);
 
     }
@@ -177,7 +177,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.eq(EmergencyRepair::getLiftId, liftId);
         lambdaQueryWrapper.eq(EmergencyRepair::getProjectId, projectId);
-        lambdaQueryWrapper.in(EmergencyRepair::getStatus, Arrays.asList(ValuePool.EMERGENCY_TO_DO, ValuePool.EMERGENCY_DOING));
+        lambdaQueryWrapper.in(EmergencyRepair::getStatus, Arrays.asList(ValuePool.EMERGENCY_STATE_TO_DO, ValuePool.EMERGENCY_STATE_DOING));
         return getOne(lambdaQueryWrapper);
 
     }
@@ -202,11 +202,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return RestResponse.success(true);
         }
         //如果存在,不在急修中
-        if (emergencyRepair.getStatus() != ValuePool.EMERGENCY_DOING) {
+        if (emergencyRepair.getStatus() != ValuePool.EMERGENCY_STATE_DOING) {
             return RestResponse.success(true);
         }
         // 如果存在,并且急修中,急修改成暂停中
-        emergencyRepair.setStatus(ValuePool.EMERGENCY_STOPPING);
+        emergencyRepair.setStatus(ValuePool.EMERGENCY_STATE_STOPPING);
         boolean er = updateById(emergencyRepair);
         if (!er) {
             return RestResponse.fail("修改急修失败,请稍后重试");
@@ -242,11 +242,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return RestResponse.success(true);
         }
         //如果急修单不在暂停中,直接返回true
-        if (emergencyRepair.getStatus() != ValuePool.EMERGENCY_STOPPING) {
+        if (emergencyRepair.getStatus() != ValuePool.EMERGENCY_STATE_STOPPING) {
             return RestResponse.success(true);
         }
         //恢复暂停中的急修为急修中
-        emergencyRepair.setStatus(ValuePool.EMERGENCY_DOING);
+        emergencyRepair.setStatus(ValuePool.EMERGENCY_STATE_DOING);
         boolean er = updateById(emergencyRepair);
         if (!er) {
             return RestResponse.fail("修改急修失败,请稍后重试");

+ 6 - 6
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/controller/MaintenanceRecordController.java

@@ -180,12 +180,12 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("treeOptions")
-    @Validation(fields = {"mtCompanyId", "type", "liftType"})
+    @Validation(fields = {"mtCompanyId", "type", "liftCategory"})
     public RestResponse treeOptions(@Val @RequestBody MtRecordRequest request) {
         Integer type = request.getType();
-        Integer liftType = request.getLiftType();
+        Integer liftCategory = request.getLiftCategory();
         Long mtCompanyId = request.getMtCompanyId();
-        List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type, liftType, mtCompanyId);
+        List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftCategory(type, liftCategory, mtCompanyId);
         Validate.notTrue(IterUtil.isEmpty(optionList), "维保操作项不存在,请核查");
         //按照sort groupby
         Map<Integer, List<MaintenanceOption>> mtOptionMap = optionList.stream().collect(Collectors.groupingBy(MaintenanceOption::getSort));
@@ -203,12 +203,12 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("listOptions")
-    @Validation(fields = {"mtCompanyId", "type", "liftType"})
+    @Validation(fields = {"mtCompanyId", "type", "liftCategory"})
     public RestResponse listOptions(@Val @RequestBody MtRecordRequest request) {
         Integer type = request.getType();
-        Integer liftType = request.getLiftType();
+        Integer liftCategory = request.getLiftCategory();
         Long mtCompanyId = request.getMtCompanyId();
-        List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type, liftType, mtCompanyId);
+        List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftCategory(type, liftCategory, mtCompanyId);
         return RestResponse.success(optionList);
     }
 

+ 3 - 3
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/request/MtRecordRequest.java

@@ -63,10 +63,10 @@ public class MtRecordRequest extends PageRequest {
     private Long mtCompanyId;
 
     /**
-     * 电梯类型(1:直梯;2:扶梯)
+     * 电梯类别(1:曳引梯;2:液压梯;3:杂物梯;4:自动扶梯;5:自动人行道)
      */
-    @Min(value = 1,message = "电梯类有误")
-    private Integer liftType;
+    @Min(value = 1,message = "电梯类有误")
+    private Integer liftCategory;
 
     /**
      * 保养类型 1.半月,2.季度,3.半年,4.全年

+ 3 - 3
lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceOptionService.java

@@ -24,15 +24,15 @@ public class MaintenanceOptionService extends ServiceImpl<MaintenanceOptionMappe
     /**
      * 根据维保项类型,电梯类型,维保公司id查询维保项
      * @param type 维保类型
-     * @param liftType 电梯类型
+     * @param liftCategory 电梯类别
      * @param mtCompanyId 维保公司id
      * @return List<MaintenanceOption>
      */
-    public List<MaintenanceOption> listByTypeAndLiftType(Integer type,Integer liftType,Long mtCompanyId){
+    public List<MaintenanceOption> listByTypeAndLiftCategory(Integer type,Integer liftCategory,Long mtCompanyId){
         LambdaQueryWrapper<MaintenanceOption> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.in(MaintenanceOption::getMtCompanyId,Arrays.asList(0, mtCompanyId));
         lambdaQueryWrapper.eq(MaintenanceOption::getType,type);
-        lambdaQueryWrapper.eq(MaintenanceOption::getLiftType,liftType);
+        lambdaQueryWrapper.eq(MaintenanceOption::getLiftType,liftCategory);
         return list(lambdaQueryWrapper);
     }
 }

+ 161 - 159
lift-common/src/main/java/cn.com.ty.lift.common/utils/ValuePool.java

@@ -22,265 +22,267 @@ import java.util.Objects;
  */
 public interface ValuePool {
 
-    String AMPERSAND         = "&";
-    String AND               = "and";
-    String AT                = "@";
-    String ASTERISK          = "*";
-    String STAR              = ASTERISK;
-    String BACK_SLASH        = "\\";
-    String COLON             = ":";
-    String COMMA             = ",";
-    String DASH              = "-";
-    String DOLLAR            = "$";
-    String DOT               = ".";
-    String DOTDOT            = "..";
-    String DOT_CLASS         = ".class";
-    String DOT_JAVA          = ".java";
-    String EMPTY             = "";
-    String EQUALS            = "=";
-    String FALSE             = "false";
-    String SLASH             = "/";
-    String HASH              = "#";
-    String HAT               = "^";
-    String LEFT_BRACE        = "{";
-    String LEFT_BRACKET      = "(";
-    String LEFT_CHEV         = "<";
-    String NEWLINE           = "\n";
-    String N                 = "n";
-    String NO                = "no";
-    String NULL              = "null";
-    String OFF               = "off";
-    String ON                = "on";
-    String PERCENT           = "%";
-    String PIPE              = "|";
-    String PLUS              = "+";
-    String QUESTION_MARK     = "?";
-    String EXCLAMATION_MARK  = "!";
-    String QUOTE             = "\"";
-    String RETURN            = "\r";
-    String TAB               = "\t";
-    String RIGHT_BRACE       = "}";
-    String RIGHT_BRACKET     = ")";
-    String RIGHT_CHEV        = ">";
-    String SEMICOLON         = ";";
-    String SINGLE_QUOTE      = "'";
-    String SPACE             = " ";
-    String LEFT_SQ_BRACKET   = "[";
-    String RIGHT_SQ_BRACKET  = "]";
-    String TRUE              = "true";
-    String UNDERSCORE        = "_";
-    String UTF_8             = "UTF-8";
-    String ISO_8859_1        = "ISO-8859-1";
-    String Y                 = "y";
-    String YES               = "yes";
-    String ONE               = "1";
-    String ZERO              = "0";
-    String DOLLAR_LEFT_BRACE = "${";
-    String HASH_LEFT_BRACE   = "#{";
-    String CRLF              = "\r\n";
-
-    String   HTML_NBSP                 = "&nbsp;";
-    String   HTML_AMP                  = "&amp";
-    String   HTML_QUOTE                = "&quot;";
-    String   HTML_LT                   = "&lt;";
-    String   HTML_GT                   = "&gt;";
+    String   AMPERSAND                                = "&";
+    String   AND                                      = "and";
+    String   AT                                       = "@";
+    String   ASTERISK                                 = "*";
+    String   STAR                                     = ASTERISK;
+    String   BACK_SLASH                               = "\\";
+    String   COLON                                    = ":";
+    String   COMMA                                    = ",";
+    String   DASH                                     = "-";
+    String   DOLLAR                                   = "$";
+    String   DOT                                      = ".";
+    String   DOTDOT                                   = "..";
+    String   DOT_CLASS                                = ".class";
+    String   DOT_JAVA                                 = ".java";
+    String   EMPTY                                    = "";
+    String   EQUALS                                   = "=";
+    String   FALSE                                    = "false";
+    String   SLASH                                    = "/";
+    String   HASH                                     = "#";
+    String   HAT                                      = "^";
+    String   LEFT_BRACE                               = "{";
+    String   LEFT_BRACKET                             = "(";
+    String   LEFT_CHEV                                = "<";
+    String   NEWLINE                                  = "\n";
+    String   N                                        = "n";
+    String   NO                                       = "no";
+    String   NULL                                     = "null";
+    String   OFF                                      = "off";
+    String   ON                                       = "on";
+    String   PERCENT                                  = "%";
+    String   PIPE                                     = "|";
+    String   PLUS                                     = "+";
+    String   QUESTION_MARK                            = "?";
+    String   EXCLAMATION_MARK                         = "!";
+    String   QUOTE                                    = "\"";
+    String   RETURN                                   = "\r";
+    String   TAB                                      = "\t";
+    String   RIGHT_BRACE                              = "}";
+    String   RIGHT_BRACKET                            = ")";
+    String   RIGHT_CHEV                               = ">";
+    String   SEMICOLON                                = ";";
+    String   SINGLE_QUOTE                             = "'";
+    String   SPACE                                    = " ";
+    String   LEFT_SQ_BRACKET                          = "[";
+    String   RIGHT_SQ_BRACKET                         = "]";
+    String   TRUE                                     = "true";
+    String   UNDERSCORE                               = "_";
+    String   UTF_8                                    = "UTF-8";
+    String   ISO_8859_1                               = "ISO-8859-1";
+    String   Y                                        = "y";
+    String   YES                                      = "yes";
+    String   ONE                                      = "1";
+    String   ZERO                                     = "0";
+    String   DOLLAR_LEFT_BRACE                        = "${";
+    String   HASH_LEFT_BRACE                          = "#{";
+    String   CRLF                                     = "\r\n";
+    //HTML
+    String   HTML_NBSP                                = "&nbsp;";
+    String   HTML_AMP                                 = "&amp";
+    String   HTML_QUOTE                               = "&quot;";
+    String   HTML_LT                                  = "&lt;";
+    String   HTML_GT                                  = "&gt;";
     // ----------------------------------------------------------------log
-    String   LOG_PREFIX                = "###| ";
-    String   LOG_LINE                  = "============================================================";
-    String   LOG_GLOBAL_EXCEPTION_LINE = "====================== GlobalDefaultException ======================";
-    String   LOG_URL                   = LOG_PREFIX + "URL          : ";
-    String   LOG_IP                    = LOG_PREFIX + "IP           : ";
-    String   LOG_CLASS_METHOD          = LOG_PREFIX + "CLASS_METHOD : ";
-    String   LOG_ARGS                  = LOG_PREFIX + "ARGS         : ";
-    String   LOG_RESPONSE              = LOG_PREFIX + "RESPONSE     : ";
-    String   LOG_STATUS                = LOG_PREFIX + "STATUS       : ";
-    String   LOG_EXCEPTION             = LOG_PREFIX + "EXCEPTION    : ";
+    String   LOG_PREFIX                               = "###| ";
+    String   LOG_LINE                                 = "============================================================";
+    String   LOG_GLOBAL_EXCEPTION_LINE                = "====================== GlobalDefaultException ======================";
+    String   LOG_URL                                  = LOG_PREFIX + "URL          : ";
+    String   LOG_IP                                   = LOG_PREFIX + "IP           : ";
+    String   LOG_CLASS_METHOD                         = LOG_PREFIX + "CLASS_METHOD : ";
+    String   LOG_ARGS                                 = LOG_PREFIX + "ARGS         : ";
+    String   LOG_RESPONSE                             = LOG_PREFIX + "RESPONSE     : ";
+    String   LOG_STATUS                               = LOG_PREFIX + "STATUS       : ";
+    String   LOG_EXCEPTION                            = LOG_PREFIX + "EXCEPTION    : ";
     //是否打印全部的结果
-    boolean  LOG_PRINT_ALL             = false;
+    boolean  LOG_PRINT_ALL                            = false;
     // 结果字符串 > LOG_PRINT_MAX ,格式化打印首尾(LOG_PRINT_MAX / 2)部分,中间省略
-    int      LOG_PRINT_MAX                             = 1000;
+    int      LOG_PRINT_MAX                            = 1000;
     // 方法处理耗时 > LOG_GOOD_TIME,日志到warn中
-    long     LOG_GOOD_TIME                             = 10 * 1000;
+    long     LOG_GOOD_TIME                            = 10 * 1000;
     // ---------------------------------------------------------------- array
-    String[] EMPTY_ARRAY                               = new String[0];
-    byte[]   BYTES_NEW_LINE                            = NEWLINE.getBytes();
+    String[] EMPTY_ARRAY                              = new String[0];
+    byte[]   BYTES_NEW_LINE                           = NEWLINE.getBytes();
     //android平台的推送
-    String   QUEUE_ANDROID_TOKEN                       = "liftmanager_queue_android_token";
+    String   QUEUE_ANDROID_TOKEN                      = "liftmanager_queue_android_token";
     //ios平台的推送
-    String   QUEUE_IOS_TOKEN                           = "liftmanager_queue_ios_token";
+    String   QUEUE_IOS_TOKEN                          = "liftmanager_queue_ios_token";
     //android全平台的推送
-    String   QUEUE_ANDROID_ALL                         = "liftmanager_queue_android_all";
+    String   QUEUE_ANDROID_ALL                        = "liftmanager_queue_android_all";
     //ios全平台的推送
-    String   QUEUE_IOS_ALL                             = "liftmanager_queue_ios_all";
+    String   QUEUE_IOS_ALL                            = "liftmanager_queue_ios_all";
     //一次最多推送的账号个数
-    int      PUSH_MAX_SIZE                             = 1000;
+    int      PUSH_MAX_SIZE                            = 1000;
     //消息推送失败后重新尝试的最多次数
-    int      PUSH_TRY_MAX_TIMES                        = 100;
-    String   PATTERN_NAME                              = "^[\u4e00-\u9fa5a-zA-Z0-9·.。;&\\s]{1,20}$";
-    String   PATTERN_TELEPHONE                         = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$";
+    int      PUSH_TRY_MAX_TIMES                       = 100;
+    String   PATTERN_NAME                             = "^[\u4e00-\u9fa5a-zA-Z0-9·.。;&\\s]{1,20}$";
+    String   PATTERN_TELEPHONE                        = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$";
     //======================年检相关状态值和判断方法======================================
     /**
-     * 年检未开始0
+     * 年检待完成
      */
-    int      INSPECTION_NOT_START                      = 0;
+    int      INSPECTION_STATUS_TO_DO                  = 0;
+    int      INSPECTION_STATUS_COMPLETE               = 1;
+    int      INSPECTION_STATUS_OVERDUE                = 2;
     /**
      * 年检 第一阶段
      */
-    int      INSPECTION_STEP_ONE                       = 1;
+    int      INSPECTION_STEP_ONE                      = 1;
     /**
      * 年检 第二阶段
      */
-    int      INSPECTION_STEP_TWO                       = 2;
+    int      INSPECTION_STEP_TWO                      = 2;
     /**
      * 年检 第三阶段
      */
-    int      INSPECTION_STEP_THREE                     = 3;
+    int      INSPECTION_STEP_THREE                    = 3;
     /**
      * 年检 第四阶段
      */
-    int      INSPECTION_STEP_FOUR                      = 4;
+    int      INSPECTION_STEP_FOUR                     = 4;
     /**
      * 1  维保工确认年检计划
      */
-    int      INSPECTION_CONFIRM                        = 1;
+    int      INSPECTION_STAGE_CONFIRM                 = 1;
     /**
      * 2  维保工上传自检报告,选择自检时间 或者 文员设置 是否检查限速器和荷载年检设置,
      * 文员也可以上传自检报告或者确认自检报告和自检时间,自检时间以最后设置的为准
      */
-    int      INSPECTION_SELFCHECK                      = 2;
+    int      INSPECTION_STAGE_SELFCHECK               = 2;
     /**
      * 3  企业文员确认现场检验时间
      * 录入人员信息,政府质检,企业质检,联系电话
      */
-    int      INSPECTION_CHECK_CONFIRM                  = 3;
+    int      INSPECTION_STAGE_CONFIRM_CHECK           = 3;
     /**
      * 4	维保工上传检验结果
      */
-    int      INSPECTION_CHECK_UPLOAD                   = 4;
+    int      INSPECTION_STAGE_UPLOAD_CHECK            = 4;
     /**
      * 5	企业文员确认检验结果-合格 --> 不能算年检超期
      */
-    int      INSPECTION_CHECK_QUALIFIED                = 5;
+    int      INSPECTION_STAGE_CHECK_QUALIFIED         = 5;
     /**
      * 6	企业文员确认检验结果-整改 --> 回到第二阶段
      */
-    int      INSPECTION_CHECK_RECTIFICATION            = 6;
+    int      INSPECTION_STAGE_CHECK_RECTIFICATION     = 6;
     /**
      * 7	企业文员确认检验结果-不合格 --> 可以算年检超期
      */
-    int      INSPECTION_CHECK_UNQUALIFIED              = 7;
+    int      INSPECTION_STAGE_CHECK_UNQUALIFIED       = 7;
     /**
      * 8	维保工上传年检报告和合格证
      */
-    int      INSPECTION_CERTIFICATE_REPORT_UPLOAD      = 8;
+    int      INSPECTION_STAGE_UPLOAD_CERT_REPORT      = 8;
     /**
      * 9	企业文员确认年检报告和合格证-合格
      */
-    int      INSPECTION_CERTIFICATE_REPORT_QUALIFIED   = 9;
+    int      INSPECTION_STAGE_CERT_REPORT_QUALIFIED   = 9;
     /**
      * 10	企业文员确认年检报告和合格证-不合格 -->停用电梯
      */
-    int      INSPECTION_CERTIFICATE_REPORT_UNQUALIFIED = 10;
-    String   INSPECTION_NOT_EXIST                      = "年检不存在,请确认年检计划";
+    int      INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED = 10;
+    String   INSPECTION_NOT_EXIST                     = "年检不存在,请确认年检计划";
     //===================急修相关状态值和判断方法======================================
     /**
      * 急修状态(-1 暂停中)
      */
-    int      EMERGENCY_STOPPING                        = -1;
+    int      EMERGENCY_STATE_STOPPING                 = -1;
     /**
      * 急修状态(0 待修理)
      */
-    int      EMERGENCY_TO_DO                           = 0;
+    int      EMERGENCY_STATE_TO_DO                    = 0;
     /**
      * 急修状态(1 修理中)
      */
-    int      EMERGENCY_DOING                           = 1;
+    int      EMERGENCY_STATE_DOING                    = 1;
     /**
      * 急修状态(2 完成)
      */
-    int      EMERGENCY_COMPLETE                        = 2;
+    int      EMERGENCY_STATE_COMPLETE                 = 2;
     /**
      * 急修状态(3 关闭)
      */
-    int      EMERGENCY_CLOSE                           = 3;
-    String   EMERGENCY_NOT_EXIST                       = "急修记录不存在,请核查";
-    String   EMERGENCY_COST_NOT_EXIST                  = "急修收费项不存在,请核查";
-    String   EMERGENCY_FAULT_MISSING                   = "缺少电梯故障项";
-    String   EMERGENCY_HAVE_REPAIRING                  = "该电梯存在未完成的急修,无法创建";
-    String   EMERGENCY_HAD_TAKEN                       = "急修已经接单,不能转派";
-    String   EMERGENCY_MUST_TO_DO                      = "待急修才能操作";
-    String   EMERGENCY_MUST_IN_DOING                   = "急修中才能操作";
-    String   EMERGENCY_MUST_COMPLETE                   = "急修完成后才能操作";
-    String   EMERGENCY_HAD_EVALUATE                    = "急修已经评价了";
-    String   EMERGENCY_COST_INCORRECT_AMOUNT           = "急修收费项金额有误";
-    String   EMERGENCY_LIFT_IS_IN_INSPECTION           = "电梯正在年检中,无法创建";
+    int      EMERGENCY_STATE_CLOSE                    = 3;
+    String   EMERGENCY_NOT_EXIST                      = "急修记录不存在,请核查";
+    String   EMERGENCY_COST_NOT_EXIST                 = "急修收费项不存在,请核查";
+    String   EMERGENCY_FAULT_MISSING                  = "缺少电梯故障项";
+    String   EMERGENCY_HAVE_REPAIRING                 = "该电梯存在未完成的急修,无法创建";
+    String   EMERGENCY_HAD_TAKEN                      = "急修已经接单,不能转派";
+    String   EMERGENCY_MUST_TO_DO                     = "待急修才能操作";
+    String   EMERGENCY_MUST_IN_DOING                  = "急修中才能操作";
+    String   EMERGENCY_MUST_COMPLETE                  = "急修完成后才能操作";
+    String   EMERGENCY_HAD_EVALUATE                   = "急修已经评价了";
+    String   EMERGENCY_COST_INCORRECT_AMOUNT          = "急修收费项金额有误";
+    String   EMERGENCY_LIFT_IS_IN_INSPECTION          = "电梯正在年检中,无法创建";
     //===================上传相关状态值和判断方法======================================
     /**
      * 图片上传最大大小10M * 1024 * 1024
      */
-    long     UPLOAD_MAX_SIZE_PIC                       = 10 << 20;
-    String   UPLOAD_MAX_SIZE_PIC_DESC                  = "文件大小不超过10M";
+    long     UPLOAD_MAX_SIZE_PIC                      = 10 << 20;
+    String   UPLOAD_MAX_SIZE_PIC_DESC                 = "文件大小不超过10M";
     /**
      * 文件上传最大大小50M * 1024 * 1024
      */
-    long     UPLOAD_MAX_SIZE_FILE                      = 50 << 20;
-    String   UPLOAD_MAX_SIZE_FILE_DESC                 = "文件大小不超过50M";
+    long     UPLOAD_MAX_SIZE_FILE                     = 50 << 20;
+    String   UPLOAD_MAX_SIZE_FILE_DESC                = "文件大小不超过50M";
     /**
      * 视频上传最大大小100M * 1024 * 1024
      */
-    long     UPLOAD_MAX_SIZE_VIDEO                     = 100 << 20;
-    String   UPLOAD_MAX_SIZE_VIDEO_DESC                = "文件大小不超过100M";
+    long     UPLOAD_MAX_SIZE_VIDEO                    = 100 << 20;
+    String   UPLOAD_MAX_SIZE_VIDEO_DESC               = "文件大小不超过100M";
     /**
      * 上传图片文件类型
      */
-    String[] UPLOAD_PICS                               = {".jpg", ".jpeg", ".png", ".bmp", ".gif"};
+    String[] UPLOAD_PICS                              = {".jpg", ".jpeg", ".png", ".bmp", ".gif"};
     /**
      * 上传其他文件类型
      */
-    String[] UPLOAD_FILES                              = {".pdf", ".txt", ".rar", ".zip", ".7z", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx"};
+    String[] UPLOAD_FILES                             = {".pdf", ".txt", ".rar", ".zip", ".7z", ".xls", ".xlsx", ".doc", ".docx", ".ppt", ".pptx"};
     /**
      * 上传视频文件类型
      */
-    String[] UPLOAD_VIDEOS                             = {".mov", ".mp4", ".avi", ".mpg", ".mpeg", ".rm", ".rmvb", ".wmv"};
-    String   UPLOAD_DATA_MISSING                       = "没有接收到文件数据";
-    String   UPLOAD_FAIL                               = "上传文件失败";
-    String   UPLOAD_FORMAT_NOT_SUPPORT                 = "文件格式暂时不支持";
-    String   UPLOAD_FORMAT_MISSING                     = "原文件名解析不到文件格式";
-    String   UPLOAD_FORMAT_ILLEGAL                     = "原文件名不合法";
-    String   UPLOAD_ORIGINAL_NAME_MISSING              = "未解析到原文件名";
+    String[] UPLOAD_VIDEOS                            = {".mov", ".mp4", ".avi", ".mpg", ".mpeg", ".rm", ".rmvb", ".wmv"};
+    String   UPLOAD_DATA_MISSING                      = "没有接收到文件数据";
+    String   UPLOAD_FAIL                              = "上传文件失败";
+    String   UPLOAD_FORMAT_NOT_SUPPORT                = "文件格式暂时不支持";
+    String   UPLOAD_FORMAT_MISSING                    = "原文件名解析不到文件格式";
+    String   UPLOAD_FORMAT_ILLEGAL                    = "原文件名不合法";
+    String   UPLOAD_ORIGINAL_NAME_MISSING             = "未解析到原文件名";
     //===================操作证相关======================================
-    String   LIFT_CERT_MUST_TO_AUDIT                   = "操作证待审核才能操作";
-    String   LIFT_CERT_HAD_EXIST                       = "操作证已存在,请核查";
-    String   LIFT_CERT_NOT_EXIST                       = "操作证不存在,请核查";
+    String   LIFT_CERT_MUST_TO_AUDIT                  = "操作证待审核才能操作";
+    String   LIFT_CERT_HAD_EXIST                      = "操作证已存在,请核查";
+    String   LIFT_CERT_NOT_EXIST                      = "操作证不存在,请核查";
     //===================打卡相关======================================
-    String   ATTEND_SET_AM_TIME                        = "请设置上午的上/下班时间";
-    String   ATTEND_SET_PM_TIME                        = "请设置下午的上/下班时间";
-    String   ATTEND_SET_OT_TIME                        = "请设置加班的上/下班时间";
-    String   ATTEND_INVALID_AM_TIME                    = "上午的上(%tT)/下班(%tT)时间有误";
-    String   ATTEND_INVALID_PM_TIME                    = "下午的上(%tT)/下班(%tT)时间有误";
-    String   ATTEND_INVALID_OT_TIME                    = "加班的上(%tT)/下班(%tT)时间有误";
-    String   ATTEND_AM_TOP_CLOCK                       = "上午上班打卡";
-    String   ATTEND_AM_DOWN_CLOCK                      = "上午下班打卡";
-    String   ATTEND_PM_TOP_CLOCK                       = "下午上班打卡";
-    String   ATTEND_PM_DOWN_CLOCK                      = "下午下班打卡";
-    String   ATTEND_OT_TOP_CLOCK                       = "加班上班打卡";
-    String   ATTEND_OT_DOWN_CLOCK                      = "加班下班打卡";
-    String   ATTEND_HAD_CLOCK                          = "记录已存在(打卡时间:%tF %tT)";
-    String   ATTEND_MISSING_TIME                       = "请至少设置一组打卡时间";
-    String   ATTEND_AM_DOWN_PM_TOP                     = "下午的上班(%tT)时间不得早于上午的下班(%tT)时间";
-    String   ATTEND_PM_DOWN_OT_TOP                     = "加班的上班(%tT)时间不得早于下午的下班(%tT)时间";
-    String   ATTEND_MAINTAIN_COMPANY_MISSING           = "维保公司不存在,请核查";
+    String   ATTEND_SET_AM_TIME                       = "请设置上午的上/下班时间";
+    String   ATTEND_SET_PM_TIME                       = "请设置下午的上/下班时间";
+    String   ATTEND_SET_OT_TIME                       = "请设置加班的上/下班时间";
+    String   ATTEND_INVALID_AM_TIME                   = "上午的上(%tT)/下班(%tT)时间有误";
+    String   ATTEND_INVALID_PM_TIME                   = "下午的上(%tT)/下班(%tT)时间有误";
+    String   ATTEND_INVALID_OT_TIME                   = "加班的上(%tT)/下班(%tT)时间有误";
+    String   ATTEND_AM_TOP_CLOCK                      = "上午上班打卡";
+    String   ATTEND_AM_DOWN_CLOCK                     = "上午下班打卡";
+    String   ATTEND_PM_TOP_CLOCK                      = "下午上班打卡";
+    String   ATTEND_PM_DOWN_CLOCK                     = "下午下班打卡";
+    String   ATTEND_OT_TOP_CLOCK                      = "加班上班打卡";
+    String   ATTEND_OT_DOWN_CLOCK                     = "加班下班打卡";
+    String   ATTEND_HAD_CLOCK                         = "记录已存在(打卡时间:%tF %tT)";
+    String   ATTEND_MISSING_TIME                      = "请至少设置一组打卡时间";
+    String   ATTEND_AM_DOWN_PM_TOP                    = "下午的上班(%tT)时间不得早于上午的下班(%tT)时间";
+    String   ATTEND_PM_DOWN_OT_TOP                    = "加班的上班(%tT)时间不得早于下午的下班(%tT)时间";
+    String   ATTEND_MAINTAIN_COMPANY_MISSING          = "维保公司不存在,请核查";
     //===================导入相关======================================
-    String   EXCEL_IMPORT_DATA_MISSING                 = "未解析到有效数据";
-    String   EXCEL_IMPORT_FORMAT_SUPPORT               = "文件格式不支持,暂时只支持xls,xlsx";
-    String[] EXCEL_IMPORT_FORMATS                      = {".xls", ".xlsx"};
+    String   EXCEL_IMPORT_DATA_MISSING                = "未解析到有效数据";
+    String   EXCEL_IMPORT_FORMAT_SUPPORT              = "文件格式不支持,暂时只支持xls,xlsx";
+    String[] EXCEL_IMPORT_FORMATS                     = {".xls", ".xlsx"};
     /**
      * 一次导入表格的最大有效记录数
      */
-    int      EXCEL_IMPORT_MAX_ROWS_ONETIME             = 5000;
-    String   EXCEL_IMPORT_MAX_ROWS_DESC                = "一次性导入不能超过5000条数据";
+    int      EXCEL_IMPORT_MAX_ROWS_ONETIME            = 5000;
+    String   EXCEL_IMPORT_MAX_ROWS_DESC               = "一次性导入不能超过5000条数据";
 
-    static <T> T nullable(T object, T nullable){
+    static <T> T nullable(T object, T nullable) {
         return Objects.isNull(object) ? nullable : object;
     }
 }

+ 3 - 3
lift-common/src/main/java/cn.com.ty.lift.common/verify/Validate.java

@@ -13,7 +13,7 @@ import java.util.Objects;
  */
 public interface Validate {
 
-    static ValidateException verifyException(String message){
+    static ValidateException validateException(String message){
         return new ValidateException(message);
     }
     /**
@@ -24,7 +24,7 @@ public interface Validate {
      */
     static void isTrue(boolean expression, String message) {
         if (!expression) {
-            throw verifyException(message);
+            throw validateException(message);
         }
     }
 
@@ -36,7 +36,7 @@ public interface Validate {
      */
     static void notTrue(boolean expression, String message) {
         if (expression) {
-            throw verifyException(message);
+            throw validateException(message);
         }
     }
     /**

+ 2 - 4
lift-common/src/main/java/cn.com.ty.lift.common/verify/Validator.java

@@ -1387,7 +1387,7 @@ public class Validator {
          * {@code fields} the list of fields to verify. if no, that will verify all fields in the object.
          */
         private void action() {
-            isNull(object, "The object to verify must not be null.");
+            isNull(object, "The object to validate must not be null.");
             Field[] validateFields = filterFields(object, fields);
             for (Field validateField : validateFields) {
                 //filter the validation annotation
@@ -1615,9 +1615,7 @@ public class Validator {
      * @param message    if {@code true} that throw a {@link IllegalArgumentException} with message.
      */
     private static void isNull(Object object, String message) {
-        if (null == object) {
-            throw newIllegalArgException(message);
-        }
+        isTrue(Objects.isNull(object), message);
     }
 
     private static void isTrue(boolean expression, String message) {

+ 4 - 4
lift-enterprise-service/pom.xml

@@ -22,10 +22,10 @@
             <artifactId>lift-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>cn.com.xwy</groupId>
-            <artifactId>xwy-cloud-dependencies</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>cn.com.xwy</groupId>-->
+            <!--<artifactId>xwy-cloud-dependencies</artifactId>-->
+        <!--</dependency>-->
     </dependencies>
 
     <build>

+ 1 - 1
lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AnnouncementController.java

@@ -78,7 +78,7 @@ public class AnnouncementController {
         List<AnnouncementResponse> records = pages.getRecords();
         long count = announcementService.countByMtCompany(request.getMtCompanyId());
         if(records.size() > 0){
-            List<Long> idList = records.stream().map(Announcement::getId).collect(Collectors.toList());
+            List<Long> idList = records.stream().map(AnnouncementResponse::getId).collect(Collectors.toList());
             List<AnnouncementImg> imgList = announcementImgService.listByAnnouncementIds(idList);
             Map<Long, List<AnnouncementImg>> listMap = imgList.stream().collect(Collectors.groupingBy(AnnouncementImg::getAnnouncementId));
             for (AnnouncementResponse record : records) {

+ 1 - 1
lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -285,7 +285,7 @@ public class AttendanceController {
             IoUtil.close(out);
         } catch (Exception e) {
             log.error("导出打卡记录异常", e);
-            throw Validate.verifyException("导出打卡记录异常");
+            throw Validate.validateException("导出打卡记录异常");
         }
     }
 }

+ 0 - 2
lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/entity/Announcement.java

@@ -3,7 +3,6 @@ package cn.com.ty.lift.enterprise.oa.entity;
 import cn.com.ty.lift.enterprise.config.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -65,7 +64,6 @@ public class Announcement extends BaseEntity {
      */
     private LocalDateTime postDate;
 
-    @JsonIgnore
     @TableField(exist = false)
     private List<String> imgUrls;
 

+ 2 - 2
lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/service/AnnouncementService.java

@@ -63,7 +63,7 @@ public class AnnouncementService extends ServiceImpl<AnnouncementMapper,Announce
      */
     @Transactional(rollbackFor = Exception.class)
     public RestResponse add(Announcement entity){
-        boolean an = saveOrUpdate(entity);
+        boolean an = save(entity);
         //插入公告失败,直接返回false
         if(!an){
             return RestResponse.fail("新增公告失败,请稍后重试");
@@ -82,7 +82,7 @@ public class AnnouncementService extends ServiceImpl<AnnouncementMapper,Announce
             ai.setSort(i);
             imgList.add(ai);
         }
-        boolean ais = announcementImgService.saveBatch(imgList);
+        boolean ais = announcementImgService.saveBatch(imgList, imgList.size());
         if(ais){
             return RestResponse.success(true);
         }else{

+ 1 - 1
lift-enterprise-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-enterprise-service
   profiles:
-    active: prod
+    active: test
 
 #自动添加createTime、isDelete 等字段
 xwy: