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

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

@@ -6,7 +6,6 @@ import cn.com.ty.lift.business.annualinspection.dto.InspectionResponse;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
 import cn.com.ty.lift.business.annualinspection.service.AnnualInspectionService;
 import cn.com.ty.lift.business.common.CountPage;
-import cn.com.ty.lift.business.common.Values;
 import cn.com.ty.lift.business.framework.conf.SystemConfiguration;
 import cn.com.ty.lift.common.utils.AliyunOSS;
 import cn.com.ty.lift.common.utils.Judge;
@@ -117,38 +116,38 @@ public class AnnualInspectionController {
         Integer stepStatus = entity.getStepStatus();
 
         //0 --> 1 维保工确认年检计划
-        Judge.notTrue(Values.Ai.statusNotStart(oldStepStatus) && !Values.Ai.sameNext(oldStepStatus,stepStatus),Values.Ai.confirm);
+        Judge.notTrue(Judge.Inspection.statusNotStart(oldStepStatus) && !Judge.Inspection.sameNext(oldStepStatus,stepStatus),Judge.Inspection.confirm);
         //1 --> 2
-        Judge.notTrue(Values.Ai.statusConfirm(oldStepStatus) && !Values.Ai.nextStatus(oldStepStatus,stepStatus),Values.Ai.selfcheckUpload);
+        Judge.notTrue(Judge.Inspection.statusConfirm(oldStepStatus) && !Judge.Inspection.nextStatus(oldStepStatus,stepStatus),Judge.Inspection.selfcheckUpload);
         /**
          * 2  维保工上传自检报告,选择自检时间 或者 文员设置 是否检查限速器和荷载年检设置，
          *             文员也可以上传自检报告或者确认自检报告和自检时间，自检时间以最后设置的为准
          */
-        if(Values.Ai.statusSelfcheck(oldStepStatus)){
+        if(Judge.Inspection.statusSelfcheck(oldStepStatus)){
             // 修改自检信息
-            if(Values.Ai.sameStatus(oldStepStatus,stepStatus)){
-                Judge.notNull(entity.getSelfcheckReportImg(),Values.Ai.selfcheckReportImg);
-                Judge.notNull(entity.getSelfcheckDate(),Values.Ai.selfcheckDate);
+            if(Judge.Inspection.sameStatus(oldStepStatus,stepStatus)){
+                Judge.notNull(entity.getSelfcheckReportImg(),Judge.Inspection.selfcheckReportImg);
+                Judge.notNull(entity.getSelfcheckDate(),Judge.Inspection.selfcheckDate);
                 //流转到下一个状态 2 --> 3
-            }else if(Values.Ai.statusCheckConfirm(stepStatus)){
+            }else if(Judge.Inspection.statusCheckConfirm(stepStatus)){
                 //3  企业文员确认现场检验时间，录入人员信息，政府质检，企业质检，联系电话
-                Judge.notNull(entity.getCheckDate(),Values.Ai.checkDate);
-                Judge.notNull(entity.getCheckResultImg(),Values.Ai.checkResultImg);
-                Judge.notNull(entity.getInspector(),Values.Ai.inspector);
-                Judge.notNull(entity.getOperator(),Values.Ai.operator);
-                Judge.notNull(entity.getTelephone(),Values.Ai.telephone);
+                Judge.notNull(entity.getCheckDate(),Judge.Inspection.checkDate);
+                Judge.notNull(entity.getCheckResultImg(),Judge.Inspection.checkResultImg);
+                Judge.notNull(entity.getInspector(),Judge.Inspection.inspector);
+                Judge.notNull(entity.getOperator(),Judge.Inspection.operator);
+                Judge.notNull(entity.getTelephone(),Judge.Inspection.telephone);
             }else {
-                return RestResponse.fail(Values.Ai.checkConfirm);
+                return RestResponse.fail(Judge.Inspection.checkConfirm);
             }
         }
         // 3 --> 4  维保工上传检验结果
-        Judge.notTrue(Values.Ai.statusCheckConfirm(oldStepStatus) && !Values.Ai.nextStatus(oldStepStatus,stepStatus),Values.Ai.checkConfirm);
+        Judge.notTrue(Judge.Inspection.statusCheckConfirm(oldStepStatus) && !Judge.Inspection.nextStatus(oldStepStatus,stepStatus),Judge.Inspection.checkConfirm);
         //4 检查上传检验结果
-        if(Values.Ai.statusCheckUpload(oldStepStatus)){
+        if(Judge.Inspection.statusCheckUpload(oldStepStatus)){
             //修改检验结果
-            if(Values.Ai.sameStatus(oldStepStatus,stepStatus)){
-                Judge.notNull(entity.getCheckResultImg(),Values.Ai.checkResultImg);
-                Judge.notNull(entity.getCheckDate(),Values.Ai.checkDate);
+            if(Judge.Inspection.sameStatus(oldStepStatus,stepStatus)){
+                Judge.notNull(entity.getCheckResultImg(),Judge.Inspection.checkResultImg);
+                Judge.notNull(entity.getCheckDate(),Judge.Inspection.checkDate);
                 //流转到下一个状态
             }else{
             /**
@@ -156,52 +155,52 @@ public class AnnualInspectionController {
              *  6	企业文员确认检验结果-整改
              *  7	企业文员确认检验结果-不合格
              */
-                Judge.notTrue(!Values.Ai.inStatus(Values.Ai.STATUS_CHECK_QUALIFIED,stepStatus,Values.Ai.STATUS_CHECK_UNQUALIFIED),Values.Ai.checkConfirm);
+                Judge.notTrue(!Judge.Inspection.inStatus(Judge.Inspection.STATUS_CHECK_QUALIFIED,stepStatus,Judge.Inspection.STATUS_CHECK_UNQUALIFIED),Judge.Inspection.checkConfirm);
             }
         }
         /**
          * 6 检验结果整改，回到阶段2
          * (3  企业文员确认现场检验时间 录入人员信息，政府质检，企业质检，联系电话)
          */
-        if(Values.Ai.statusCheckRectification(stepStatus)){
-            entity.setStepStatus(Values.Ai.STATUS_CHECK_CONFIRM);
+        if(Judge.Inspection.statusCheckRectification(stepStatus)){
+            entity.setStepStatus(Judge.Inspection.STATUS_CHECK_CONFIRM);
         }
         /**
          * 5	企业文员确认检验结果-合格 --> 8	维保工上传年检报告和合格证
          * 7	企业文员确认检验结果-不合格-->8	维保工上传年检报告和合格证
          */
-        if(Values.Ai.statusCheckQualified(oldStepStatus) || Values.Ai.statusCheckUnqualified(oldStepStatus)){
-            if(Values.Ai.statusCertificateReportUpload(stepStatus)){
-                Judge.notTrue(StrUtil.hasEmpty(entity.getCertificateImgUrl(),entity.getAnnualInspectionImg()),Values.Ai.certificateReportUpload);
+        if(Judge.Inspection.statusCheckQualified(oldStepStatus) || Judge.Inspection.statusCheckUnqualified(oldStepStatus)){
+            if(Judge.Inspection.statusCertificateReportUpload(stepStatus)){
+                Judge.notTrue(StrUtil.hasEmpty(entity.getCertificateImgUrl(),entity.getAnnualInspectionImg()),Judge.Inspection.certificateReportUpload);
             }else {
-                return RestResponse.fail(Values.Ai.statusError);
+                return RestResponse.fail(Judge.Inspection.statusError);
             }
         }
         /**
          * 8	维保工上传年检报告和合格证--> 9  企业文员确认年检报告和合格证 -合格
          * 8	维保工上传年检报告和合格证--> 10  企业文员确认年检报告和合格证 -不合格
          */
-        if(Values.Ai.statusCertificateReportUpload(oldStepStatus)){
+        if(Judge.Inspection.statusCertificateReportUpload(oldStepStatus)){
             //修改年检报告和合格证
-            if(Values.Ai.sameStatus(oldStepStatus,stepStatus)){
-                Judge.notTrue(StrUtil.hasEmpty(entity.getCertificateImgUrl(),entity.getAnnualInspectionImg()),Values.Ai.certificateReportUpload);
-            }else if(Values.Ai.statusCertificateReportQualified(stepStatus)){
+            if(Judge.Inspection.sameStatus(oldStepStatus,stepStatus)){
+                Judge.notTrue(StrUtil.hasEmpty(entity.getCertificateImgUrl(),entity.getAnnualInspectionImg()),Judge.Inspection.certificateReportUpload);
+            }else if(Judge.Inspection.statusCertificateReportQualified(stepStatus)){
                 //合格：文员确认年检报告并设置下次年检时间
-                Judge.notNull(entity.getNextInspectionTime(),Values.Ai.nextInspectionTime);
+                Judge.notNull(entity.getNextInspectionTime(),Judge.Inspection.nextInspectionTime);
                 // 设置年检完成 status = 1
                 entity.setFinishTime(LocalDateTime.now());
                 entity.setStatus(1);
-            }else if(Values.Ai.statusCertificateReportUnqualified(stepStatus)){
+            }else if(Judge.Inspection.statusCertificateReportUnqualified(stepStatus)){
                 // 设置年检完成 status = 1
                 entity.setFinishTime(LocalDateTime.now());
                 entity.setStatus(1);
             }else{
-                return RestResponse.fail(Values.Ai.statusError);
+                return RestResponse.fail(Judge.Inspection.statusError);
             }
         }
 
-        int stepName = Values.Ai.status2StepName(entity.getStepStatus());
-        Judge.notTrue(stepName == -1,Values.Ai.statusError);
+        int stepName = Judge.Inspection.status2StepName(entity.getStepStatus());
+        Judge.notTrue(stepName == -1,Judge.Inspection.statusError);
         entity.setStepName(stepName);
 
         boolean result = annualInspectionService.finish(entity);
@@ -241,8 +240,8 @@ public class AnnualInspectionController {
     public RestResponse confirm(@RequestBody InspectionRequest request){
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Judge.notNull(entity);
-        entity.setStepStatus(Values.Ai.STATUS_CONFIRM);
-        entity.setStepName(Values.Ai.STEP_ONE);
+        entity.setStepStatus(Judge.Inspection.STATUS_CONFIRM);
+        entity.setStepName(Judge.Inspection.STEP_ONE);
         boolean result = annualInspectionService.updateById(entity);
         return RestResponse.success(result);
     }
@@ -260,8 +259,8 @@ public class AnnualInspectionController {
 
         entity.setSelfcheckDate(request.getSelfcheckDate());
         entity.setSelfcheckReportImg(request.getSelfcheckReportImg());
-        entity.setStepStatus(Values.Ai.STATUS_SELFCHECK);
-        entity.setStepName(Values.Ai.STEP_ONE);
+        entity.setStepStatus(Judge.Inspection.STATUS_SELFCHECK);
+        entity.setStepName(Judge.Inspection.STEP_ONE);
 
         boolean result = annualInspectionService.updateById(entity);
         return RestResponse.success(result);
@@ -280,8 +279,8 @@ public class AnnualInspectionController {
 
         entity.setCheckDate(request.getCheckDate());
         entity.setCheckResultImg(request.getCheckResultImg());
-        entity.setStepStatus(Values.Ai.STATUS_CHECK_UPLOAD);
-        entity.setStepName(Values.Ai.STEP_THREE);
+        entity.setStepStatus(Judge.Inspection.STATUS_CHECK_UPLOAD);
+        entity.setStepName(Judge.Inspection.STEP_THREE);
 
         boolean result = annualInspectionService.updateById(entity);
         return RestResponse.success(result);
@@ -300,8 +299,8 @@ public class AnnualInspectionController {
 
         entity.setCertificateImgUrl(request.getCertificateImgUrl());
         entity.setAnnualInspectionImg(request.getAnnualInspectionImg());
-        entity.setStepStatus(Values.Ai.STATUS_CERTIFICATE_REPORT_UPLOAD);
-        entity.setStepName(Values.Ai.STEP_FOUR);
+        entity.setStepStatus(Judge.Inspection.STATUS_CERTIFICATE_REPORT_UPLOAD);
+        entity.setStepName(Judge.Inspection.STEP_FOUR);
 
         boolean result = annualInspectionService.updateById(entity);
         return RestResponse.success(result);

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

@@ -8,7 +8,9 @@ import lombok.EqualsAndHashCode;
 import java.time.LocalDate;
 
 /**
- * <p>年检管理请求参数封装</p>
+ * <p>
+ *     年检管理请求参数封装
+ * </p>
  * @author wcz
  * @since 2019/12/10
  */
@@ -62,33 +64,33 @@ public class InspectionRequest extends BaseRequestModel{
     /**
      * 自检时间
      */
-    @Judger(message = "自检时间有误")
+    @Judger(message = "缺少自检时间")
     private LocalDate selfcheckDate;
     /**
      * 自检报告路径
      */
-    @Judger(message = "自检报告图片有误")
+    @Judger(message = "缺少自检报告图片")
     private String selfcheckReportImg;
     /**
      * 检验结果图片路径
      */
-    @Judger(message = "检验图片有误")
+    @Judger(message = "缺少检验图片")
     private String checkResultImg;
     /**
      * 现场检验时间
      */
-    @Judger(message = "检验时间有误")
+    @Judger(message = "缺少检验时间")
     private LocalDate checkDate;
 
     /**
      * 合格证图片路径
      */
-    @Judger(message = "合格证图片有误")
+    @Judger(message = "缺少合格证图片")
     private String certificateImgUrl;
 
     /**
      * 年检报告图片路径
      */
-    @Judger(message = "年检报告图片有误")
+    @Judger(message = "缺少年检报告图片")
     private String annualInspectionImg;
 }

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

@@ -5,7 +5,9 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * <p>年检返回结果封装</p>
+ * <p>
+ *     年检返回结果封装
+ * </p>
  * @author wcz
  * @since 2019/12/10
  */

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

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 年检记录
+ *     年检记录
  * </p>
  *
  * @author wcz

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

@@ -4,7 +4,6 @@ import cn.com.ty.lift.business.annualinspection.dto.InspectionRequest;
 import cn.com.ty.lift.business.annualinspection.dto.InspectionResponse;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
 import cn.com.ty.lift.business.annualinspection.mapper.AnnualInspectionMapper;
-import cn.com.ty.lift.business.common.Values;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
 import cn.com.ty.lift.business.library.dao.entity.LiftHistory;
 import cn.com.ty.lift.business.library.dao.entity.PlatformCompanyLiftRelevance;
@@ -13,6 +12,7 @@ import cn.com.ty.lift.business.library.service.LiftService;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.maintenance.service.MaintenancePlanService;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.utils.Judge;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -107,7 +107,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         Long liftId = entity.getLiftId();
 
         //阶段2 修改电梯的业务状态为年检中
-        if (Values.Ai.stepTwo(stepName)) {
+        if (Judge.Inspection.stepTwo(stepName)) {
             PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
             if (null == relevance) {
                 return false;
@@ -124,7 +124,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         }
 
         //阶段3 如果合格，修改电梯的业务状态为正常，
-        if (Values.Ai.stepThree(stepName)) {
+        if (Judge.Inspection.stepThree(stepName)) {
             PlatformCompanyLiftRelevance relevance = platformCompanyLiftRelevanceService.findByMtCompanyAndLift(mtCompanyId, liftId);
             if (null == relevance) {
                 return false;
@@ -141,9 +141,9 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         }
 
         //阶段4 年检结果不合格 or 合格
-        if (Values.Ai.stepFour(stepName)) {
+        if (Judge.Inspection.stepFour(stepName)) {
             //todo 不合格：流程结束，电梯扭转到不合格状态列表，电梯停保，清理维保计划记录
-            if (Values.Ai.statusCertificateReportUnqualified(stepStatus)) {
+            if (Judge.Inspection.statusCertificateReportUnqualified(stepStatus)) {
                 boolean mp = maintenancePlanService.cleanPlan(mtCompanyId, liftId);
                 if (mp) {
                     return true;
@@ -154,7 +154,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
                 }
             }
             //todo:合格：修改电梯的年检时间lift-annual_inspection_date，增加lift_history记录
-            if (Values.Ai.statusCertificateReportQualified(stepStatus)) {
+            if (Judge.Inspection.statusCertificateReportQualified(stepStatus)) {
                 //电梯不存在，说明数据有误，直接返回false
                 Lift lift = liftService.getById(liftId);
                 if (null == lift) {

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonController.java

@@ -37,6 +37,8 @@ import java.util.Map;
 @RequestMapping("common")
 public class CommonController {
 
+    private static final String DateInPath = "yyyy/MM/dd";
+
     private RedisTemplate<String, Object> redisTemplate;
     private SystemConfiguration systemConfiguration;
     private AliyunOSS aliyunOSS;
@@ -79,12 +81,12 @@ public class CommonController {
     @PostMapping("uploads")
     public RestResponse uploads(@RequestParam("files") MultipartFile[] files){
         try {
-            Judge.notNull(files,Values.Upload.missingFileData);
+            Judge.notNull(files,Judge.Upload.fileDataMissing);
             List<OssEntity> ossEntities = new ArrayList<>();
             for (MultipartFile file : files) {
                 String fileName = handleFile(file);
                 if(StrUtil.isEmpty(fileName)){
-                    return RestResponse.fail("文件格式暂时不支持");
+                    return RestResponse.fail(Judge.Upload.fileFormatNotSupport);
                 }
                 OssEntity entity = new OssEntity();
                 entity.setObjectName(fileName);
@@ -98,7 +100,7 @@ public class CommonController {
             return RestResponse.success(urls.values());
         }catch (Exception e){
             log.error("上传文件异常:{}",e);
-            return RestResponse.fail(Values.Upload.fileFail);
+            return RestResponse.fail(Judge.Upload.fileUploadFail);
         }
     }
 
@@ -112,7 +114,7 @@ public class CommonController {
         try {
             String fileName = handleFile(file);
             if(StrUtil.isEmpty(fileName)){
-                return RestResponse.fail("文件格式暂时不支持");
+                return RestResponse.fail(Judge.Upload.fileFormatNotSupport);
             }
 //            AliyunOSS aliyunOSS = systemConfiguration.build();
             String url = aliyunOSS.putObject(systemConfiguration.getBucketName(), fileName, file.getBytes());
@@ -120,7 +122,7 @@ public class CommonController {
             return RestResponse.success(url);
         }catch (Exception e){
             log.error("上传文件异常:{}",e);
-            return RestResponse.fail(Values.Upload.fileFail);
+            return RestResponse.fail(Judge.Upload.fileUploadFail);
         }
     }
 
@@ -130,23 +132,23 @@ public class CommonController {
      * @return
      */
     private String handleFile(MultipartFile file){
-        Judge.notTrue(null == file || file.isEmpty(),Values.Upload.missingFileData);
+        Judge.notTrue(null == file || file.isEmpty(),Judge.Upload.fileDataMissing);
         // 获取文件名，带后缀
         String originalFilename = file.getOriginalFilename();
         log.info("上传文件，原文件名：" + originalFilename);
         // 获取文件的后缀格式
         String fileSuffix = originalFilename.substring(originalFilename.lastIndexOf(".")).toLowerCase();
-        Judge.notNull(fileSuffix,"文件格式不合法");
-        if(StrUtil.equalsAny(fileSuffix,Values.Upload.pics)){
-            Judge.notTrue(file.getSize() > Values.Upload.maxSizePic,"文件大小不超过" + Values.Upload.maxSizePicDesc);
-        }else if(StrUtil.equalsAny(fileSuffix,Values.Upload.files)){
-            Judge.notTrue(file.getSize() > Values.Upload.maxSizeFile,"文件大小不超过" + Values.Upload.maxSizeFileDesc);
-        }else if(StrUtil.equalsAny(fileSuffix,Values.Upload.videos)){
-            Judge.notTrue(file.getSize() > Values.Upload.maxSizeVideo,"文件大小不超过" + Values.Upload.maxSizeVideoDesc);
+        Judge.notNull(fileSuffix,Judge.Upload.fileFormatIllegal);
+        if(StrUtil.equalsAny(fileSuffix,Judge.Upload.pics)){
+            Judge.notTrue(file.getSize() > Judge.Upload.maxSizePic,"文件大小不超过" + Judge.Upload.maxSizePicDesc);
+        }else if(StrUtil.equalsAny(fileSuffix,Judge.Upload.files)){
+            Judge.notTrue(file.getSize() > Judge.Upload.maxSizeFile,"文件大小不超过" + Judge.Upload.maxSizeFileDesc);
+        }else if(StrUtil.equalsAny(fileSuffix,Judge.Upload.videos)){
+            Judge.notTrue(file.getSize() > Judge.Upload.maxSizeVideo,"文件大小不超过" + Judge.Upload.maxSizeVideoDesc);
         }else{
             return null;
         }
-        String fileName = StrUtil.format("{}/{}{}",DateUtil.format(DateUtil.date(),"yyyy/MM/dd"),IdWorker.getIdStr(),fileSuffix);
+        String fileName = StrUtil.format("{}/{}{}",DateUtil.format(DateUtil.date(),DateInPath),IdWorker.getIdStr(),fileSuffix);
         log.info("上传文件，新文件名：" + fileName);
         return fileName;
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/common/Values.java

@@ -1,366 +0,0 @@
-package cn.com.ty.lift.business.common;
-
-/**
- * @author wcz
- * @Description: 定义系统的一些常量
- * @date 2019/12/31 9:18
- */
-public interface Values {
-
-    //======================年检相关状态值和判断方法======================================
-
-    interface Ai{
-        /**
-         * 年检未开始0
-         */
-        int STEP_NOT_START = 0;
-
-        /**
-         * 判断年检是否开始
-         * @param step
-         * @return
-         */
-        static boolean notStart(int step){
-            return STEP_NOT_START == step;
-        }
-        /**
-         * 年检 第一阶段
-         */
-        int STEP_ONE = 1;
-
-        /**
-         * 判断是否为年检阶段一
-         * @param step
-         * @return
-         */
-        static boolean stepOne(int step){
-            return STEP_ONE == step;
-        }
-        /**
-         * 年检 第二阶段
-         */
-        int STEP_TWO = 2;
-
-        /**
-         * 判断是否为年检阶段二
-         * @param step
-         * @return
-         */
-        static boolean stepTwo(int step){
-            return STEP_TWO == step;
-        }
-        /**
-         * 年检 第三阶段
-         */
-        int STEP_THREE = 3;
-
-        /**
-         * 判断是否为年检阶段三
-         * @param step
-         * @return
-         */
-        static boolean stepThree(int step){
-            return STEP_THREE == step;
-        }
-        /**
-         * 年检 第四阶段
-         */
-        int STEP_FOUR = 4;
-
-        /**
-         * 判断是否为年检阶段四
-         * @param step
-         * @return
-         */
-        static boolean stepFour(int step){
-            return STEP_FOUR == step;
-        }
-
-        /**
-         * 0 年检计划初始状态
-         */
-        int STATUS_NOT_START = 0;
-
-        static boolean statusNotStart(int status){
-            return STEP_NOT_START == status;
-        }
-        /**
-         * 1  维保工确认年检计划
-         */
-        int STATUS_CONFIRM = 1;
-        String confirm = "请确认年检计划";
-
-        static boolean statusConfirm(int status){
-            return STATUS_CONFIRM == status;
-        }
-        /**
-         * 2  维保工上传自检报告,选择自检时间 或者 文员设置 是否检查限速器和荷载年检设置，
-         *             文员也可以上传自检报告或者确认自检报告和自检时间，自检时间以最后设置的为准
-         */
-        int STATUS_SELFCHECK = 2;
-
-        String selfcheckUpload = "请完善自检报告信息";
-        String selfcheckDate = "请设置自检时间";
-        String selfcheckReportImg = "请设置自检报告";
-
-        static boolean statusSelfcheck(int status){
-            return STATUS_SELFCHECK == status;
-        }
-        /**
-         * 3  企业文员确认现场检验时间
-         *             录入人员信息，政府质检，企业质检，联系电话
-         */
-        int STATUS_CHECK_CONFIRM = 3;
-        String checkConfirm = "请确认检验结果";
-        String checkDate = "请设置现场检验时间";
-        String checkResultImg = "请设置现场检验结果";
-        String inspector = "请设置政府质检人员";
-        String operator = "请设置公司质检人员";
-        String telephone = "请设置人员联系电话";
-
-        static boolean statusCheckConfirm(int status){
-            return STATUS_CHECK_CONFIRM == status;
-        }
-        /**
-         * 4	维保工上传检验结果
-         */
-        int STATUS_CHECK_UPLOAD = 4;
-
-        static boolean statusCheckUpload(int status){
-            return STATUS_CHECK_UPLOAD == status;
-        }
-        /**
-         * 5	企业文员确认检验结果-合格 --> 不能算年检超期
-         */
-        int STATUS_CHECK_QUALIFIED = 5;
-
-        static boolean statusCheckQualified(int status){
-            return STATUS_CHECK_QUALIFIED == status;
-        }
-        /**
-         * 6	企业文员确认检验结果-整改 --> 回到第二阶段
-         */
-        int STATUS_CHECK_RECTIFICATION = 6;
-
-        static boolean statusCheckRectification(int status){
-            return STATUS_CHECK_RECTIFICATION == status;
-        }
-        /**
-         * 7	企业文员确认检验结果-不合格 --> 可以算年检超期
-         */
-        int STATUS_CHECK_UNQUALIFIED = 7;
-
-        static boolean statusCheckUnqualified(int status){
-            return STATUS_CHECK_UNQUALIFIED == status;
-        }
-        /**
-         * 8	维保工上传年检报告和合格证
-         */
-        int STATUS_CERTIFICATE_REPORT_UPLOAD = 8;
-        String certificateReportUpload = "请上传年检报告和合格证";
-        String certificateUpload = "请设置年检报告";
-        String reportUpload = "请设置合格证";
-
-        static boolean statusCertificateReportUpload(int status){
-            return STATUS_CERTIFICATE_REPORT_UPLOAD == status;
-        }
-        /**
-         * 9	企业文员确认年检报告和合格证-合格
-         */
-        int STATUS_CERTIFICATE_REPORT_QUALIFIED = 9;
-        String nextInspectionTime = "请设置下次年检时间";
-
-        static boolean statusCertificateReportQualified(int status){
-            return STATUS_CERTIFICATE_REPORT_QUALIFIED == status;
-        }
-        /**
-         * 10	企业文员确认年检报告和合格证-不合格 -->停用电梯
-         */
-        int STATUS_CERTIFICATE_REPORT_UNQUALIFIED = 10;
-
-        static boolean statusCertificateReportUnqualified(int status){
-            return STATUS_CERTIFICATE_REPORT_UNQUALIFIED == status;
-        }
-        String statusError = "年检状态有误";
-
-        /**
-         * 根据年检的状态值返回成年检的状态阶段
-         * @param stepStatus 年检状态值
-         * @return int
-         */
-        static int status2StepName(Integer stepStatus){
-            int stepName;
-            switch (stepStatus){
-                case STATUS_NOT_START:
-                    stepName = 0;
-                    break;
-                case STATUS_CONFIRM:
-                case STATUS_SELFCHECK:
-                    stepName = 1;
-                    break;
-                case STATUS_CHECK_CONFIRM:
-                    stepName = 2;
-                    break;
-                case STATUS_CHECK_UPLOAD:
-                case STATUS_CHECK_QUALIFIED:
-                case STATUS_CHECK_RECTIFICATION:
-                case STATUS_CHECK_UNQUALIFIED:
-                    stepName = 3;
-                    break;
-                case STATUS_CERTIFICATE_REPORT_UPLOAD:
-                case STATUS_CERTIFICATE_REPORT_QUALIFIED:
-                case STATUS_CERTIFICATE_REPORT_UNQUALIFIED:
-                    stepName = 4;
-                    break;
-                default:
-                    stepName = -1;
-                    break;
-            }
-            return stepName;
-        }
-
-
-        /**
-         * 判断年检状态是否处于其他阶段之间 min < middle < max
-         * @param middle
-         * @param min
-         * @param max
-         * @return
-         */
-        static boolean inStatus(int min, int middle,int max){
-            return min <= middle && middle <= max;
-        }
-
-        /**
-         * 判断两个年检状态是否一样 one == two
-         * @param one
-         * @param two
-         * @return
-         */
-        static boolean sameStatus(int one,int two){
-            return one == two;
-        }
-
-        /**
-         * 判断年检中一个状态是否为另一个状态的下一个状态
-         * @param front
-         * @param behind
-         * @return
-         */
-        static boolean nextStatus(int front,int behind){
-            return front + 1 == behind;
-        }
-
-        /**
-         * 判断年检中两个状态相同或者为下一个状态
-         * @param front
-         * @param behind
-         * @return
-         */
-        static boolean sameNext(int front,int behind){
-            return front == behind || front + 1 == behind;
-        }
-
-        //==============================================================================
-    }
-
-    interface Er{
-        //===================急修相关状态值和判断方法======================================
-        /**
-         * 急修状态（-1 暂停中）
-         */
-        int STATUS_STOPING = -1;
-
-        static boolean statusStoping(int status){
-            return STATUS_STOPING == status;
-        }
-        /**
-         * 急修状态（0 待修理）
-         */
-        int STATUS_TO_REPAIRED = 0;
-
-        static boolean statusToRepaired(int status){
-            return STATUS_TO_REPAIRED == status;
-        }
-        /**
-         * 急修状态（1 修理中）
-         */
-        int STATUS_REPAIRING = 1;
-
-        static boolean statusRepairing(int status){
-            return STATUS_REPAIRING == status;
-        }
-        /**
-         * 急修状态（2 完成）
-         */
-        int STATUS_FINISH = 2;
-
-        static boolean statusFinish(int status){
-            return STATUS_FINISH == status;
-        }
-        /**
-         * 急修状态（3 关闭）
-         */
-        int STATUS_CLOSE = 3;
-        static boolean statusClose(int status){
-            return STATUS_CLOSE == status;
-        }
-        String haveUnfinisedRepair = "该电梯存在未完成的急修，无法创建";
-        String repairHadTaked = "急修已经接单，不能转派";
-        String missingReason = "缺少原因描述";
-        String missingHandleDate = "缺少处理时间";
-        String missionPosition = "缺少地理位置信息";
-        String mustToRepair = "待急修才能操作";
-        String mustInRepairing = "急修中才能操作";
-        String safetyConfirm = "请完成安全确认";
-        String missingCost = "缺少收费项";
-        String missingFault = "缺少故障信息";
-        String missingSign = "请签名";
-        String mustFinish = "急修完成后才能操作";
-        String hadEvaluate = "急修已经评价了";
-        String missingImage = "缺少急修图片";
-        String missingScore = "请评价打分";
-        String incorrectAmount = "金额有误";
-
-        //==============================================================================
-    }
-
-    interface Upload{
-        //===================上传相关状态值和判断方法======================================
-        /**
-         * 图片上传最大大小10M * 1024 * 1024
-         */
-        long maxSizePic = 10 << 20;
-        String maxSizePicDesc = "10M";
-        /**
-         * 文件上传最大大小50M * 1024 * 1024
-         */
-        long maxSizeFile = 50 << 20;
-        String maxSizeFileDesc = "50M";
-        /**
-         * 视频上传最大大小100M * 1024 * 1024
-         */
-        long maxSizeVideo = 100 << 20;
-        String maxSizeVideoDesc = "100M";
-
-        /**
-         * 上传图片文件类型
-         */
-        String[] pics = {".jpg",".jpeg", ".png", ".bmp", ".gif"};
-        /**
-         * 上传其他文件类型
-         */
-        String[] files = {".pdf",".txt",".rar",".zip",".7z", ".xls", ".xlsx", ".doc",".docx",".ppt",".pptx"};
-        /**
-         * 上传视频文件类型
-         */
-        String[] videos = {".mov",".mp4", ".avi",".mpg",".mpeg",".rm",".rmvb",".wmv"};
-
-
-        String missingFileData = "没有文件数据";
-
-        String fileFail = "上传文件失败";
-        //==============================================================================
-    }
-
-}

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

@@ -2,7 +2,6 @@ package cn.com.ty.lift.business.emergency.controller;
 
 
 import cn.com.ty.lift.business.common.CountPage;
-import cn.com.ty.lift.business.common.Values;
 import cn.com.ty.lift.business.emergency.dto.LiftFaultCategory;
 import cn.com.ty.lift.business.emergency.dto.LiftFaultType;
 import cn.com.ty.lift.business.emergency.dto.RepairRequest;
@@ -129,12 +128,12 @@ public class EmergencyRepairController {
         Long mtCompanyId = entity.getMtCompanyId();
         Long liftId = entity.getLiftId();
         int repairing = emergencyRepairService.countRepairing(mtCompanyId,liftId);
-        Judge.nlt0(repairing,Values.Er.haveUnfinisedRepair);
+        Judge.nlt0(repairing,Judge.Repair.haveUnfinisedRepair);
 
         //派单时间 急修单创建时间
         entity.setHasEvaluate(0);
         entity.setAssignTime(LocalDateTime.now());
-        entity.setStatus(Values.Er.STATUS_TO_REPAIRED);
+        entity.setStatus(Judge.Repair.STATUS_TO_REPAIRED);
         boolean result = emergencyRepairService.save(entity);
         return RestResponse.success(result);
     }
@@ -191,7 +190,7 @@ public class EmergencyRepairController {
         Judge.notNull(entity);
 
         //如果已经接单，在急修中了不能被转派
-        Judge.notTrue(Values.Er.statusRepairing(entity.getStatus()),Values.Er.repairHadTaked);
+        Judge.notTrue(Judge.Repair.statusRepairing(entity.getStatus()),Judge.Repair.repairHadTaked);
         //本急修单的负责维保工
         entity.setWorkerId1(request.getWorkerId());
 
@@ -212,7 +211,7 @@ public class EmergencyRepairController {
 
         entity.setCloseReason(request.getCloseReason());
         //新状态（-1 暂停中，0 待修理；1 修理中；2 已完成 3 已关闭）
-        entity.setStatus(Values.Er.STATUS_CLOSE);
+        entity.setStatus(Judge.Repair.STATUS_CLOSE);
 
         boolean result = emergencyRepairService.saveOrUpdate(entity);
         return RestResponse.success(result);
@@ -242,10 +241,10 @@ public class EmergencyRepairController {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Judge.notNull(entity);
 
-        Judge.isTrue(Values.Er.statusToRepaired(entity.getStatus()),Values.Er.mustToRepair);
+        Judge.isTrue(Judge.Repair.statusToRepaired(entity.getStatus()),Judge.Repair.mustToRepair);
         entity.setTakingTime(request.getTakingTime());
         //todo:修改电梯的业务状态为急修中,如果存在维保中，要修改
-        entity.setStatus(Values.Er.STATUS_REPAIRING);
+        entity.setStatus(Judge.Repair.STATUS_REPAIRING);
 
         boolean result = emergencyRepairService.taking(entity);
         return RestResponse.success(result);
@@ -262,7 +261,7 @@ public class EmergencyRepairController {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Judge.notNull(entity);
 
-        Judge.isTrue(Values.Er.statusRepairing(entity.getStatus()), Values.Er.mustInRepairing);
+        Judge.isTrue(Judge.Repair.statusRepairing(entity.getStatus()), Judge.Repair.mustInRepairing);
         entity.setArriveTime(request.getArriveTime());
         entity.setPosition(request.getPosition());
 
@@ -281,7 +280,7 @@ public class EmergencyRepairController {
         EmergencyRepair entity = emergencyRepairService.getById(request.getId());
         Judge.notNull(entity);
 
-        Judge.isTrue(Values.Er.statusRepairing(entity.getStatus()),Values.Er.mustInRepairing);
+        Judge.isTrue(Judge.Repair.statusRepairing(entity.getStatus()),Judge.Repair.mustInRepairing);
         entity.setStopDate(request.getStopDate());
         entity.setSafetyConfirm(request.getSafetyConfirm());
 
@@ -327,10 +326,10 @@ public class EmergencyRepairController {
 
         BigDecimal costTotal = repair.getCostTotal();
         BigDecimal costMoney = erRecordCost.getCostMoney();
-        Judge.notNull(costTotal,Values.Er.incorrectAmount);
-        Judge.notNull(costMoney,Values.Er.incorrectAmount);
+        Judge.notNull(costTotal,Judge.Repair.incorrectAmount);
+        Judge.notNull(costMoney,Judge.Repair.incorrectAmount);
         //收费项的金额不能大于急修单的总金额
-        Judge.notTrue(costTotal.compareTo(costMoney) == -1,Values.Er.incorrectAmount);
+        Judge.notTrue(costTotal.compareTo(costMoney) == -1,Judge.Repair.incorrectAmount);
 
         repair.setCostTotal(costTotal.subtract(costMoney));
 
@@ -378,7 +377,7 @@ public class EmergencyRepairController {
     @Judger(fields = {"liftCategory"})
     public RestResponse faultTree(@RequestBody RepairRequest request) {
         List<LiftFault> liftFaultList = liftFaultService.listByLiftCategory(request.getLiftCategory());
-        Judge.notNull(liftFaultList,Values.Er.missingFault);
+        Judge.notNull(liftFaultList,Judge.Repair.missingFault);
         //根据故障列表组装tree
         //先按照faultCategory，groupby,再按照faultType，groupby
         Map<String, Map<String,List<LiftFault>>> categories = liftFaultList.stream().collect(Collectors.groupingBy(LiftFault::getFaultCategory, Collectors.groupingBy(LiftFault::getFaultType)));
@@ -406,8 +405,8 @@ public class EmergencyRepairController {
         EmergencyRepair repair = emergencyRepairService.getById(recordId);
         Judge.notNull(repair);
 
-        Judge.isTrue(Values.Er.statusFinish(repair.getStatus()),Values.Er.mustFinish);
-        Judge.notTrue(repair.getHasEvaluate() == 1,Values.Er.hadEvaluate);
+        Judge.isTrue(Judge.Repair.statusFinish(repair.getStatus()),Judge.Repair.mustFinish);
+        Judge.notTrue(repair.getHasEvaluate() == 1,Judge.Repair.hadEvaluate);
 
         //来源（1 维保；2 急修）
         entity.setSource(2);
@@ -435,7 +434,7 @@ public class EmergencyRepairController {
 
         EmergencyRepair entity = emergencyRepairService.getById(id);
         Judge.notNull(entity);
-        Judge.isTrue(Values.Er.statusRepairing(entity.getStatus()),Values.Er.mustInRepairing);
+        Judge.isTrue(Judge.Repair.statusRepairing(entity.getStatus()),Judge.Repair.mustInRepairing);
         List<ErRecordImg> erRecordImgs = new ArrayList<>();
         for (int i = 0; i < erRecordImg.size(); i++) {
             ErRecordImg item = new ErRecordImg();
@@ -454,7 +453,7 @@ public class EmergencyRepairController {
         entity.setFaultDuty(request.getFaultDuty());
         entity.setRecoveryDate(request.getRecoveryDate());
         //修改状态已完成
-        entity.setStatus(Values.Er.STATUS_FINISH);
+        entity.setStatus(Judge.Repair.STATUS_FINISH);
 
         boolean result = emergencyRepairService.repairOrder(entity,erRecordImgs);
         return RestResponse.success(result);

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

@@ -6,9 +6,11 @@ import lombok.Data;
 import java.util.List;
 
 /**
+ * <p>
+ *     故障类型
+ * </p>
  * @author wcz
- * @Description: 故障类型
- * @date 2020/1/2 15:12
+ * @since  2020/1/2 15:12
  */
 @Data
 @AllArgsConstructor

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

@@ -7,9 +7,11 @@ import lombok.Data;
 import java.util.List;
 
 /**
+ * <p>
+ *     故障分类
+ * </p>
  * @author wcz
- * @Description: 故障分类
- * @date 2020/1/2 15:14
+ * @since  2020/1/2 15:14
  */
 @Data
 @AllArgsConstructor

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

@@ -10,9 +10,11 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
+ * <p>
+ *     根据条件分页查询急修单，条件封装model
+ * </p>
  * @author wcz
- * @date 2019/12/5
- * @description 根据条件分页查询急修单，条件封装model
+ * @since  2019/12/5
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -82,14 +84,14 @@ public class RepairRequest extends BaseRequestModel{
     /**
      * 接单时间 app端维保工确认
      */
-    @Judger(message = "接单时间有误")
+    @Judger(message = "缺少接单时间")
     private LocalDateTime takingTime;
 
     /**
      *
      * 到达时间 app端维保工打卡
      */
-    @Judger(message = "到达时间有误")
+    @Judger(message = "缺少到达时间")
     private LocalDateTime arriveTime;
 
     /**
@@ -168,7 +170,7 @@ public class RepairRequest extends BaseRequestModel{
     /**
      * 恢复时间
      */
-    @Judger(message = "恢复时间有误")
+    @Judger(message = "缺少恢复时间")
     private LocalDateTime recoveryDate;
 
     /**
@@ -191,6 +193,6 @@ public class RepairRequest extends BaseRequestModel{
     /**
      * 急修图片地址
      */
-    @Judger(message = "急修图片有误")
+    @Judger(message = "缺少急修图片")
     private List<String> erRecordImg;
 }

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

@@ -14,9 +14,11 @@ import java.util.Collection;
 import java.util.List;
 
 /**
+ * <p>
+ *     急修请求返回结果
+ * </p>
  * @author wcz
- * @date 2019/12/6
- * @description
+ * @since  2019/12/6
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -1,6 +1,5 @@
 package cn.com.ty.lift.business.emergency.service;
 
-import cn.com.ty.lift.business.common.Values;
 import cn.com.ty.lift.business.emergency.dto.RepairRequest;
 import cn.com.ty.lift.business.emergency.dto.RepairResponse;
 import cn.com.ty.lift.business.emergency.entity.EmergencyRepair;
@@ -172,7 +171,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         LambdaQueryWrapper<EmergencyRepair> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompanyId);
         lambdaQueryWrapper.eq(EmergencyRepair::getLiftId, liftId);
-        lambdaQueryWrapper.in(EmergencyRepair::getStatus, Arrays.asList(Values.Er.STATUS_TO_REPAIRED, Values.Er.STATUS_REPAIRING));
+        lambdaQueryWrapper.in(EmergencyRepair::getStatus, Arrays.asList(Judge.Repair.STATUS_TO_REPAIRED, Judge.Repair.STATUS_REPAIRING));
         return count(lambdaQueryWrapper);
 
     }
@@ -192,11 +191,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return true;
         }
         //如果存在，不在急修中
-        if (!Values.Er.statusRepairing(emergencyRepair.getStatus())) {
+        if (!Judge.Repair.statusRepairing(emergencyRepair.getStatus())) {
             return true;
         }
         // 如果存在，并且急修中,急修改成暂停中
-        emergencyRepair.setStatus(Values.Er.STATUS_STOPING);
+        emergencyRepair.setStatus(Judge.Repair.STATUS_STOPING);
         boolean er = updateById(emergencyRepair);
         if (!er) {
             return false;
@@ -231,11 +230,11 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
             return true;
         }
         //如果急修单不在暂停中，直接返回true
-        if (!Values.Er.statusStoping(emergencyRepair.getStatus())) {
+        if (!Judge.Repair.statusStoping(emergencyRepair.getStatus())) {
             return true;
         }
         //恢复暂停中的急修为急修中
-        emergencyRepair.setStatus(Values.Er.STATUS_REPAIRING);
+        emergencyRepair.setStatus(Judge.Repair.STATUS_REPAIRING);
         boolean er = updateById(emergencyRepair);
         if (!er) {
             return false;

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/aspect/GlobalDefaultExceptionHandler.java

@@ -22,9 +22,11 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
+ * <p>
+ *     全局异常捕获处理
+ * </p>
  * @author wcz
- * @date 2019/12/10
- * @description 全局异常捕获处理
+ * @since  2019/12/10
  */
 @Slf4j
 @RestControllerAdvice
@@ -46,8 +48,9 @@ public class GlobalDefaultExceptionHandler {
         return StrUtil.isEmpty(message) ? RestResponse.failParam() : RestResponse.fail(message);
     }
 
+    //处理验证valid异常
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
-    public Object jsonErrorHandler(final MethodArgumentNotValidException e) {
+    public Object validHandler(final MethodArgumentNotValidException e) {
         // 获取验证框架的错误详情
         final FieldError error = e.getBindingResult().getFieldError();
         // 捕获错误message

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

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-business-service
   profiles:
-    active: dev
+    active: local
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/**/**Mapper.xml

lift-common/src/main/java/cn.com.ty.lift.common/utils/Judge.java

@@ -6,7 +6,7 @@ import java.lang.reflect.Field;
 
 /**
  * <p>
- *     条件判断，如果符合条件，返回异常
+ *     条件判断，如果不符合条件，抛出异常
  * </p>
  * @author wcz
  * @since  2020/1/9 8:46
@@ -22,11 +22,12 @@ public interface Judge {
     String MUST_NEQ0 = "数值必须不等于0";
     String DATA_MISSING_INCORRECT = "缺少数据或数据有误";
     String DATA_INVALID_CONDITIONS = "数据无效或条件不成立";
+    String PARAMETER_VERIFY_FAIL = "参数校验失败";
 
     /**
      * id == null || id <= 0 throw new JudgeException(message)
-     *
-     * @param id
+     * @param id id值
+     * @param message 抛出异常消息
      */
     static void id(Long id, String message) {
         notNull(id, message);
@@ -38,7 +39,7 @@ public interface Judge {
     /**
      * id == null || id <= 0 throw new JudgeException(IDENTIFIER_INVALID)
      *
-     * @param ids
+     * @param ids 不定个id值
      */
     static void id(Long... ids) {
         notNull(ids, IDENTIFIER_INVALID);
@@ -52,8 +53,8 @@ public interface Judge {
     /**
      * value == null || value <= 0 throw new JudgeException(message);
      *
-     * @param value
-     * @param message
+     * @param value 数值型的参数值
+     * @param message 抛出异常中的消息
      */
     static void gt0(Number value, String message) {
         if (null == value) {
@@ -76,7 +77,7 @@ public interface Judge {
     /**
      * value == null || value <= 0 throw new JudgeException(message);
      *
-     * @param values
+     * @param values 不定个数的数值型的值
      */
     static void gt0(Number... values) {
         notNull(values, MUST_GT0);
@@ -88,8 +89,8 @@ public interface Judge {
     /**
      * value == null || value >= 0 throw new JudgeException(message);
      *
-     * @param value
-     * @param message
+     * @param value 数值型的值
+     * @param message 抛出异常的消息值
      */
     static void lt0(Number value, String message) {
         if (null == value) {
@@ -112,7 +113,7 @@ public interface Judge {
     /**
      * value == null || value >= 0 throw new JudgeException(message);
      *
-     * @param values
+     * @param values 不定个的数值
      */
     static void lt0(Number... values) {
         notNull(values, MUST_LT0);
@@ -124,8 +125,8 @@ public interface Judge {
     /**
      * value == null || value != 0 throw new JudgeException(message);
      *
-     * @param value
-     * @param message
+     * @param value 数值型的值
+     * @param message 抛出异常的消息
      */
     static void eq0(Number value, String message) {
         if (null == value) {
@@ -145,6 +146,10 @@ public interface Judge {
         }
     }
 
+    /**
+     * value == null || value != 0 throw new JudgeException(message);
+     * @param values 不定个数的数值
+     */
     static void eq0(Number... values) {
         notNull(values, MUST_EQ0);
         for (Number value : values) {
@@ -155,8 +160,8 @@ public interface Judge {
     /**
      * value == null || value < 0 throw new JudgeException(message)
      *
-     * @param value
-     * @param message
+     * @param value 数值型的值
+     * @param message 抛出异常的消息
      */
     static void ngt0(Number value, String message) {
         if (null == value) {
@@ -179,7 +184,7 @@ public interface Judge {
     /**
      * value == null || value < 0 throw new JudgeException(message);
      *
-     * @param values
+     * @param values 不定个数的数值型的值
      */
     static void ngt0(Number... values) {
         notNull(values, MUST_NGT0);
@@ -191,8 +196,8 @@ public interface Judge {
     /**
      * value == null || value > 0 throw new JudgeException(message);
      *
-     * @param value
-     * @param message
+     * @param value 数值型的值
+     * @param message 抛出异常的消息
      */
     static void nlt0(Number value, String message) {
         if (null == value) {
@@ -215,7 +220,7 @@ public interface Judge {
     /**
      * value == null || value > 0 throw new JudgeException(message);
      *
-     * @param values
+     * @param values 不定个数的数值
      */
     static void nlt0(Number... values) {
         notNull(values, MUST_NLT0);
@@ -227,8 +232,8 @@ public interface Judge {
     /**
      * value == null || value == 0 throw new JudgeException(message);
      *
-     * @param value
-     * @param message
+     * @param value 数值型的值
+     * @param message 抛出异常的消息
      */
     static void neq0(Number value, String message) {
         if (null == value) {
@@ -251,7 +256,7 @@ public interface Judge {
     /**
      * value == null || value != 0 throw new JudgeException(message);
      *
-     * @param values
+     * @param values 不定个数的数值
      */
     static void neq0(Number... values) {
         notNull(values, MUST_NEQ0);
@@ -263,8 +268,8 @@ public interface Judge {
     /**
      * 判断对象object是否为空，如果不为空,直接抛出异常，返回message
      *
-     * @param object
-     * @param message
+     * @param object 参数值
+     * @param message 抛出异常的消息
      */
     static void isNull(Object object, String message) {
         if (ObjectUtil.isNotEmpty(object)) {
@@ -275,7 +280,7 @@ public interface Judge {
     /**
      * 判断对象object是否为空，如果不为空,直接抛出异常，返回默认消息
      *
-     * @param object
+     * @param object 参数值
      */
     static void isNull(Object object) {
         isNull(object, DATA_MISSING_INCORRECT);
@@ -284,8 +289,8 @@ public interface Judge {
     /**
      * 判断对象object是否为空，如果为真,直接抛出异常，返回message
      *
-     * @param object
-     * @param message
+     * @param object 参数值
+     * @param message 抛出异常的消息
      */
     static void notNull(Object object, String message) {
         if (ObjectUtil.isEmpty(object)) {
@@ -296,7 +301,7 @@ public interface Judge {
     /**
      * 判断对象object是否为空，如果为真,直接抛出异常，返回默认消息
      *
-     * @param object
+     * @param object 参数值
      */
     static void notNull(Object object) {
         notNull(object, DATA_MISSING_INCORRECT);
@@ -305,8 +310,8 @@ public interface Judge {
     /**
      * 判断表达式是否为真，如果为假，直接抛出异常，返回message
      *
-     * @param expression
-     * @param message
+     * @param expression 需要判断的布尔表达式
+     * @param message 抛出异常的消息
      */
     static void isTrue(boolean expression, String message) {
         if (!expression) {
@@ -317,7 +322,7 @@ public interface Judge {
     /**
      * 判断表达式是否为真，如果为假，直接抛出异常，返回
      *
-     * @param expression
+     * @param expression 需要判断的布尔表达式
      */
     static void isTrue(boolean expression) {
         isTrue(expression, DATA_INVALID_CONDITIONS);
@@ -326,8 +331,8 @@ public interface Judge {
     /**
      * 判断表达式是否为真，如果为真，直接抛出异常，返回message
      *
-     * @param expression
-     * @param message
+     * @param expression 需要判断的布尔表达式
+     * @param message 抛出异常的消息
      */
     static void notTrue(boolean expression, String message) {
         if (expression) {
@@ -338,7 +343,7 @@ public interface Judge {
     /**
      * 判断表达式是否为真，如果为真，直接抛出异常，返回
      *
-     * @param expression
+     * @param expression 需要判断的布尔表达式
      */
     static void notTrue(boolean expression) {
         notTrue(expression, DATA_INVALID_CONDITIONS);
@@ -372,7 +377,407 @@ public interface Judge {
                 }
             }
         } catch (Exception e) {
-            throw new JudgeException(e.getMessage());
+            throw new JudgeException(PARAMETER_VERIFY_FAIL);
+        }
+    }
+
+    //======================年检相关状态值和判断方法======================================
+
+    interface Inspection{
+        /**
+         * 年检未开始0
+         */
+        int STEP_NOT_START = 0;
+
+        /**
+         * 判断年检是否开始
+         * @param step
+         * @return
+         */
+        static boolean notStart(int step){
+            return STEP_NOT_START == step;
+        }
+        /**
+         * 年检 第一阶段
+         */
+        int STEP_ONE = 1;
+
+        /**
+         * 判断是否为年检阶段一
+         * @param step
+         * @return
+         */
+        static boolean stepOne(int step){
+            return STEP_ONE == step;
+        }
+        /**
+         * 年检 第二阶段
+         */
+        int STEP_TWO = 2;
+
+        /**
+         * 判断是否为年检阶段二
+         * @param step
+         * @return
+         */
+        static boolean stepTwo(int step){
+            return STEP_TWO == step;
+        }
+        /**
+         * 年检 第三阶段
+         */
+        int STEP_THREE = 3;
+
+        /**
+         * 判断是否为年检阶段三
+         * @param step
+         * @return
+         */
+        static boolean stepThree(int step){
+            return STEP_THREE == step;
+        }
+        /**
+         * 年检 第四阶段
+         */
+        int STEP_FOUR = 4;
+
+        /**
+         * 判断是否为年检阶段四
+         * @param step
+         * @return
+         */
+        static boolean stepFour(int step){
+            return STEP_FOUR == step;
+        }
+
+        /**
+         * 0 年检计划初始状态
+         */
+        int STATUS_NOT_START = 0;
+
+        static boolean statusNotStart(int status){
+            return STEP_NOT_START == status;
+        }
+        /**
+         * 1  维保工确认年检计划
+         */
+        int STATUS_CONFIRM = 1;
+        String confirm = "请确认年检计划";
+
+        static boolean statusConfirm(int status){
+            return STATUS_CONFIRM == status;
+        }
+        /**
+         * 2  维保工上传自检报告,选择自检时间 或者 文员设置 是否检查限速器和荷载年检设置，
+         *             文员也可以上传自检报告或者确认自检报告和自检时间，自检时间以最后设置的为准
+         */
+        int STATUS_SELFCHECK = 2;
+
+        String selfcheckUpload = "请完善自检报告信息";
+        String selfcheckDate = "请设置自检时间";
+        String selfcheckReportImg = "请设置自检报告";
+
+        static boolean statusSelfcheck(int status){
+            return STATUS_SELFCHECK == status;
+        }
+        /**
+         * 3  企业文员确认现场检验时间
+         *             录入人员信息，政府质检，企业质检，联系电话
+         */
+        int STATUS_CHECK_CONFIRM = 3;
+        String checkConfirm = "请确认检验结果";
+        String checkDate = "请设置现场检验时间";
+        String checkResultImg = "请设置现场检验结果";
+        String inspector = "请设置政府质检人员";
+        String operator = "请设置公司质检人员";
+        String telephone = "请设置人员联系电话";
+
+        static boolean statusCheckConfirm(int status){
+            return STATUS_CHECK_CONFIRM == status;
+        }
+        /**
+         * 4	维保工上传检验结果
+         */
+        int STATUS_CHECK_UPLOAD = 4;
+
+        static boolean statusCheckUpload(int status){
+            return STATUS_CHECK_UPLOAD == status;
+        }
+        /**
+         * 5	企业文员确认检验结果-合格 --> 不能算年检超期
+         */
+        int STATUS_CHECK_QUALIFIED = 5;
+
+        static boolean statusCheckQualified(int status){
+            return STATUS_CHECK_QUALIFIED == status;
+        }
+        /**
+         * 6	企业文员确认检验结果-整改 --> 回到第二阶段
+         */
+        int STATUS_CHECK_RECTIFICATION = 6;
+
+        static boolean statusCheckRectification(int status){
+            return STATUS_CHECK_RECTIFICATION == status;
+        }
+        /**
+         * 7	企业文员确认检验结果-不合格 --> 可以算年检超期
+         */
+        int STATUS_CHECK_UNQUALIFIED = 7;
+
+        static boolean statusCheckUnqualified(int status){
+            return STATUS_CHECK_UNQUALIFIED == status;
+        }
+        /**
+         * 8	维保工上传年检报告和合格证
+         */
+        int STATUS_CERTIFICATE_REPORT_UPLOAD = 8;
+        String certificateReportUpload = "请上传年检报告和合格证";
+        String certificateUpload = "请设置年检报告";
+        String reportUpload = "请设置合格证";
+
+        static boolean statusCertificateReportUpload(int status){
+            return STATUS_CERTIFICATE_REPORT_UPLOAD == status;
+        }
+        /**
+         * 9	企业文员确认年检报告和合格证-合格
+         */
+        int STATUS_CERTIFICATE_REPORT_QUALIFIED = 9;
+        String nextInspectionTime = "请设置下次年检时间";
+
+        static boolean statusCertificateReportQualified(int status){
+            return STATUS_CERTIFICATE_REPORT_QUALIFIED == status;
+        }
+        /**
+         * 10	企业文员确认年检报告和合格证-不合格 -->停用电梯
+         */
+        int STATUS_CERTIFICATE_REPORT_UNQUALIFIED = 10;
+
+        static boolean statusCertificateReportUnqualified(int status){
+            return STATUS_CERTIFICATE_REPORT_UNQUALIFIED == status;
+        }
+        String statusError = "年检状态有误";
+
+        /**
+         * 根据年检的状态值返回成年检的状态阶段
+         * @param stepStatus 年检状态值
+         * @return int
+         */
+        static int status2StepName(Integer stepStatus){
+            int stepName;
+            switch (stepStatus){
+                case STATUS_NOT_START:
+                    stepName = 0;
+                    break;
+                case STATUS_CONFIRM:
+                case STATUS_SELFCHECK:
+                    stepName = 1;
+                    break;
+                case STATUS_CHECK_CONFIRM:
+                    stepName = 2;
+                    break;
+                case STATUS_CHECK_UPLOAD:
+                case STATUS_CHECK_QUALIFIED:
+                case STATUS_CHECK_RECTIFICATION:
+                case STATUS_CHECK_UNQUALIFIED:
+                    stepName = 3;
+                    break;
+                case STATUS_CERTIFICATE_REPORT_UPLOAD:
+                case STATUS_CERTIFICATE_REPORT_QUALIFIED:
+                case STATUS_CERTIFICATE_REPORT_UNQUALIFIED:
+                    stepName = 4;
+                    break;
+                default:
+                    stepName = -1;
+                    break;
+            }
+            return stepName;
+        }
+
+
+        /**
+         * 判断年检状态是否处于其他阶段之间 min < middle < max
+         * @param middle
+         * @param min
+         * @param max
+         * @return
+         */
+        static boolean inStatus(int min, int middle,int max){
+            return min <= middle && middle <= max;
         }
+
+        /**
+         * 判断两个年检状态是否一样 one == two
+         * @param one
+         * @param two
+         * @return
+         */
+        static boolean sameStatus(int one,int two){
+            return one == two;
+        }
+
+        /**
+         * 判断年检中一个状态是否为另一个状态的下一个状态
+         * @param front
+         * @param behind
+         * @return
+         */
+        static boolean nextStatus(int front,int behind){
+            return front + 1 == behind;
+        }
+
+        /**
+         * 判断年检中两个状态相同或者为下一个状态
+         * @param front
+         * @param behind
+         * @return
+         */
+        static boolean sameNext(int front,int behind){
+            return front == behind || front + 1 == behind;
+        }
+
+        //==============================================================================
+    }
+
+    interface Repair{
+        //===================急修相关状态值和判断方法======================================
+        /**
+         * 急修状态（-1 暂停中）
+         */
+        int STATUS_STOPING = -1;
+
+        static boolean statusStoping(int status){
+            return STATUS_STOPING == status;
+        }
+        /**
+         * 急修状态（0 待修理）
+         */
+        int STATUS_TO_REPAIRED = 0;
+
+        static boolean statusToRepaired(int status){
+            return STATUS_TO_REPAIRED == status;
+        }
+        /**
+         * 急修状态（1 修理中）
+         */
+        int STATUS_REPAIRING = 1;
+
+        static boolean statusRepairing(int status){
+            return STATUS_REPAIRING == status;
+        }
+        /**
+         * 急修状态（2 完成）
+         */
+        int STATUS_FINISH = 2;
+
+        static boolean statusFinish(int status){
+            return STATUS_FINISH == status;
+        }
+        /**
+         * 急修状态（3 关闭）
+         */
+        int STATUS_CLOSE = 3;
+        static boolean statusClose(int status){
+            return STATUS_CLOSE == status;
+        }
+        String haveUnfinisedRepair = "该电梯存在未完成的急修，无法创建";
+        String repairHadTaked = "急修已经接单，不能转派";
+        String mustToRepair = "待急修才能操作";
+        String mustInRepairing = "急修中才能操作";
+        String missingFault = "缺少故障信息";
+        String mustFinish = "急修完成后才能操作";
+        String hadEvaluate = "急修已经评价了";
+        String incorrectAmount = "金额有误";
+
+        //==============================================================================
+    }
+
+    interface Upload{
+        //===================上传相关状态值和判断方法======================================
+        /**
+         * 图片上传最大大小10M * 1024 * 1024
+         */
+        long maxSizePic = 10 << 20;
+        String maxSizePicDesc = "10M";
+        /**
+         * 文件上传最大大小50M * 1024 * 1024
+         */
+        long maxSizeFile = 50 << 20;
+        String maxSizeFileDesc = "50M";
+        /**
+         * 视频上传最大大小100M * 1024 * 1024
+         */
+        long maxSizeVideo = 100 << 20;
+        String maxSizeVideoDesc = "100M";
+
+        /**
+         * 上传图片文件类型
+         */
+        String[] pics = {".jpg",".jpeg", ".png", ".bmp", ".gif"};
+        /**
+         * 上传其他文件类型
+         */
+        String[] files = {".pdf",".txt",".rar",".zip",".7z", ".xls", ".xlsx", ".doc",".docx",".ppt",".pptx"};
+        /**
+         * 上传视频文件类型
+         */
+        String[] videos = {".mov",".mp4", ".avi",".mpg",".mpeg",".rm",".rmvb",".wmv"};
+
+
+        String fileDataMissing = "没有文件数据";
+        String fileUploadFail = "上传文件失败";
+        String fileFormatNotSupport = "文件格式暂时不支持";
+        String fileFormatIllegal = "文件格式不合法";
+        //==============================================================================
+    }
+
+    /**
+     * 操作证相关常量
+     */
+    interface LiftCert{
+        //0：无证，1：待审核，2：审核未通过，3：审核通过，4：超期
+        int Status_Unlicense = 0;
+        int Status_ToAudit = 1;
+        int Status_AuditFail = 2;
+        int Status_AuditPass = 3;
+        int Status_Overdue = 4;
+
+        String MustToAudit = "待审核才能操作";
+        String CertHadExist = "操作证已存在";
+        String CertNotExist = "操作证不存在";
+
+        static boolean unlicense(int status){
+            return status == Status_Unlicense;
+        }
+        static boolean toAudit(int status){
+            return status == Status_ToAudit;
+        }
+        static boolean auditFail(int status){
+            return status == Status_AuditFail;
+        }
+        static boolean auditPass(int status){
+            return status == Status_AuditPass;
+        }
+        static boolean overdue(int status){
+            return status == Status_Overdue;
+        }
+    }
+
+    /**
+     * 签到相关常量
+     */
+    interface Attend{
+        String SetAmTime = "请设置上午的上/下班时间";
+        String SetPmTime = "请设置下午的上/下班时间";
+        String SetOtTime = "请设置加班的上/下班时间";
+        String InvalidAmTime = "上午的上/下班时间有误";
+        String InvalidPmTime = "下午的上/下班时间有误";
+        String InvalidOtTime = "加班的上/下班时间有误";
+        String AmTopClock = "上午上班打卡";
+        String AmDownClock = "上午下班打卡";
+        String PmTopClock = "下午上班打卡";
+        String PmDownClock = "下午下班打卡";
+        String OtTopClock = "加班上班打卡";
+        String OtDownClock = "加班下班打卡";
+        String hadClock = "打卡记录已存在";
     }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/GlobalDefaultExceptionHandler.java

@@ -35,6 +35,7 @@ public class GlobalDefaultExceptionHandler {
     private static final String status = head + "STATUS       : {}";
     private static final String exception = head + "EXCEPTION    : ";
 
+    //处理judge抛出的异常
     @ExceptionHandler(value = JudgeException.class)
     public Object judgeHandler(final JudgeException e) {
         // 捕获错误message
@@ -42,8 +43,9 @@ public class GlobalDefaultExceptionHandler {
         return StrUtil.isEmpty(message) ? RestResponse.failParam() : RestResponse.fail(message);
     }
 
+    //全局异常捕获处理
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
-    public Object jsonErrorHandler(final MethodArgumentNotValidException e) {
+    public Object validHandler(final MethodArgumentNotValidException e) {
         // 获取验证框架的错误详情
         final FieldError error = e.getBindingResult().getFieldError();
         // 捕获错误message

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/Values.java

@@ -1,67 +0,0 @@
-package cn.com.ty.lift.enterprise.common;
-
-/**
- * @author wcz
- * @Description: oa常量
- * @date 2020/1/14 22:44
- */
-public interface Values {
-
-    /**
-     * 操作证相关常量
-     */
-    interface Lc{
-        //0：无证，1：待审核，2：审核未通过，3：审核通过，4：超期
-        int Status_Unlicense = 0;
-        int Status_ToAudit = 1;
-        int Status_AuditFail = 2;
-        int Status_AuditPass = 3;
-        int Status_Overdue = 4;
-
-        String MissingOwner = "缺少操作证拥有者";
-        String MissingMtCompanty = "缺少维保公司";
-        String MustToAudit = "待审核才能操作";
-        String UploadCertImage = "请上传操作证图片";
-        String MissingCertCode = "缺少操作证号";
-        String MissingCertExpirationDate = "缺少操作证有效期";
-        String MissingCertIssuanceAgency = "缺少发证单位";
-        String MissingCertType = "缺少证件类型";
-        String CertHadExist = "操作证已存在";
-        String CertNotExist = "操作证不存在";
-
-        static boolean unlicense(int status){
-            return status == Status_Unlicense;
-        }
-        static boolean toAudit(int status){
-            return status == Status_ToAudit;
-        }
-        static boolean auditFail(int status){
-            return status == Status_AuditFail;
-        }
-        static boolean auditPass(int status){
-            return status == Status_AuditPass;
-        }
-        static boolean overdue(int status){
-            return status == Status_Overdue;
-        }
-    }
-
-    /**
-     * 签到相关常量
-     */
-    interface At{
-        String SetAmTime = "请设置上午的上/下班时间";
-        String SetPmTime = "请设置下午的上/下班时间";
-        String SetOtTime = "请设置加班的上/下班时间";
-        String InvalidAmTime = "上午的上/下班时间有误";
-        String InvalidPmTime = "下午的上/下班时间有误";
-        String InvalidOtTime = "加班的上/下班时间有误";
-        String AmTopClock = "上午上班打卡";
-        String AmDownClock = "上午下班打卡";
-        String PmTopClock = "下午上班打卡";
-        String PmDownClock = "下午下班打卡";
-        String OtTopClock = "加班上班打卡";
-        String OtDownClock = "加班下班打卡";
-        String hadClock = "打卡记录已存在";
-    }
-}

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

@@ -3,7 +3,6 @@ package cn.com.ty.lift.enterprise.oa.controller;
 import cn.com.ty.lift.common.utils.Judge;
 import cn.com.ty.lift.common.utils.Judger;
 import cn.com.ty.lift.enterprise.common.CountPage;
-import cn.com.ty.lift.enterprise.common.Values;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceRequest;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceResponse;
 import cn.com.ty.lift.enterprise.oa.entity.Attendance;
@@ -81,18 +80,18 @@ public class AttendanceController {
     public RestResponse setupTime(@RequestBody AttendanceRequest request) {
         LocalTime topTime = request.getTopTime();
         LocalTime downTime = request.getDownTime();
-        Judge.notTrue(ObjectUtil.hasEmpty(topTime, downTime), Values.At.SetAmTime);
-        Judge.notTrue(topTime.isAfter(downTime), Values.At.InvalidAmTime);
+        Judge.notTrue(ObjectUtil.hasEmpty(topTime, downTime), Judge.Attend.SetAmTime);
+        Judge.notTrue(topTime.isAfter(downTime), Judge.Attend.InvalidAmTime);
 
         LocalTime topTimePm = request.getTopTimePm();
         LocalTime downTimePm = request.getDownTimePm();
-        Judge.notTrue(ObjectUtil.hasEmpty(topTimePm, downTimePm), Values.At.SetPmTime);
-        Judge.notTrue(topTimePm.isAfter(downTimePm), Values.At.InvalidPmTime);
+        Judge.notTrue(ObjectUtil.hasEmpty(topTimePm, downTimePm), Judge.Attend.SetPmTime);
+        Judge.notTrue(topTimePm.isAfter(downTimePm), Judge.Attend.InvalidPmTime);
 
         LocalTime topTimeOt = request.getTopTimeOt();
         LocalTime downTimeOt = request.getDownTimeOt();
-        Judge.notTrue(ObjectUtil.hasEmpty(topTimeOt, downTimeOt), Values.At.SetOtTime);
-        Judge.notTrue(topTimeOt.isAfter(downTimeOt), Values.At.InvalidOtTime);
+        Judge.notTrue(ObjectUtil.hasEmpty(topTimeOt, downTimeOt), Judge.Attend.SetOtTime);
+        Judge.notTrue(topTimeOt.isAfter(downTimeOt), Judge.Attend.InvalidOtTime);
 
         MaintenanceCompany entity = maintenanceCompanyService.getById(request.getMtCompanyId());
         Judge.notNull(entity);
@@ -124,7 +123,7 @@ public class AttendanceController {
         Integer type = entity.getType();
         //先统计当天是否有对应的打卡记录
         int count = attendanceService.countByUserAndType(mtCompanyId,userId,type);
-        Judge.lt0(count,Values.At.hadClock);
+        Judge.lt0(count,Judge.Attend.hadClock);
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyId);
         Judge.notNull(maintenanceCompany);
 
@@ -133,41 +132,41 @@ public class AttendanceController {
         switch (type) {
             case 11:
                 LocalTime topTime = maintenanceCompany.getTopTime();
-                Judge.notNull(topTime, Values.At.SetAmTime);
+                Judge.notNull(topTime, Judge.Attend.SetAmTime);
                 //打卡时间比上班时间早-正常，否则迟到
                 entity.setStatus(now.isBefore(topTime) ? 0 : 1);
-                entity.setRemarks(Values.At.AmTopClock);
+                entity.setRemarks(Judge.Attend.AmTopClock);
                 break;
             case 12:
                 LocalTime downTime = maintenanceCompany.getDownTime();
-                Judge.notNull(downTime, Values.At.SetAmTime);
+                Judge.notNull(downTime, Judge.Attend.SetAmTime);
                 //打卡时间比下班时间晚-正常，否则早退
                 entity.setStatus(now.isAfter(downTime) ? 0 : 1);
-                entity.setRemarks(Values.At.AmDownClock);
+                entity.setRemarks(Judge.Attend.AmDownClock);
                 break;
             case 21:
                 LocalTime topTimePm = maintenanceCompany.getTopTimePm();
-                Judge.notNull(topTimePm, Values.At.SetPmTime);
+                Judge.notNull(topTimePm, Judge.Attend.SetPmTime);
                 entity.setStatus(now.isBefore(topTimePm) ? 0 : 1);
-                entity.setRemarks(Values.At.PmTopClock);
+                entity.setRemarks(Judge.Attend.PmTopClock);
                 break;
             case 22:
                 LocalTime downTimePm = maintenanceCompany.getDownTimePm();
-                Judge.notNull(downTimePm, Values.At.SetPmTime);
+                Judge.notNull(downTimePm, Judge.Attend.SetPmTime);
                 entity.setStatus(now.isAfter(downTimePm) ? 0 : 1);
-                entity.setRemarks(Values.At.PmDownClock);
+                entity.setRemarks(Judge.Attend.PmDownClock);
                 break;
             case 31:
                 LocalTime topTimeOt = maintenanceCompany.getTopTimeOt();
-                Judge.notNull(topTimeOt, Values.At.SetOtTime);
+                Judge.notNull(topTimeOt, Judge.Attend.SetOtTime);
                 entity.setStatus(now.isBefore(topTimeOt) ? 0 : 1);
-                entity.setRemarks(Values.At.OtTopClock);
+                entity.setRemarks(Judge.Attend.OtTopClock);
                 break;
             case 32:
                 LocalTime downTimeOt = maintenanceCompany.getDownTimeOt();
-                Judge.notNull(downTimeOt, Values.At.SetOtTime);
+                Judge.notNull(downTimeOt, Judge.Attend.SetOtTime);
                 entity.setStatus(now.isAfter(downTimeOt) ? 0 : 1);
-                entity.setRemarks(Values.At.OtDownClock);
+                entity.setRemarks(Judge.Attend.OtDownClock);
                 break;
             default:
                 return RestResponse.failParam();

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/LiftCertificateController.java

@@ -3,7 +3,6 @@ package cn.com.ty.lift.enterprise.oa.controller;
 import cn.com.ty.lift.common.utils.Judge;
 import cn.com.ty.lift.common.utils.Judger;
 import cn.com.ty.lift.enterprise.common.CountPage;
-import cn.com.ty.lift.enterprise.common.Values;
 import cn.com.ty.lift.enterprise.oa.dto.LiftCertificateRequest;
 import cn.com.ty.lift.enterprise.oa.dto.LiftCertificateResponse;
 import cn.com.ty.lift.enterprise.oa.entity.LiftCertificate;
@@ -74,7 +73,7 @@ public class LiftCertificateController {
         Long mtCompanyId = entity.getMtCompanyId();
         Judge.id(id);
         LiftCertificate certificate = liftCertificateService.findByUserAndMtCompany(id, ownerId, mtCompanyId);
-        Judge.notNull(certificate,Values.Lc.CertNotExist);
+        Judge.notNull(certificate,Judge.LiftCert.CertNotExist);
         boolean result = liftCertificateService.updateById(entity);
         return RestResponse.success(result);
     }
@@ -90,8 +89,8 @@ public class LiftCertificateController {
         //0：无证，1：待审核，2：审核未通过，3：审核通过，4：超期
         LiftCertificate liftCertificate = liftCertificateService.getById(request.getId());
         Judge.notNull(liftCertificate);
-        Judge.isTrue(Values.Lc.toAudit(liftCertificate.getStatus()), Values.Lc.MustToAudit);
-        int status = request.isPass() ? Values.Lc.Status_AuditPass : Values.Lc.Status_AuditFail;
+        Judge.isTrue(Judge.LiftCert.toAudit(liftCertificate.getStatus()), Judge.LiftCert.MustToAudit);
+        int status = request.isPass() ? Judge.LiftCert.Status_AuditPass : Judge.LiftCert.Status_AuditFail;
         liftCertificate.setStatus(status);
         boolean result = liftCertificateService.saveOrUpdate(liftCertificate);
         return RestResponse.success(result);
@@ -108,9 +107,9 @@ public class LiftCertificateController {
         Long mtCompanyId = entity.getMtCompanyId();
 
         int count = liftCertificateService.countByUserAndMtCompany(ownerId, mtCompanyId);
-        Judge.lt0(count, Values.Lc.CertHadExist);
+        Judge.lt0(count, Judge.LiftCert.CertHadExist);
 
-        entity.setStatus(Values.Lc.Status_ToAudit);
+        entity.setStatus(Judge.LiftCert.Status_ToAudit);
 
         boolean result = liftCertificateService.saveOrUpdate(entity);
         return RestResponse.success(result);

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

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