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

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

@@ -13,6 +13,7 @@ import cn.com.ty.lift.business.maintenance.service.*;
 import cn.com.ty.lift.business.project.dao.entity.ProjectLiftRelevance;
 import cn.com.ty.lift.business.project.service.ProjectLiftRelevanceService;
 import cn.com.ty.lift.common.utils.Judge;
+import cn.com.ty.lift.common.utils.Judger;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.util.StrUtil;
@@ -60,11 +61,9 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("pageRecord")
+    @Judger(fields = {"mtCompanyId"})
     public RestResponse pageRecord(@RequestBody MtRecordRequest request){
-        Long mtCompanyId = request.getMtCompanyId();
-        Judge.id(mtCompanyId);
         IPage<MtRecordResponse> pages = maintenanceRecordService.pageRecordByCondition(request);
-        Judge.notNull(pages);
         long count = maintenanceRecordService.countRecordByCondition(request);
         CountPage<MtRecordResponse> countPage = new CountPage<>(count,pages);
         return RestResponse.success(countPage);
@@ -76,32 +75,31 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("pagePlan")
+    @Judger(fields = {"mtCompanyId"})
     public RestResponse pagePlan(@RequestBody MtPlanRequest request){
-        Long mtCompanyId = request.getMtCompanyId();
-        Judge.id(mtCompanyId);
         IPage<MtPlanResponse> pages = maintenancePlanService.pagePlanByCondition(request);
         Judge.notNull(pages);
-        long count = maintenancePlanService.countPlanByCondition(request);
         List<MtPlanResponse> records = pages.getRecords();
         if(IterUtil.isNotEmpty(records)){
-            List<ProjectLiftRelevance> relevances = projectLiftRelevanceService.listByMtCompany(mtCompanyId);
+            List<ProjectLiftRelevance> relevances = projectLiftRelevanceService.listByMtCompany(request.getMtCompanyId());
             records.forEach(record -> {
-                Optional<ProjectLiftRelevance> liftRelevance = relevances.stream().filter(r -> (
-                        r.getLiftId().equals(record.getLiftId()) &&
-                        r.getProjectId().equals(record.getProjectId()))).findFirst();
-                if(liftRelevance.isPresent()){
-                    ProjectLiftRelevance relevance = liftRelevance.get();
+                Optional<ProjectLiftRelevance> liftRelevance = relevances
+                        .stream()
+                        .filter(r -> (r.getLiftId().equals(record.getLiftId()) && r.getProjectId().equals(record.getProjectId())))
+                        .findFirst();
+                liftRelevance.ifPresent(lr -> {
                     log.info("PlanDate: {}",record.getPlanDate());
-                    LocalDate deadline = record.getPlanDate().plusDays(maintenance_interval - relevance.getPlanInterval());
+                    LocalDate deadline = record.getPlanDate().plusDays(maintenance_interval - lr.getPlanInterval());
                     log.info("deadline: {}",deadline);
                     //如果超过法规15天，法规超期LocalDate.now() < deadline
                     LocalDateTime max = LocalDateTime.of(deadline,LocalTime.MAX);
                     log.info("maxtime: {}",max);
                     record.setOverdue(LocalDateTime.now().isBefore(max) ? 1 : 2);
                     log.info("overdue: {}",record.getOverdue());
-                }
+                });
             });
         }
+        long count = maintenancePlanService.countPlanByCondition(request);
         CountPage<MtPlanResponse> countPage = new CountPage<>(count,pages);
         return RestResponse.success(countPage);
     }
@@ -112,9 +110,8 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("one")
+    @Judger(fields = {"id"})
     public RestResponse one(@RequestBody MtRecordRequest request){
-        Long id = request.getId();
-        Judge.id(id);
         MtRecordResponse entity = maintenanceRecordService.findByIdWithInfo(request);
         Judge.notNull(entity);
         /**
@@ -134,6 +131,7 @@ public class MaintenanceRecordController {
             });
             entity.setMtOptions(mtOptions);
         }
+        Long id = request.getId();
         //查询费用项
         entity.setMtRecordCosts(mtRecordCostService.listByRecord(id));
         //查询图片
@@ -147,12 +145,11 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("treeOptions")
+    @Judger(fields = {"mtCompanyId","type","liftType"})
     public RestResponse treeOptions(@RequestBody MtRecordRequest request){
         Integer type = request.getType();
         Integer liftType = request.getLiftType();
         Long mtCompanyId = request.getMtCompanyId();
-        Judge.id(mtCompanyId);
-        Judge.gt0(type,liftType);
         List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type,liftType,mtCompanyId);
         Judge.notNull(optionList);
         //按照sort groupby
@@ -171,12 +168,11 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("listOptions")
+    @Judger(fields = {"mtCompanyId","type","liftType"})
     public RestResponse listOptions(@RequestBody MtRecordRequest request){
         Integer type = request.getType();
         Integer liftType = request.getLiftType();
         Long mtCompanyId = request.getMtCompanyId();
-        Judge.id(mtCompanyId);
-        Judge.gt0(type,liftType);
         List<MaintenanceOption> optionList = maintenanceOptionService.listByTypeAndLiftType(type,liftType,mtCompanyId);
         return RestResponse.success(optionList);
     }
@@ -199,16 +195,11 @@ public class MaintenanceRecordController {
      * @return RestResponse
      */
     @PostMapping("fill")
+    @Judger(fields = {"id","maintenanceOption","imgs"})
     public RestResponse fill(@RequestBody MtRecordRequest request){
         Long id = request.getId();
-        Judge.id(id);
-        //维保项不能为空
         String maintenanceOption = request.getMaintenanceOption();
-        Judge.notNull(maintenanceOption,"维保项不能为空");
-
         List<String> imgs = request.getImgs();
-        Judge.notNull(imgs,"维保图片不能为空");
-
         List<MtRecordImg> mtRecordImgs = new ArrayList<>();
         for (int i = 0; i < imgs.size(); i++) {
             MtRecordImg mri = new MtRecordImg();

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 
+import cn.com.ty.lift.common.utils.Judger;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,19 +19,23 @@ public class MtPlanRequest extends BaseRequestModel {
     /**
      * 主键id
      */
+    @Judger(message = "维保计划ID有误")
     private Long id;
 
     /**
      * 区域id
      */
+    @Judger(message = "区域ID有误")
     private Long regionId;
     /**
      * 项目id
      */
+    @Judger(message = "项目ID有误")
     private Long projectId;
     /**
      * 维保工id
      */
+    @Judger(message = "维保工ID有误")
     private Long workerId;
     /**
      * 计划开始时间
@@ -43,9 +48,11 @@ public class MtPlanRequest extends BaseRequestModel {
     /**
      * 执行时间
      */
+    @Judger(message = "缺少计划执行时间")
     private LocalDate workDate;
     /**
      * 公司id
      */
+    @Judger(message = "维保公司ID有误")
     private Long mtCompanyId;
 }

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

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.maintenance.dao.entity.model.request;
 
+import cn.com.ty.lift.common.utils.Judger;
 import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,19 +20,23 @@ public class MtRecordRequest extends BaseRequestModel {
     /**
      * 主键id
      */
+    @Judger(message = "维保记录ID有误")
     private Long id;
 
     /**
      * 区域id
      */
+    @Judger(message = "区域ID有误")
     private Long regionId;
     /**
      * 项目id
      */
+    @Judger(message = "项目ID有误")
     private Long projectId;
     /**
      * 维保工id
      */
+    @Judger(message = "维保工ID有误")
     private Long workerId;
     /**
      * 计划开始时间
@@ -48,19 +53,24 @@ public class MtRecordRequest extends BaseRequestModel {
     /**
      * 公司id
      */
+    @Judger(message = "维保公司ID有误")
     private Long mtCompanyId;
 
     /**
      * 电梯类型(1:直梯;2:扶梯)
      */
+    @Judger(message = "电梯类型有误")
     private Integer liftType;
 
     /**
      * 保养类型 1.半月，2.季度，3.半年，4.全年
      */
+    @Judger(message = "保养类型有误")
     private Integer type;
 
+    @Judger(message = "缺少维保项")
     private String maintenanceOption;
 
+    @Judger(message = "缺少维保图片")
     private List<String> imgs;
 }

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

@@ -13,8 +13,11 @@ public interface Judge {
 
     String INVALID_IDENTIFIER = "标识ID无效";
     String MUST_GT0 = "数值必须大于0";
-    String MUST_LT0 = "数值不能大于0";
+    String MUST_LT0 = "数值必须小于0";
     String MUST_EQ0 = "数值必须等于0";
+    String MUST_NGT0 = "数值必须大于或等于0";
+    String MUST_NLT0 = "数值必须小于或等于0";
+    String MUST_NEQ0 = "数值必须不等于0";
     String MISSING_INCORRECT_DATA = "缺少数据或数据有误";
     String INVALID_DATA_CONDITIONS = "数据无效或条件不成立";
 
@@ -44,8 +47,6 @@ public interface Judge {
         }
     }
 
-    boolean than(Number one, Number other);
-
     /**
      * value == null || value <= 0 throw new JudgeException(message);
      *
@@ -179,9 +180,9 @@ public interface Judge {
      * @param values
      */
     static void ngt0(Number... values) {
-        notNull(values, MUST_GT0);
+        notNull(values, MUST_NGT0);
         for (Number value : values) {
-            ngt0(value, MUST_GT0);
+            ngt0(value, MUST_NGT0);
         }
     }
 
@@ -215,9 +216,9 @@ public interface Judge {
      * @param values
      */
     static void nlt0(Number... values) {
-        notNull(values, MUST_LT0);
+        notNull(values, MUST_NLT0);
         for (Number value : values) {
-            nlt0(value, MUST_LT0);
+            nlt0(value, MUST_NLT0);
         }
     }
 
@@ -251,9 +252,9 @@ public interface Judge {
      * @param values
      */
     static void neq0(Number... values) {
-        notNull(values, MUST_EQ0);
+        notNull(values, MUST_NEQ0);
         for (Number value : values) {
-            neq0(value, MUST_EQ0);
+            neq0(value, MUST_NEQ0);
         }
     }
 
@@ -358,7 +359,7 @@ public interface Judge {
                 Field declaredField = objectClass.getDeclaredField(field);
                 if (null != declaredField) {
                     declaredField.setAccessible(true);
-                    Judger judger = declaredField.getAnnotation(Judger.class);
+                    Judger judger = declaredField.getDeclaredAnnotation(Judger.class);
                     Class<?> fieldClass = declaredField.getType();
                     Object value = declaredField.get(object);
                     if (Number.class.isAssignableFrom(fieldClass)) {