ソースを参照

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

wucizhong 5 年 前
コミット
306f66278e
14 ファイル変更438 行追加371 行削除
  1. 56 126
      lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java
  2. 3 9
      lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonController.java
  3. 110 0
      lift-business-service/src/main/java/cn/com/ty/lift/business/common/Judge.java
  4. 1 1
      lift-business-service/src/main/java/cn/com/ty/lift/business/common/PinYinUtils.java
  5. 1 1
      lift-business-service/src/main/java/cn/com/ty/lift/business/common/Values.java
  6. 64 127
      lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java
  7. 17 0
      lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/EmergencyRepairService.java
  8. 7 0
      lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/service/EvaluationService.java
  9. 8 0
      lift-business-service/src/main/java/cn/com/ty/lift/business/framework/aspect/GlobalDefaultExceptionHandler.java
  10. 8 0
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/GlobalDefaultExceptionHandler.java
  11. 110 0
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/Judge.java
  12. 7 15
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AnnouncementController.java
  13. 32 65
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java
  14. 14 27
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/LiftCertificateController.java

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

@@ -6,12 +6,11 @@ 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.Judge;
 import cn.com.ty.lift.business.common.Values;
 import cn.com.ty.lift.business.framework.conf.SystemConfiguration;
-import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.common.utils.AliyunOSSUtil;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
@@ -46,8 +45,6 @@ public class AnnualInspectionController {
 
     private AliyunOSSUtil aliyunOSSUtil;
 
-    private PlatformCompanyLiftRelevanceService platformCompanyLiftRelevanceService;
-
     /**
      * @description 根据id查询
      * @date 2019/12/10 10:19
@@ -57,12 +54,9 @@ public class AnnualInspectionController {
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody InspectionRequest request){
         Long id = request.getId();
-        if(null == id || id <= 0){
-            return RestResponse.failParam();
-        }
-
+        Judge.id(id);
         InspectionResponse entity = annualInspectionService.selectByIdWithInfo(request);
-        return ObjectUtil.isNull(entity) ? RestResponse.fail() : RestResponse.success(entity);
+        return Judge.result(entity);
     }
 
     /**
@@ -73,18 +67,13 @@ public class AnnualInspectionController {
      */
     @PostMapping("page")
     public RestResponse page(@RequestBody InspectionRequest request){
-        if(null == request){
-            return RestResponse.failParam();
-        }
         String info = request.getInfo();
         if(StrUtil.isNotBlank(info)){
             request.setInfo(StrUtil.format("%{}%",info));
         }
 
         IPage<InspectionResponse> pages = annualInspectionService.pageByCondition(request);
-        if(null == pages){
-            return RestResponse.fail();
-        }
+        Judge.notNull(pages);
         long count = annualInspectionService.countByCondition(request);
         CountPage<InspectionResponse> countPage = new CountPage<>(count, pages);
         return RestResponse.success(countPage);
@@ -98,11 +87,10 @@ public class AnnualInspectionController {
      */
     @PostMapping("pageWorker")
     public RestResponse pageWorker(@RequestBody InspectionRequest request){
-        if(request.getWorkerId() == null || request.getWorkerId() <= 0){
-            return RestResponse.failParam();
-        }
+        Long workerId = request.getWorkerId();
+        Judge.id(workerId);
         IPage<InspectionResponse> pages = annualInspectionService.pageByCondition(request);
-        return null != pages ? RestResponse.success(pages) : RestResponse.fail();
+        return Judge.result(pages);
     }
     /**
      * @description 修改年检信息
@@ -134,35 +122,23 @@ public class AnnualInspectionController {
      */
     @PostMapping("modify")
     public RestResponse modify(@RequestBody AnnualInspection entity){
-        if(null == entity){
-            return RestResponse.failParam();
-        }
-
         Long id = entity.getId();
-        if(null == id || id <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         AnnualInspection old = annualInspectionService.getById(id);
-        if(null == old){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(old);
         //旧状态
         Integer oldStepStatus = old.getStepStatus();
         //新状态
         Integer stepStatus = entity.getStepStatus();
 
         //0 --> 1 维保工确认年检计划
-        if(Values.aiStatusNotStart(oldStepStatus) && !Values.aiSameNext(oldStepStatus,stepStatus)){
-            return RestResponse.fail("请执行[确认年检计划]操作");
-        }
+        Judge.notTrue(Values.aiStatusNotStart(oldStepStatus) && !Values.aiSameNext(oldStepStatus,stepStatus),"请执行[确认年检计划]操作");
         /**
          * 1 --> 2
          * 2  维保工上传自检报告,选择自检时间 或者 文员设置 是否检查限速器和荷载年检设置,
          *             文员也可以上传自检报告或者确认自检报告和自检时间,自检时间以最后设置的为准
          */
-        if(Values.aiStatusComfirm(oldStepStatus) && !Values.aiNextStatus(oldStepStatus,stepStatus)){
-            return RestResponse.fail("请执行[上传自检报告]操作");
-        }
+        Judge.notTrue(Values.aiStatusComfirm(oldStepStatus) && !Values.aiNextStatus(oldStepStatus,stepStatus),"请执行[上传自检报告]操作");
         /**
          * 2  维保工上传自检报告,选择自检时间 或者 文员设置 是否检查限速器和荷载年检设置,
          *             文员也可以上传自检报告或者确认自检报告和自检时间,自检时间以最后设置的为准
@@ -170,71 +146,51 @@ public class AnnualInspectionController {
         if(Values.aiStatusSelfcheck(oldStepStatus)){
             // 修改自检信息
             if(Values.aiSameStatus(oldStepStatus,stepStatus)){
-                if(StrUtil.isEmpty(entity.getSelfcheckReportImg())){
-                    return RestResponse.fail("请执行[上传自检报告]操作");
-                }
-                if(ObjectUtil.isEmpty(entity.getSelfcheckDate())){
-                    return RestResponse.fail("请确认自检时间");
-                }
+                Judge.notNull(entity.getSelfcheckReportImg(),"请执行[上传自检报告]操作");
+                Judge.notNull(entity.getSelfcheckDate(),"请确认自检时间");
                 //流转到下一个状态 2 --> 3
             }else if(Values.aiStatusCheckComfirm(stepStatus)){
                 //3  企业文员确认现场检验时间,录入人员信息,政府质检,企业质检,联系电话
-                if(ObjectUtil.isEmpty(entity.getCheckDate())){
-                    return RestResponse.fail("请设置现场检验时间");
-                }
-                if(ObjectUtil.isEmpty(entity.getInspector())){
-                    return RestResponse.fail("请设置政府质检人员");
-                }
-                if(ObjectUtil.isEmpty(entity.getOperator())){
-                    return RestResponse.fail("请设置公司质检人员");
-                }
-                if(ObjectUtil.isEmpty(entity.getTelephone())){
-                    return RestResponse.fail("请设置人员联系电话");
-                }
+                Judge.notNull(entity.getCheckDate(),"请设置现场检验时间");
+                Judge.notNull(entity.getInspector(),"请设置政府质检人员");
+                Judge.notNull(entity.getOperator(),"请设置公司质检人员");
+                Judge.notNull(entity.getTelephone(),"请设置人员联系电话");
             }else {
                 return RestResponse.fail("请执行[确认现场检验时间]操作");
             }
         }
         // 3 --> 4  维保工上传检验结果
-        if(Values.aiStatusCheckComfirm(oldStepStatus) && !Values.aiNextStatus(oldStepStatus,stepStatus)){
-            return RestResponse.fail("请执行[上传检验结果]操作");
-        }
+        Judge.notTrue(Values.aiStatusCheckComfirm(oldStepStatus) && !Values.aiNextStatus(oldStepStatus,stepStatus),"请执行[上传检验结果]操作");
         //4 检查上传检验结果
         if(Values.aiStatusCheckUpload(oldStepStatus)){
             //修改检验结果
             if(Values.aiSameStatus(oldStepStatus,stepStatus)){
-                if(StrUtil.isEmpty(entity.getCheckResultImg())){
-                    return RestResponse.fail("请执行[上传检验结果]操作");
-                }
-                if(ObjectUtil.isEmpty(entity.getCheckDate())){
-                    return RestResponse.fail("请执行[确认检验时间]操作");
-                }
+                Judge.notNull(entity.getCheckResultImg(),"请执行[上传检验结果]操作");
+                Judge.notNull(entity.getCheckDate(),"请执行[确认检验时间]操作");
                 //流转到下一个状态
-            }else if(!Values.aiInStatus(Values.AI_STATUS_CHECK_QUALIFIED,stepStatus,Values.AI_STATUS_CHECK_UNQUALIFIED)){
+            }else{
             /**
              *  5	企业文员确认检验结果-合格
              *  6	企业文员确认检验结果-整改
              *  7	企业文员确认检验结果-不合格
              */
-                return RestResponse.fail("请执行[确认检验结果]操作");
-            } else if(Values.aiStatusCheckRectification(stepStatus)){
-                /**
-                 * 6 检验结果整改,回到阶段2
-                 * (3  企业文员确认现场检验时间 录入人员信息,政府质检,企业质检,联系电话)
-                 */
-                entity.setStepStatus(Values.AI_STATUS_CHECK_COMFIRM);
-                entity.setStepName(Values.AI_STEP_TWO);
+                Judge.notTrue(!Values.aiInStatus(Values.AI_STATUS_CHECK_QUALIFIED,stepStatus,Values.AI_STATUS_CHECK_UNQUALIFIED),"请执行[确认检验结果]操作");
             }
         }
+        /**
+         * 6 检验结果整改,回到阶段2
+         * (3  企业文员确认现场检验时间 录入人员信息,政府质检,企业质检,联系电话)
+         */
+        if(Values.aiStatusCheckRectification(stepStatus)){
+            entity.setStepStatus(Values.AI_STATUS_CHECK_COMFIRM);
+        }
         /**
          * 5	企业文员确认检验结果-合格 --> 8	维保工上传年检报告和合格证
          * 7	企业文员确认检验结果-不合格-->8	维保工上传年检报告和合格证
          */
         if(Values.aiStatusCheckQualified(oldStepStatus) || Values.aiStatusCheckUnqualified(oldStepStatus)){
             if(Values.aiStatusCertificateReportUpload(stepStatus)){
-                if(StrUtil.isEmpty(entity.getCertificateImgUrl()) && StrUtil.isEmpty(entity.getAnnualInspectionImg())){
-                    return RestResponse.fail("请执行[上传年检报告和合格证]操作");
-                }
+                Judge.notTrue(StrUtil.hasEmpty(entity.getCertificateImgUrl(),entity.getAnnualInspectionImg()),"请执行[上传年检报告和合格证]操作");
             }else {
                 return RestResponse.fail("年检记录状态有误");
             }
@@ -246,14 +202,10 @@ public class AnnualInspectionController {
         if(Values.aiStatusCertificateReportUpload(oldStepStatus)){
             //修改年检报告和合格证
             if(stepStatus == oldStepStatus){
-                if(StrUtil.isEmpty(entity.getCertificateImgUrl()) && StrUtil.isEmpty(entity.getAnnualInspectionImg())){
-                    return RestResponse.fail("请执行[上传年检报告和合格证]操作");
-                }
+                Judge.notTrue(StrUtil.hasEmpty(entity.getCertificateImgUrl(),entity.getAnnualInspectionImg()),"请执行[上传年检报告和合格证]操作");
             }else if(Values.aiStatusCertificateReportQualified(stepStatus)){
                 //合格:文员确认年检报告并设置下次年检时间
-                if(null == entity.getNextInspectionTime()){
-                    return RestResponse.fail("请设置下次年检时间");
-                }
+                Judge.notNull(entity.getNextInspectionTime(),"请设置下次年检时间");
                 // 设置年检完成 status = 1
                 entity.setFinishTime(LocalDateTime.now());
                 entity.setStatus(1);
@@ -266,14 +218,12 @@ public class AnnualInspectionController {
             }
         }
 
-        int stepName = Values.toStepName(stepStatus);
-        if(stepName == -1){
-            return RestResponse.fail("年检状态有误,状态码: " + stepStatus);
-        }
+        int stepName = Values.aiStatus2StepName(entity.getStepStatus());
+        Judge.notTrue(stepName == -1,"年检状态有误,状态码: " + stepStatus);
         entity.setStepName(stepName);
 
         boolean result = annualInspectionService.finish(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     @GetMapping("show")
@@ -294,8 +244,10 @@ public class AnnualInspectionController {
      */
     @PostMapping("pageByUser")
     public RestResponse pageByUser(@RequestBody InspectionRequest request){
+        Long userId = request.getUserId();
+        Judge.id(userId);
         IPage<InspectionResponse> pages = annualInspectionService.pageByUser(request);
-        return null == pages ? RestResponse.fail() : RestResponse.success(pages);
+        return Judge.result(pages);
     }
 
     /**
@@ -306,17 +258,13 @@ public class AnnualInspectionController {
     @PostMapping("confirm")
     public RestResponse confirm(@RequestBody InspectionRequest request){
         Long id = request.getId();
-        if(null == id || id < 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         AnnualInspection entity = annualInspectionService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         entity.setStepStatus(Values.AI_STATUS_COMFIRM);
         entity.setStepName(Values.AI_STEP_ONE);
         boolean result = annualInspectionService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -326,24 +274,19 @@ public class AnnualInspectionController {
     @PostMapping("selfcheck")
     public RestResponse selfcheck(@RequestBody InspectionRequest request){
         Long id = request.getId();
-        if(null == id || id < 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         LocalDate selfcheckDate = request.getSelfcheckDate();
         String selfcheckReportImg = request.getSelfcheckReportImg();
-        if(null == selfcheckDate || null == selfcheckReportImg){
-            return RestResponse.fail("缺少自检信息");
-        }
+        Judge.notNull(selfcheckDate,"缺少自检时间");
+        Judge.notNull(selfcheckReportImg,"缺少自检图片");
         AnnualInspection entity = annualInspectionService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         entity.setSelfcheckDate(selfcheckDate);
         entity.setSelfcheckReportImg(selfcheckReportImg);
         entity.setStepStatus(Values.AI_STATUS_SELFCHECK);
         entity.setStepName(Values.AI_STEP_ONE);
         boolean result = annualInspectionService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -354,24 +297,19 @@ public class AnnualInspectionController {
     @PostMapping("check")
     public RestResponse check(@RequestBody InspectionRequest request){
         Long id = request.getId();
-        if(null == id || id < 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         LocalDate checkDate = request.getCheckDate();
         String checkResultImg = request.getCheckResultImg();
-        if(null == checkDate || null == checkResultImg){
-            return RestResponse.fail("缺少检验信息");
-        }
+        Judge.notNull(checkDate,"缺少检验时间");
+        Judge.notNull(checkResultImg,"缺少检验图片");
         AnnualInspection entity = annualInspectionService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         entity.setCheckDate(checkDate);
         entity.setCheckResultImg(checkResultImg);
         entity.setStepStatus(Values.AI_STATUS_CHECK_UPLOAD);
         entity.setStepName(Values.AI_STEP_THREE);
         boolean result = annualInspectionService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -382,26 +320,18 @@ public class AnnualInspectionController {
     @PostMapping("finish")
     public RestResponse finish(@RequestBody InspectionRequest request){
         Long id = request.getId();
-        if(null == id || id < 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         String certificateImgUrl = request.getCertificateImgUrl();
-        if(StrUtil.isEmpty(certificateImgUrl)){
-            return RestResponse.fail("缺少合格证信息");
-        }
+        Judge.notNull(certificateImgUrl,"缺少合格证信息");
         String annualInspectionImg = request.getAnnualInspectionImg();
-        if(StrUtil.isEmpty(annualInspectionImg)){
-            return RestResponse.fail("缺少年检报告信息");
-        }
+        Judge.notNull(annualInspectionImg,"缺少年检报告信息");
         AnnualInspection entity = annualInspectionService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         entity.setCertificateImgUrl(certificateImgUrl);
         entity.setAnnualInspectionImg(annualInspectionImg);
         entity.setStepStatus(Values.AI_STATUS_CERTIFICATE_REPORT_UPLOAD);
         entity.setStepName(Values.AI_STEP_FOUR);
         boolean result = annualInspectionService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 }

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

@@ -79,20 +79,14 @@ public class CommonController {
      */
     @PostMapping("upload")
     public RestResponse upload(@RequestParam("file") MultipartFile file) throws Exception{
-        if(null == file || file.isEmpty()){
-            return RestResponse.fail("没有解析到文件");
-        }
-        if(file.getSize() > uploadMaxSize){
-            return RestResponse.fail("文件大小不超过5M");
-        }
+        Judge.notTrue(null == file || file.isEmpty(),"没有解析到文件");
+        Judge.notTrue(file.getSize() > uploadMaxSize,"文件大小不超过5M");
         // 获取文件名,带后缀
         String originalFilename = file.getOriginalFilename();
         log.info("上传文件,原文件名:" + originalFilename);
         // 获取文件的后缀格式
         String fileSuffix = originalFilename.substring(originalFilename.lastIndexOf(".")).toLowerCase();
-        if(!StrUtil.equalsAny(fileSuffix,".jpg",".jpeg", ".png", ".bmp", ".gif")){
-            return RestResponse.fail("文件格式不支持, 暂时只支持jpg,jpeg,png,bmp,gif");
-        }
+        Judge.notTrue(!StrUtil.equalsAny(fileSuffix,".jpg",".jpeg", ".png", ".bmp", ".gif"),"文件格式不支持, 暂时只支持jpg,jpeg,png,bmp,gif");
         String filename = DateUtil.today().replaceAll("-","/") + "/" +IdWorker.getIdStr() + fileSuffix;
         log.info("上传文件,新文件名:" + filename);
         boolean result = aliyunOSSUtil.putObject(systemConfiguration.bucketName,file.getBytes(),filename);

+ 110 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/common/Judge.java

@@ -0,0 +1,110 @@
+package cn.com.ty.lift.business.common;
+
+import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ObjectUtil;
+
+/**
+ * @author wcz
+ * @Description: 条件判断,如果符合条件,返回异常
+ * @date 2020/1/9 8:46
+ */
+public interface Judge {
+
+    /**
+     * 检查id类型值,如果为null或者<= 0 ,直接抛出异常,返回结果
+     * @param id
+     */
+    static void id(Long id) {
+        if(null == id || id <= 0){
+            throw new IllegalArgumentException("标识ID无效");
+        }
+    }
+
+    /**
+     * 判断对象object是否为空,如果不为空,直接抛出异常,返回message
+     * @param object
+     * @param message
+     */
+    static void isNull(Object object, String message){
+        if(ObjectUtil.isNotEmpty(object)){
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断对象object是否为空,如果不为空,直接抛出异常,返回默认消息
+     * @param object
+     */
+    static void isNull(Object object){
+        notNull(object,"缺少数据或数据有误");
+    }
+    /**
+     * 判断对象object是否为空,如果为真,直接抛出异常,返回message
+     * @param object
+     * @param message
+     */
+    static void notNull(Object object, String message){
+        if(ObjectUtil.isEmpty(object)){
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断对象object是否为空,如果为真,直接抛出异常,返回默认消息
+     * @param object
+     */
+    static void notNull(Object object){
+        notNull(object,"缺少数据或数据有误");
+    }
+
+    /**
+     * 判断表达式是否为真,如果为假,直接抛出异常,返回message
+     * @param expression
+     * @param message
+     */
+    static void isTrue(boolean expression,String message){
+        if (!expression) {
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断表达式是否为真,如果为假,直接抛出异常,返回
+     * @param expression
+     */
+    static void isTrue(boolean expression){
+        isTrue(expression,"数据无效或条件不成立");
+    }
+
+    /**
+     * 判断表达式是否为真,如果为真,直接抛出异常,返回message
+     * @param expression
+     * @param message
+     */
+    static void notTrue(boolean expression,String message){
+        if (expression) {
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断表达式是否为真,如果为真,直接抛出异常,返回
+     * @param expression
+     */
+    static void notTrue(boolean expression){
+        notTrue(expression,"数据无效或条件不成立");
+    }
+
+
+    /**
+     * 判断object,如果为空,返回fail,如果不为空,返回success(object);
+     * @param object
+     * @return
+     */
+    static RestResponse result(Object object){
+        if(object instanceof Boolean){
+            return (Boolean)object ? RestResponse.success(object) : RestResponse.fail();
+        }
+        return ObjectUtil.isNotEmpty(object) ? RestResponse.success(object) : RestResponse.fail();
+    }
+}

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/common/PinYinUtils.java

@@ -5,7 +5,7 @@ import net.sourceforge.pinyin4j.PinyinHelper;
 /**
  * 拼音工具类
  *
- * @author ZENG.XIAO.YAN
+ * @author wcz
  * @date 2018年5月9日
  */
 public class PinYinUtils {

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

@@ -207,7 +207,7 @@ public interface Values {
      * @param stepStatus
      * @return
      */
-    static int toStepName(Integer stepStatus){
+    static int aiStatus2StepName(Integer stepStatus){
         int stepName;
         switch (stepStatus){
             case AI_STATUS_NOT_START:

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.emergency.controller;
 
 
 import cn.com.ty.lift.business.common.CountPage;
+import cn.com.ty.lift.business.common.Judge;
 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;
@@ -65,14 +66,10 @@ public class EmergencyRepairController {
      */
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody RepairRequest request){
-        long id = request.getId();
-        if(id == 0){
-            return RestResponse.failParam();
-        }
+        Long id = request.getId();
+        Judge.id(id);
         RepairResponse result = emergencyRepairService.selectByIdWithInfo(request);
-        if(null == result){
-            return RestResponse.fail();
-        }
+        Judge.notNull(result);
         //查询相关的急修费用
         List<ErCostItem> erCostItems = erCostItemService.listByErRecordId(id);
         result.setErCostItems(erCostItems);
@@ -114,18 +111,13 @@ public class EmergencyRepairController {
      */
     @PostMapping("add")
     public RestResponse add(@RequestBody EmergencyRepair entity){
-        if(null == entity){
-            return RestResponse.failParam();
-        }
-        EmergencyRepair old = emergencyRepairService.findByMtCompanyAndLift(entity.getMtCompanyId(),entity.getLiftId());
-        if(null != old && (old.getStatus() == Values.ER_STATUS_TO_REPAIRED || old.getStatus() == Values.ER_STATUS_REPAIRING)){
-            return RestResponse.fail("该电梯存在未完成的急修,无法创建");
-        }
+        int repairing = emergencyRepairService.countRepairing(entity.getMtCompanyId(),entity.getLiftId());
+        Judge.notTrue(repairing > 0,"该电梯存在未完成的急修,无法创建");
         //派单时间 急修单创建时间
         entity.setAssignTime(LocalDateTime.now());
         entity.setStatus(Values.ER_STATUS_TO_REPAIRED);
         boolean result = emergencyRepairService.save(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -137,9 +129,7 @@ public class EmergencyRepairController {
     @PostMapping("list")
     public RestResponse list(@RequestBody RepairRequest request){
         IPage<RepairResponse> pages = emergencyRepairService.pageByRepairing(request);
-        if(null == pages){
-            return RestResponse.fail();
-        }
+        Judge.notNull(pages);
         long count = pages.getTotal();
         CountPage<RepairResponse> countPage = new CountPage<>(count,pages);
         return RestResponse.success(countPage);
@@ -154,9 +144,7 @@ public class EmergencyRepairController {
     @PostMapping("page")
     public RestResponse page(@RequestBody RepairRequest request){
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
-        if(null == pages){
-            return RestResponse.fail();
-        }
+        Judge.notNull(pages);
         long count = emergencyRepairService.countByCondition(request);
         CountPage<RepairResponse> countPage = new CountPage<>(count,pages);
         return RestResponse.success(countPage);
@@ -170,11 +158,10 @@ public class EmergencyRepairController {
      */
     @PostMapping("pageWorker")
     public RestResponse pageWorker(@RequestBody RepairRequest request){
-        if(request.getWorkerId() == null || request.getWorkerId() <= 0){
-            return RestResponse.failParam();
-        }
+        Long workerId = request.getWorkerId();
+        Judge.id(workerId);
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
-        return null != pages ? RestResponse.success(pages) : RestResponse.fail();
+        return Judge.result(pages);
     }
 
     /**
@@ -187,21 +174,18 @@ public class EmergencyRepairController {
     public RestResponse transfer(@RequestBody RepairRequest request){
         Long id = request.getId();
         Long workerId = request.getWorkerId();
-        if(null == id || null == workerId){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
+        Judge.id(workerId);
         EmergencyRepair entity = emergencyRepairService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         //如果已经接单,在急修中了不能被转派
-        if (entity.getStatus() == Values.ER_STATUS_REPAIRING) {
+        if (Values.erStatusRepairing(entity.getStatus())) {
             return RestResponse.fail("急修已经接单,不能转派");
         }
         //本急修单的负责维保工
         entity.setWorkerId1(workerId);
         boolean result = emergencyRepairService.saveOrUpdate(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -213,22 +197,17 @@ public class EmergencyRepairController {
     @PostMapping("close")
     public RestResponse close(@RequestBody RepairRequest request){
         Long id = request.getId();
-        if(null == id || id <= 0){
-            return RestResponse.failParam();
-        }
+        //fixme:assert判断条件
+        Judge.id(id);
         String reason = request.getCloseReason();
-        if(StrUtil.isEmpty(reason)){
-            return RestResponse.fail("缺少关闭原因");
-        }
+        Judge.notNull(reason,"缺少关闭原因");
         EmergencyRepair entity = emergencyRepairService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         entity.setCloseReason(reason);
         //新状态(-1 暂停中,0 待修理;1 修理中;2 已完成 3 已关闭)
         entity.setStatus(Values.ER_STATUS_CLOSE);
         boolean result = emergencyRepairService.saveOrUpdate(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -238,8 +217,10 @@ public class EmergencyRepairController {
      */
     @PostMapping("pageByUser")
     public RestResponse pageByUser(@RequestBody RepairRequest request){
+        Long userId = request.getUserId();
+        Judge.id(userId);
         IPage<RepairResponse> pages = emergencyRepairService.pageByUser(request);
-        return null != pages ? RestResponse.success(pages) : RestResponse.fail();
+        return Judge.result(pages);
     }
 
     /**
@@ -251,19 +232,17 @@ public class EmergencyRepairController {
     @PostMapping("taking")
     public RestResponse taking(@RequestBody RepairRequest request){
         Long id = request.getId();
+        Judge.id(id);
         LocalDateTime takingTime = request.getTakingTime();
-        if(null == id || id < 0 || null == takingTime){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(takingTime,"缺少接单时间");
         EmergencyRepair entity = emergencyRepairService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
+        Judge.isTrue(Values.erStatusToRepaired(entity.getStatus()),"待急修的才能接单");
         entity.setTakingTime(takingTime);
         //状态改成修理中 todo:修改电梯的业务状态为急修中,如果存在维保中,要修改
         entity.setStatus(Values.ER_STATUS_REPAIRING);
         boolean result = emergencyRepairService.taking(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -274,24 +253,17 @@ public class EmergencyRepairController {
     @PostMapping("arrive")
     public RestResponse arrive(@RequestBody RepairRequest request){
         Long id = request.getId();
-        if(null == id || id < 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         LocalDateTime arriveTime = request.getArriveTime();
-        if(null == arriveTime){
-            return RestResponse.fail("缺少达到时间");
-        }
+        Judge.notNull(arriveTime,"缺少达到时间");
         String position = request.getPosition();
-        if(StrUtil.isEmpty(position)){
-            return RestResponse.fail("缺少达到地点");
-        }
+        Judge.notNull(position,"缺少达到地点");
         EmergencyRepair entity = emergencyRepairService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
+        Judge.isTrue(Values.erStatusRepairing(entity.getStatus()), "急修中的才能到达");
         entity.setArriveTime(arriveTime);
         boolean result = emergencyRepairService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -303,25 +275,18 @@ public class EmergencyRepairController {
     @PostMapping("stop")
     public RestResponse stopLift(@RequestBody RepairRequest request){
         Long id = request.getId();
-        if(null == id || id < 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         LocalDateTime stopDate = request.getStopDate();
-        if(null == stopDate){
-            return RestResponse.fail("请指定停梯时间");
-        }
+        Judge.notNull(stopDate,"请指定停梯时间");
         String safetyConfirm = request.getSafetyConfirm();
-        if(StrUtil.isEmpty(safetyConfirm)){
-            return RestResponse.fail("请完成安全确认");
-        }
+        Judge.notNull(safetyConfirm,"请完成安全确认");
         EmergencyRepair entity = emergencyRepairService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
+        Judge.isTrue(Values.erStatusRepairing(entity.getStatus()),"急修中的才能停梯");
         entity.setStopDate(stopDate);
         entity.setSafetyConfirm(safetyConfirm);
         boolean result = emergencyRepairService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -333,16 +298,15 @@ public class EmergencyRepairController {
     @PostMapping("cost/add")
     public RestResponse costAdd(@RequestBody RepairRequest request){
         Long id = request.getId();
+        Judge.id(id);
         List<ErCostItem> erCostItems = request.getErCostItems();
-        if(id == null || null == erCostItems || erCostItems.isEmpty()){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(erCostItems,"缺少收费项");
         BigDecimal costTotal = new BigDecimal(0);
         erCostItems.forEach(item -> {
             costTotal.add(item.getCostMoney());
         });
         boolean result = erCostItemService.saveBatch(erCostItems);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -353,11 +317,9 @@ public class EmergencyRepairController {
     @PostMapping("cost/delete")
     public RestResponse costDelete(@RequestBody RepairRequest request){
         Long erCostItemId = request.getErCostItemId();
-        if(null == erCostItemId || erCostItemId <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(erCostItemId);
         boolean result = erCostItemService.removeById(erCostItemId);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -368,11 +330,9 @@ public class EmergencyRepairController {
     @PostMapping("cost/modify")
     public RestResponse costModify(@RequestBody RepairRequest request){
         List<ErCostItem> erCostItems = request.getErCostItems();
-        if(null == erCostItems || erCostItems.isEmpty()){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(erCostItems);
         boolean result = erCostItemService.updateBatchById(erCostItems);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -387,7 +347,7 @@ public class EmergencyRepairController {
             return RestResponse.success(liftFaultService.list());
         }
         List<LiftFault> lists = liftFaultService.listByLiftCategory(liftCategory);
-        return null != lists ? RestResponse.success(lists) : RestResponse.fail();
+        return Judge.result(lists);
     }
 
     /**
@@ -413,14 +373,9 @@ public class EmergencyRepairController {
      * @return
      */
     private RestResponse assemble(List<LiftFault> liftFaults){
-        if (ObjectUtil.isEmpty(liftFaults)) {
-            return RestResponse.fail("没有故障信息");
-        }
-
+        Judge.notNull(liftFaults,"没有故障信息");
         List<String> categories = liftFaults.stream().map(LiftFault::getFaultCategory).distinct().collect(Collectors.toList());
-        if (ObjectUtil.isEmpty(categories)) {
-            return RestResponse.fail("没有故障类型");
-        }
+        Judge.notNull(categories,"没有故障类型");
         List<LiftFaultCategory> liftFaultCategories = new ArrayList<>();
         categories.forEach(category -> {
             log.info("category: {}", category);
@@ -452,30 +407,20 @@ public class EmergencyRepairController {
     @PostMapping("evaluate")
     public RestResponse evaluate(@RequestBody EvaluationRequest request){
         Long recordId = request.getRecordId();
-        if(null == recordId || recordId <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(recordId);
         String customerSign = request.getCustomerSign();
-        if(StrUtil.isEmpty(customerSign)){
-            return RestResponse.fail("请签名");
-        }
+        Judge.notNull(customerSign,"请签名");
         EmergencyRepair repair = emergencyRepairService.getById(recordId);
-        if(null == repair){
-            return RestResponse.failParam();
-        }
-        if(repair.getStatus() != Values.ER_STATUS_FINISH){
-            return RestResponse.fail("该急修未完成不能评价");
-        }
-        Evaluation old = evaluationService.findByRecord(recordId);
-        if (null != old) {
-            return RestResponse.fail("该急修已经存在评价");
-        }
+        Judge.notNull(repair);
+        Judge.isTrue(Values.erStatusFinish(repair.getStatus()),"该急修未完成不能评价");
+        int count = evaluationService.countByRecord(recordId);
+        Judge.notTrue(count > 0,"该急修已经存在评价");
         Evaluation evaluation = new Evaluation();
         //复制属性到评价bean
         BeanUtil.copyProperties(request,evaluation);
         evaluation.setPostDate(LocalDateTime.now());
         boolean result = evaluationService.save(evaluation);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -486,22 +431,14 @@ public class EmergencyRepairController {
     @PostMapping("repairOrder")
     public RestResponse repairOrder(@RequestBody RepairRequest request){
         Long id = request.getId();
-        if (null == id || id <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         LocalDateTime recoveryDate = request.getRecoveryDate();
-        if(null == recoveryDate){
-            return RestResponse.fail("请填写恢复时间");
-        }
+        Judge.notNull(recoveryDate,"请填写恢复时间");
         String mainSign = request.getMainSign();
         String secondSign = request.getSecondSign();
-        if(StrUtil.hasEmpty(mainSign,secondSign)){
-            return RestResponse.fail("请签名");
-        }
+        Judge.notTrue(StrUtil.hasEmpty(mainSign,secondSign),"请签名");
         EmergencyRepair entity = emergencyRepairService.getById(id);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         entity.setFaultPart(request.getFaultPart());
         entity.setFaultReason(request.getFaultReason());
         entity.setFaultHandle(request.getFaultHandle());
@@ -512,6 +449,6 @@ public class EmergencyRepairController {
         //修改状态已完成
         entity.setStatus(Values.ER_STATUS_FINISH);
         boolean result = emergencyRepairService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 }

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

@@ -18,6 +18,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.util.Arrays;
+
 /**
  * <p>
  * 临修记录 服务实现类
@@ -122,6 +124,21 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         return getOne(lambdaQueryWrapper);
     }
 
+    /**
+     * 统计维保公司和电梯下是否存在待急修和急修中的急修单
+     * @param mtCompany
+     * @param liftId
+     * @return
+     */
+    public int countRepairing(Long mtCompany,Long liftId){
+        QueryWrapper<EmergencyRepair> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<EmergencyRepair> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(EmergencyRepair::getMtCompanyId, mtCompany);
+        lambdaQueryWrapper.eq(EmergencyRepair::getLiftId,liftId);
+        lambdaQueryWrapper.in(EmergencyRepair::getStatus,Arrays.asList(Values.ER_STATUS_TO_REPAIRED,Values.ER_STATUS_REPAIRING));
+        return count(lambdaQueryWrapper);
+
+    }
     /**
      * 开启维保,暂停急修,修改电梯业务状态为维保中
      * @param mtCompany

+ 7 - 0
lift-business-service/src/main/java/cn/com/ty/lift/business/evaluation/service/EvaluationService.java

@@ -37,4 +37,11 @@ public class EvaluationService extends ServiceImpl<EvaluationMapper, Evaluation>
         lambdaQueryWrapper.last("LIMIT 1");
         return getOne(lambdaQueryWrapper);
     }
+
+    public int countByRecord(Long recordId){
+        QueryWrapper<Evaluation> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<Evaluation> lambdaQueryWrapper = queryWrapper.lambda();
+        lambdaQueryWrapper.eq(Evaluation::getRecordId,recordId);
+        return count(lambdaQueryWrapper);
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.framework.BusinessBasicException;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.FieldError;
@@ -29,6 +30,13 @@ import java.util.List;
 @ControllerAdvice
 public class GlobalDefaultExceptionHandler {
 
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    public Object illegalArgument(final IllegalArgumentException e) throws Exception {
+        // 捕获错误message
+        String message = e.getMessage();
+        return StrUtil.isEmpty(message) ? RestResponse.failParam() : RestResponse.fail(message);
+    }
+
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
     public Object jsonErrorHandler(final MethodArgumentNotValidException e) throws Exception {
         // 获取验证框架的错误详情

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.common;
 
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.FieldError;
@@ -26,6 +27,13 @@ import java.util.List;
 @ControllerAdvice
 public class GlobalDefaultExceptionHandler {
 
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    public Object illegalArgument(final IllegalArgumentException e) throws Exception {
+        // 捕获错误message
+        String message = e.getMessage();
+        return StrUtil.isEmpty(message) ? RestResponse.failParam() : RestResponse.fail(message);
+    }
+
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
     public Object jsonErrorHandler(final MethodArgumentNotValidException e) throws Exception {
         // 获取验证框架的错误详情

+ 110 - 0
lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/common/Judge.java

@@ -0,0 +1,110 @@
+package cn.com.ty.lift.enterprise.common;
+
+import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ObjectUtil;
+
+/**
+ * @author wcz
+ * @Description: 条件判断,如果符合条件,返回异常
+ * @date 2020/1/9 8:46
+ */
+public interface Judge {
+
+    /**
+     * 检查id类型值,如果为null或者<= 0 ,直接抛出异常,返回结果
+     * @param id
+     */
+    static void id(Long id) {
+        if(null == id || id <= 0){
+            throw new IllegalArgumentException("标识ID无效");
+        }
+    }
+
+    /**
+     * 判断对象object是否为空,如果不为空,直接抛出异常,返回message
+     * @param object
+     * @param message
+     */
+    static void isNull(Object object, String message){
+        if(ObjectUtil.isNotEmpty(object)){
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断对象object是否为空,如果不为空,直接抛出异常,返回默认消息
+     * @param object
+     */
+    static void isNull(Object object){
+        notNull(object,"缺少数据或数据有误");
+    }
+    /**
+     * 判断对象object是否为空,如果为真,直接抛出异常,返回message
+     * @param object
+     * @param message
+     */
+    static void notNull(Object object, String message){
+        if(ObjectUtil.isEmpty(object)){
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断对象object是否为空,如果为真,直接抛出异常,返回默认消息
+     * @param object
+     */
+    static void notNull(Object object){
+        notNull(object,"缺少数据或数据有误");
+    }
+
+    /**
+     * 判断表达式是否为真,如果为假,直接抛出异常,返回message
+     * @param expression
+     * @param message
+     */
+    static void isTrue(boolean expression, String message){
+        if (!expression) {
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断表达式是否为真,如果为假,直接抛出异常,返回
+     * @param expression
+     */
+    static void isTrue(boolean expression){
+        isTrue(expression,"数据无效或条件不成立");
+    }
+
+    /**
+     * 判断表达式是否为真,如果为真,直接抛出异常,返回message
+     * @param expression
+     * @param message
+     */
+    static void notTrue(boolean expression, String message){
+        if (expression) {
+            throw new IllegalArgumentException(message);
+        }
+    }
+
+    /**
+     * 判断表达式是否为真,如果为真,直接抛出异常,返回
+     * @param expression
+     */
+    static void notTrue(boolean expression){
+        notTrue(expression,"数据无效或条件不成立");
+    }
+
+
+    /**
+     * 判断object,如果为空,返回fail,如果不为空,返回success(object);
+     * @param object
+     * @return
+     */
+    static RestResponse result(Object object){
+        if(object instanceof Boolean){
+            return (Boolean)object ? RestResponse.success(object) : RestResponse.fail();
+        }
+        return ObjectUtil.isNotEmpty(object) ? RestResponse.success(object) : RestResponse.fail();
+    }
+}

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.oa.controller;
 
 import cn.com.ty.lift.enterprise.common.CountPage;
+import cn.com.ty.lift.enterprise.common.Judge;
 import cn.com.ty.lift.enterprise.oa.dto.AnnouncementRequest;
 import cn.com.ty.lift.enterprise.oa.dto.AnnouncementResponse;
 import cn.com.ty.lift.enterprise.oa.entity.Announcement;
@@ -41,11 +42,9 @@ public class AnnouncementController {
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody AnnouncementRequest request) {
         Long id = request.getId();
-        if(null == id || id <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         Announcement entity = announcementService.getById(id);
-        return null != entity ? RestResponse.success(entity) : RestResponse.fail();
+        return Judge.result(entity);
     }
 
     /**
@@ -57,9 +56,7 @@ public class AnnouncementController {
     @PostMapping("list")
     public RestResponse list(@RequestBody AnnouncementRequest request){
         IPage<AnnouncementResponse> pages = announcementService.pageByCondition(request);
-        if(null == pages){
-            return RestResponse.fail();
-        }
+        Judge.notNull(pages);
         long count = announcementService.count();
         CountPage<AnnouncementResponse> countPage = new CountPage<>(count,pages);
         return RestResponse.success(countPage);
@@ -73,11 +70,8 @@ public class AnnouncementController {
      */
     @PostMapping("add")
     public RestResponse add(@RequestBody Announcement entity){
-        if(null == entity){
-            return RestResponse.failParam();
-        }
         boolean result = announcementService.save(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -89,11 +83,9 @@ public class AnnouncementController {
     @PostMapping("delete")
     public RestResponse delete(@RequestBody AnnouncementRequest request){
         Long id = request.getId();
-        if(null == id || id <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         boolean result = announcementService.removeById(id);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
 
     }
 }

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.oa.controller;
 
 import cn.com.ty.lift.enterprise.common.CountPage;
+import cn.com.ty.lift.enterprise.common.Judge;
 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;
@@ -8,6 +9,7 @@ import cn.com.ty.lift.enterprise.oa.entity.MaintenanceCompany;
 import cn.com.ty.lift.enterprise.oa.service.AttendanceService;
 import cn.com.ty.lift.enterprise.oa.service.MaintenanceCompanyService;
 import cn.com.xwy.boot.web.dto.RestResponse;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
@@ -46,11 +48,9 @@ public class AttendanceController {
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody AttendanceRequest request) {
         Long id = request.getId();
-        if(null == id || id <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(id);
         Attendance entity = attendanceService.getById(id);
-        return null != entity ? RestResponse.success(entity) : RestResponse.fail();
+        return Judge.result(entity);
     }
 
     /**
@@ -67,9 +67,7 @@ public class AttendanceController {
         }
 
         IPage<AttendanceResponse> pages = attendanceService.pageByCondition(request);
-        if(null == pages){
-            return RestResponse.fail();
-        }
+        Judge.notNull(pages);
         long count = attendanceService.count();
         CountPage<AttendanceResponse> countPage = new CountPage<>(count,pages);
         return RestResponse.success(countPage);
@@ -85,33 +83,23 @@ public class AttendanceController {
     public RestResponse setupTime(@RequestBody AttendanceRequest request){
         LocalTime topTime = request.getTopTime();
         LocalTime downTime = request.getDownTime();
-        if ((topTime != null && downTime == null) || (topTime == null && downTime != null)) {
-            return RestResponse.fail("请设置上午的上下班时间");
-        }
-        if (topTime.isAfter(downTime)) {
-            return RestResponse.fail("上午的上下班时间有误");
-        }
+        Judge.notTrue(ObjectUtil.hasEmpty(topTime,downTime),"请设置上午的上下班时间");
+        Judge.notTrue(topTime.isAfter(downTime),"上午的上下班时间有误");
+
         LocalTime topTimePm = request.getTopTimePm();
         LocalTime downTimePm = request.getDownTimePm();
-        if ((topTimePm != null && downTimePm == null) || (topTimePm == null && downTimePm != null)) {
-            return RestResponse.fail("请设置下午的上下班时间");
-        }
-        if (topTimePm.isAfter(downTimePm)) {
-            return RestResponse.fail("下午的上下班时间有误");
-        }
+        Judge.notTrue(ObjectUtil.hasEmpty(topTimePm,downTimePm),"请设置下午的上下班时间");
+        Judge.notTrue(topTimePm.isAfter(downTimePm),"下午的上下班时间有误");
+
         LocalTime topTimeOt = request.getTopTimeOt();
         LocalTime downTimeOt = request.getDownTimeOt();
-        if ((topTimeOt != null && downTimeOt == null) || (topTimeOt == null && downTimeOt != null)) {
-            return RestResponse.fail("请设置加班的上下班时间");
-        }
-        if (topTimeOt.isAfter(downTimeOt)) {
-            return RestResponse.fail("加班的上下班时间有误");
-        }
-        long mtCompanyId = request.getMtCompanyId();
+        Judge.notTrue(ObjectUtil.hasEmpty(topTimeOt,downTimeOt),"请设置加班的上下班时间");
+        Judge.notTrue(topTimeOt.isAfter(downTimeOt),"加班的上下班时间有误");
+
+        Long mtCompanyId = request.getMtCompanyId();
+        Judge.id(mtCompanyId);
         MaintenanceCompany entity = maintenanceCompanyService.getById(mtCompanyId);
-        if(null == entity){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(entity);
         entity.setTopTime(topTime);
         entity.setDownTime(downTime);
         entity.setTopTimePm(topTimePm);
@@ -119,7 +107,7 @@ public class AttendanceController {
         entity.setTopTimeOt(topTimeOt);
         entity.setDownTimeOt(downTimeOt);
         boolean result = maintenanceCompanyService.saveOrUpdate(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -135,17 +123,12 @@ public class AttendanceController {
     public RestResponse clock(@RequestBody AttendanceRequest request) {
         String coordinate = request.getCoordinate();
         String address = request.getAddress();
-        if (StrUtil.equalsAny(coordinate, address)) {
-            return RestResponse.fail("缺少地址信息");
-        }
+        Judge.notTrue(StrUtil.equalsAny(coordinate, address),"缺少地址信息");
+
         Long mtCompanyId = request.getMtCompanyId();
-        if (null == mtCompanyId || mtCompanyId <= 0) {
-            return RestResponse.failParam();
-        }
+        Judge.id(mtCompanyId);
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyId);
-        if (null == maintenanceCompany) {
-            return RestResponse.failParam();
-        }
+        Judge.notNull(maintenanceCompany);
         Attendance attendance = new Attendance();
         attendance.setMtCompanyId(mtCompanyId);
         //fixme:获取当前用户?
@@ -160,46 +143,34 @@ public class AttendanceController {
         switch (type) {
             case 11:
                 LocalTime topTime = maintenanceCompany.getTopTime();
-                if (null == topTime) {
-                    return RestResponse.fail("请先设置上午的上班时间");
-                }
+                Judge.notNull(topTime,"请先设置上午的上班时间");
                 //打卡时间比上班时间早-正常,否则迟到
                 attendance.setStatus(now.isBefore(topTime) ? 0 : 1);
                 break;
             case 12:
                 LocalTime downTime = maintenanceCompany.getDownTime();
-                if (null == downTime) {
-                    return RestResponse.fail("请先设置上午的下班时间");
-                }
+                Judge.notNull(downTime,"请先设置上午的下班时间");
                 //打卡时间比下班时间晚-正常,否则早退
                 attendance.setStatus(now.isAfter(downTime) ? 0 : 1);
                 break;
             case 21:
                 LocalTime topTimePm = maintenanceCompany.getTopTimePm();
-                if (null == topTimePm) {
-                    return RestResponse.fail("请先设置下午的上班时间");
-                }
+                Judge.notNull(topTimePm,"请先设置下午的上班时间");
                 attendance.setStatus(now.isBefore(topTimePm) ? 0 : 1);
                 break;
             case 22:
                 LocalTime downTimePm = maintenanceCompany.getDownTimePm();
-                if (null == downTimePm) {
-                    return RestResponse.fail("请先设置下午的下班时间");
-                }
+                Judge.notNull(downTimePm,"请先设置下午的下班时间");
                 attendance.setStatus(now.isAfter(downTimePm) ? 0 : 1);
                 break;
             case 31:
                 LocalTime topTimeOt = maintenanceCompany.getTopTimeOt();
-                if (null == topTimeOt) {
-                    return RestResponse.fail("请先设置加班的上班时间");
-                }
+                Judge.notNull(topTimeOt,"请先设置加班的上班时间");
                 attendance.setStatus(now.isBefore(topTimeOt) ? 0 : 1);
                 break;
             case 32:
                 LocalTime downTimeOt = maintenanceCompany.getDownTimeOt();
-                if (null == downTimeOt) {
-                    return RestResponse.fail("请先设置加班的下班时间");
-                }
+                Judge.notNull(downTimeOt,"请先设置加班的下班时间");
                 attendance.setStatus(now.isAfter(downTimeOt) ? 0 : 1);
                 break;
             default:
@@ -216,11 +187,9 @@ public class AttendanceController {
     @PostMapping("time")
     public RestResponse time(@RequestBody AttendanceRequest request) {
         Long mtCompanyId = request.getMtCompanyId();
-        if (null == mtCompanyId || mtCompanyId <= 0) {
-            return RestResponse.failParam();
-        }
+        Judge.id(mtCompanyId);
         MaintenanceCompany entity = maintenanceCompanyService.getById(mtCompanyId);
-        return null != entity ? RestResponse.success(entity) : RestResponse.fail();
+        return Judge.result(entity);
     }
 
     /**
@@ -232,10 +201,8 @@ public class AttendanceController {
     public RestResponse pageByUser(@RequestBody AttendanceRequest request){
 
         Long userId = request.getUserId();
-        if(null == userId || userId <= 0){
-            return RestResponse.failParam();
-        }
+        Judge.id(userId);
         IPage<AttendanceResponse> pages = attendanceService.pageByUser(request);
-        return null != pages ? RestResponse.success(pages) : RestResponse.fail();
+        return Judge.result(pages);
     }
 }

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

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.enterprise.oa.controller;
 
 import cn.com.ty.lift.enterprise.common.CountPage;
+import cn.com.ty.lift.enterprise.common.Judge;
 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;
@@ -40,12 +41,10 @@ public class LiftCertificateController {
      */
     @PostMapping("findOne")
     public RestResponse findOne(@RequestBody LiftCertificateRequest request) {
-        long id = request.getId();
-        if(id <= 0){
-            return RestResponse.failParam();
-        }
+        Long id = request.getId();
+        Judge.id(id);
         LiftCertificate entity = liftCertificateService.getById(id);
-        return null != entity ? RestResponse.success(entity) : RestResponse.fail();
+        return Judge.result(entity);
     }
 
     /**
@@ -63,9 +62,7 @@ public class LiftCertificateController {
             request.setUsername(StrUtil.format("%{}%",name));
         }
         IPage<LiftCertificateResponse> pages = liftCertificateService.pageByCondition(request);
-        if (pages == null) {
-            return RestResponse.fail();
-        }
+        Judge.notNull(pages);
         long count = liftCertificateService.countByCondition(request);
         CountPage<LiftCertificateResponse> countPage = new CountPage<>(count, pages);
         return RestResponse.success(countPage);
@@ -79,11 +76,10 @@ public class LiftCertificateController {
      */
     @PostMapping("modify")
     public RestResponse modify(@RequestBody LiftCertificate entity) {
-        if (null == entity) {
-            return RestResponse.failParam();
-        }
+        Long id = entity.getId();
+        Judge.id(id);
         boolean result = liftCertificateService.updateById(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -94,19 +90,15 @@ public class LiftCertificateController {
      */
     @PostMapping("audit")
     public RestResponse audit(@RequestBody LiftCertificateRequest request) {
-        long id = request.getId();
-        if(id <= 0){
-            return RestResponse.failParam();
-        }
+        Long id = request.getId();
+        Judge.id(id);
         //0:无证,1:待审核,2:审核未通过,3:审核通过,4:超期
         LiftCertificate liftCertificate = liftCertificateService.getById(id);
-        if(null == liftCertificate){
-            return RestResponse.failParam();
-        }
+        Judge.notNull(liftCertificate);
         int status = request.isPass() ? 3 : 2;
         liftCertificate.setStatus(status);
         boolean result = liftCertificateService.saveOrUpdate(liftCertificate);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
     }
 
     /**
@@ -117,14 +109,9 @@ public class LiftCertificateController {
      */
     @PostMapping("add")
     public RestResponse add(@RequestBody LiftCertificate entity) {
-        if (null == entity) {
-            return RestResponse.failParam();
-        }
-        if(StrUtil.hasEmpty(entity.getFirstImgUrl(),entity.getSecondImgUrl())){
-            return RestResponse.fail("请上传操作证图片");
-        }
+        Judge.notTrue(StrUtil.hasEmpty(entity.getFirstImgUrl(),entity.getSecondImgUrl()),"请上传操作证图片");
         boolean result = liftCertificateService.save(entity);
-        return result ? RestResponse.success(result) : RestResponse.fail();
+        return Judge.result(result);
 
     }
 }