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

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

@@ -48,6 +48,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -234,6 +235,11 @@ public class EmergencyRepairController {
 //            request.setRepairBegin(LocalDate.now().plusDays(0 - DateUtils.daysOfYear()));
 //            request.setRepairEnd(LocalDate.now());
 //        }
+        LocalDate repairBegin = request.getRepairBegin();
+        LocalDate repairEnd = request.getRepairEnd();
+        if(Objects.nonNull(repairBegin) && Objects.nonNull(repairEnd)){
+            Validate.isTrue(repairBegin.isBefore(repairEnd), ValuePool.beginTimeIllegalToEndTime(repairBegin, repairEnd));
+        }
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
         long count = emergencyRepairService.countByCondition(request);
         return RestResponse.success(CountPage.getCountPage(count, pages));

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

@@ -67,6 +67,11 @@ public class MaintenanceRecordController {
     @Validation(fields = {"mtCompanyId"})
     public RestResponse pageRecord(@Val @RequestBody MtRecordRequest request) {
         //保养单： 按照执行日期由近及远排序
+        LocalDate planBegin = request.getPlanBegin();
+        LocalDate planEnd = request.getPlanEnd();
+        if(Objects.nonNull(planBegin) && Objects.nonNull(planEnd)){
+            Validate.isTrue(planBegin.isBefore(planEnd), ValuePool.beginTimeIllegalToEndTime(planBegin, planEnd));
+        }
         request.addDesc("work_date");
         IPage<MtRecordResponse> pages = maintenanceRecordService.pageRecordByCondition(request);
         long count = maintenanceRecordService.countRecordByCondition(request);
@@ -83,6 +88,11 @@ public class MaintenanceRecordController {
     @Validation(fields = {"mtCompanyId"})
     public RestResponse pagePlan(@Val @RequestBody MtPlanRequest request) {
         //计划超期：按计划保养时间由近及远排序
+        LocalDate planBegin = request.getPlanBegin();
+        LocalDate planEnd = request.getPlanEnd();
+        if(Objects.nonNull(planBegin) && Objects.nonNull(planEnd)){
+            Validate.isTrue(planBegin.isBefore(planEnd), ValuePool.beginTimeIllegalToEndTime(planBegin, planEnd));
+        }
         request.addDesc("plan_date");
         IPage<MtPlanResponse> pages = maintenancePlanService.pagePlanByCondition(request);
         Validate.notNull(pages, ValuePool.MAINTENANCE_PLAN_NOT_EXIST);

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

@@ -25,171 +25,177 @@ import java.util.Objects;
  */
 public interface ValuePool {
 
-    String   AMPERSAND                                = "&";
-    String   AND                                      = "and";
-    String   AT                                       = "@";
-    String   ASTERISK                                 = "*";
-    String   STAR                                     = ASTERISK;
-    String   BACK_SLASH                               = "\\";
-    String   COLON                                    = ":";
-    String   COMMA                                    = ",";
-    String   DASH                                     = "-";
-    String   DOLLAR                                   = "$";
-    String   DOT                                      = ".";
-    String   DOTDOT                                   = "..";
-    String   DOT_CLASS                                = ".class";
-    String   DOT_JAVA                                 = ".java";
-    String   EMPTY                                    = "";
-    String   EQUALS                                   = "=";
-    String   FALSE                                    = "false";
-    String   SLASH                                    = "/";
-    String   HASH                                     = "#";
-    String   HAT                                      = "^";
-    String   LEFT_BRACE                               = "{";
-    String   LEFT_BRACKET                             = "(";
-    String   LEFT_CHEV                                = "<";
-    String   NEWLINE                                  = "\n";
-    String   N                                        = "n";
-    String   NO                                       = "no";
-    String   NULL                                     = "null";
-    String   OFF                                      = "off";
-    String   ON                                       = "on";
-    String   PERCENT                                  = "%";
-    String   PIPE                                     = "|";
-    String   PLUS                                     = "+";
-    String   QUESTION_MARK                            = "?";
-    String   EXCLAMATION_MARK                         = "!";
-    String   QUOTE                                    = "\"";
-    String   RETURN                                   = "\r";
-    String   TAB                                      = "\t";
-    String   RIGHT_BRACE                              = "}";
-    String   RIGHT_BRACKET                            = ")";
-    String   RIGHT_CHEV                               = ">";
-    String   SEMICOLON                                = ";";
-    String   SINGLE_QUOTE                             = "'";
-    String   SPACE                                    = " ";
-    String   LEFT_SQ_BRACKET                          = "[";
-    String   RIGHT_SQ_BRACKET                         = "]";
-    String   TRUE                                     = "true";
-    String   UNDERSCORE                               = "_";
-    String   UTF_8                                    = "UTF-8";
-    String   ISO_8859_1                               = "ISO-8859-1";
-    String   Y                                        = "y";
-    String   YES                                      = "yes";
-    String   ONE                                      = "1";
-    String   ZERO                                     = "0";
-    String   DOLLAR_LEFT_BRACE                        = "${";
-    String   HASH_LEFT_BRACE                          = "#{";
-    String   CRLF                                     = "\r\n";
+    String   AMPERSAND                 = "&";
+    String   AND                       = "and";
+    String   AT                        = "@";
+    String   ASTERISK                  = "*";
+    String   STAR                      = ASTERISK;
+    String   BACK_SLASH                = "\\";
+    String   COLON                     = ":";
+    String   COMMA                     = ",";
+    String   DASH                      = "-";
+    String   DOLLAR                    = "$";
+    String   DOT                       = ".";
+    String   DOTDOT                    = "..";
+    String   DOT_CLASS                 = ".class";
+    String   DOT_JAVA                  = ".java";
+    String   EMPTY                     = "";
+    String   EQUALS                    = "=";
+    String   FALSE                     = "false";
+    String   SLASH                     = "/";
+    String   HASH                      = "#";
+    String   HAT                       = "^";
+    String   LEFT_BRACE                = "{";
+    String   LEFT_BRACKET              = "(";
+    String   LEFT_CHEV                 = "<";
+    String   NEWLINE                   = "\n";
+    String   N                         = "n";
+    String   NO                        = "no";
+    String   NULL                      = "null";
+    String   OFF                       = "off";
+    String   ON                        = "on";
+    String   PERCENT                   = "%";
+    String   PIPE                      = "|";
+    String   PLUS                      = "+";
+    String   QUESTION_MARK             = "?";
+    String   EXCLAMATION_MARK          = "!";
+    String   QUOTE                     = "\"";
+    String   RETURN                    = "\r";
+    String   TAB                       = "\t";
+    String   RIGHT_BRACE               = "}";
+    String   RIGHT_BRACKET             = ")";
+    String   RIGHT_CHEV                = ">";
+    String   SEMICOLON                 = ";";
+    String   SINGLE_QUOTE              = "'";
+    String   SPACE                     = " ";
+    String   LEFT_SQ_BRACKET           = "[";
+    String   RIGHT_SQ_BRACKET          = "]";
+    String   TRUE                      = "true";
+    String   UNDERSCORE                = "_";
+    String   UTF_8                     = "UTF-8";
+    String   ISO_8859_1                = "ISO-8859-1";
+    String   Y                         = "y";
+    String   YES                       = "yes";
+    String   ONE                       = "1";
+    String   ZERO                      = "0";
+    String   DOLLAR_LEFT_BRACE         = "${";
+    String   HASH_LEFT_BRACE           = "#{";
+    String   CRLF                      = "\r\n";
     //HTML
-    String   HTML_NBSP                                = "&nbsp;";
-    String   HTML_AMP                                 = "&amp";
-    String   HTML_QUOTE                               = "&quot;";
-    String   HTML_LT                                  = "&lt;";
-    String   HTML_GT                                  = "&gt;";
+    String   HTML_NBSP                 = "&nbsp;";
+    String   HTML_AMP                  = "&amp";
+    String   HTML_QUOTE                = "&quot;";
+    String   HTML_LT                   = "&lt;";
+    String   HTML_GT                   = "&gt;";
     // ----------------------------------------------------------------log
-    String   LOG_PREFIX                               = "###| ";
-    String   LOG_LINE                                 = "============================================================";
-    String   LOG_GLOBAL_EXCEPTION_LINE                = "====================== GlobalDefaultException ======================";
-    String   LOG_URL                                  = LOG_PREFIX + "URL          : ";
-    String   LOG_IP                                   = LOG_PREFIX + "IP           : ";
-    String   LOG_CLASS_METHOD                         = LOG_PREFIX + "CLASS_METHOD : ";
-    String   LOG_ARGS                                 = LOG_PREFIX + "ARGS         : ";
-    String   LOG_RESPONSE                             = LOG_PREFIX + "RESPONSE     : ";
-    String   LOG_STATUS                               = LOG_PREFIX + "STATUS       : ";
-    String   LOG_EXCEPTION                            = LOG_PREFIX + "EXCEPTION    : ";
+    String   LOG_PREFIX                = "###| ";
+    String   LOG_LINE                  = "============================================================";
+    String   LOG_GLOBAL_EXCEPTION_LINE = "====================== GlobalDefaultException ======================";
+    String   LOG_URL                   = LOG_PREFIX + "URL          : ";
+    String   LOG_IP                    = LOG_PREFIX + "IP           : ";
+    String   LOG_CLASS_METHOD          = LOG_PREFIX + "CLASS_METHOD : ";
+    String   LOG_ARGS                  = LOG_PREFIX + "ARGS         : ";
+    String   LOG_RESPONSE              = LOG_PREFIX + "RESPONSE     : ";
+    String   LOG_STATUS                = LOG_PREFIX + "STATUS       : ";
+    String   LOG_EXCEPTION             = LOG_PREFIX + "EXCEPTION    : ";
     //是否打印全部的结果
-    boolean  LOG_PRINT_ALL                            = false;
+    boolean  LOG_PRINT_ALL             = false;
     // 结果字符串 > LOG_PRINT_MAX ,格式化打印首尾(LOG_PRINT_MAX / 2)部分，中间省略
-    int      LOG_PRINT_MAX                            = 1000;
+    int      LOG_PRINT_MAX             = 1000;
     // 方法处理耗时 > LOG_GOOD_TIME,日志到warn中
-    long     LOG_GOOD_TIME                            = 10 * 1000;
+    long     LOG_GOOD_TIME             = 10 * 1000;
     // ---------------------------------------------------------------- array
-    String[] EMPTY_ARRAY                              = new String[0];
-    byte[]   BYTES_NEW_LINE                           = NEWLINE.getBytes();
-    long     PLATFORM_IDENTIFICATION                  = 10086;
+    String[] EMPTY_ARRAY               = new String[0];
+    byte[]   BYTES_NEW_LINE            = NEWLINE.getBytes();
+    long     PLATFORM_IDENTIFICATION   = 10086;
+    // ---------------推送相关-------------------------------------------------
     //android平台的推送
-    String   PUSH_QUEUE_ANDROID_TOKEN                 = "liftmanager_queue_android_token";
+    String   PUSH_QUEUE_ANDROID_TOKEN  = "liftmanager_queue_android_token";
     //ios平台的推送
-    String   PUSH_QUEUE_IOS_TOKEN                     = "liftmanager_queue_ios_token";
+    String   PUSH_QUEUE_IOS_TOKEN      = "liftmanager_queue_ios_token";
     //android全平台的推送
-    String   PUSH_QUEUE_ANDROID_ALL                   = "liftmanager_queue_android_all";
+    String   PUSH_QUEUE_ANDROID_ALL    = "liftmanager_queue_android_all";
     //ios全平台的推送
-    String   PUSH_QUEUE_IOS_ALL                       = "liftmanager_queue_ios_all";
+    String   PUSH_QUEUE_IOS_ALL        = "liftmanager_queue_ios_all";
     //一次最多推送的账号个数
-    int      PUSH_MAX_SIZE                            = 1000;
+    int      PUSH_MAX_SIZE             = 1000;
     //消息推送失败后重新尝试的最多次数
-    int      PUSH_TRY_MAX_TIMES                       = 100;
-    int PUSH_DEVICE_MODEL_ANDROID = 1;
-    int PUSH_DEVICE_MODEL_IOS = 2;
-    String   PATTERN_NAME                             = "^[\u4e00-\u9fa5a-zA-Z0-9·.。;&\\s]{1,20}$";
-    String   PATTERN_TELEPHONE                        = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$";
+    int      PUSH_TRY_MAX_TIMES        = 100;
+    int      PUSH_DEVICE_MODEL_ANDROID = 1;
+    int      PUSH_DEVICE_MODEL_IOS     = 2;
+    String   PATTERN_NAME              = "^[\u4e00-\u9fa5a-zA-Z0-9·.。;&\\s]{1,20}$";
+    String   PATTERN_TELEPHONE         = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$";
+
+    static String beginTimeIllegalToEndTime(LocalDate begin, LocalDate end) {
+        return String.format("开始时间(%tF)不能早于结束时间(%tF)", begin, end);
+    }
     //======================年检相关状态值和判断方法======================================
     /**
      * 年检待完成
      */
-    int      INSPECTION_STATUS_TO_DO                  = 0;
-    int      INSPECTION_STATUS_COMPLETE               = 1;
-    int      INSPECTION_STATUS_OVERDUE                = 2;
+    int    INSPECTION_STATUS_TO_DO                  = 0;
+    int    INSPECTION_STATUS_COMPLETE               = 1;
+    int    INSPECTION_STATUS_OVERDUE                = 2;
     /**
      * 年检 第一阶段
      */
-    int      INSPECTION_STEP_ONE                      = 1;
+    int    INSPECTION_STEP_ONE                      = 1;
     /**
      * 年检 第二阶段
      */
-    int      INSPECTION_STEP_TWO                      = 2;
+    int    INSPECTION_STEP_TWO                      = 2;
     /**
      * 年检 第三阶段
      */
-    int      INSPECTION_STEP_THREE                    = 3;
+    int    INSPECTION_STEP_THREE                    = 3;
     /**
      * 年检 第四阶段
      */
-    int      INSPECTION_STEP_FOUR                     = 4;
+    int    INSPECTION_STEP_FOUR                     = 4;
     /**
      * 1  维保工确认年检计划
      */
-    int      INSPECTION_STAGE_CONFIRM                 = 1;
+    int    INSPECTION_STAGE_CONFIRM                 = 1;
     /**
      * 2  维保工上传自检报告,选择自检时间 或者 文员设置 是否检查限速器和荷载年检设置，
      * 文员也可以上传自检报告或者确认自检报告和自检时间，自检时间以最后设置的为准
      */
-    int      INSPECTION_STAGE_SELFCHECK               = 2;
+    int    INSPECTION_STAGE_SELFCHECK               = 2;
     /**
      * 3  企业文员确认现场检验时间
      * 录入人员信息，政府质检，企业质检，联系电话
      */
-    int      INSPECTION_STAGE_CONFIRM_CHECK           = 3;
+    int    INSPECTION_STAGE_CONFIRM_CHECK           = 3;
     /**
      * 4	维保工上传检验结果
      */
-    int      INSPECTION_STAGE_UPLOAD_CHECK            = 4;
+    int    INSPECTION_STAGE_UPLOAD_CHECK            = 4;
     /**
      * 5	企业文员确认检验结果-合格 --> 不能算年检超期
      */
-    int      INSPECTION_STAGE_CHECK_QUALIFIED         = 5;
+    int    INSPECTION_STAGE_CHECK_QUALIFIED         = 5;
     /**
      * 6	企业文员确认检验结果-整改 --> 回到第二阶段
      */
-    int      INSPECTION_STAGE_CHECK_RECTIFICATION     = 6;
+    int    INSPECTION_STAGE_CHECK_RECTIFICATION     = 6;
     /**
      * 7	企业文员确认检验结果-不合格 --> 可以算年检超期
      */
-    int      INSPECTION_STAGE_CHECK_UNQUALIFIED       = 7;
+    int    INSPECTION_STAGE_CHECK_UNQUALIFIED       = 7;
     /**
      * 8	维保工上传年检报告和合格证
      */
-    int      INSPECTION_STAGE_UPLOAD_CERT_REPORT      = 8;
+    int    INSPECTION_STAGE_UPLOAD_CERT_REPORT      = 8;
     /**
      * 9	企业文员确认年检报告和合格证-合格
      */
-    int      INSPECTION_STAGE_CERT_REPORT_QUALIFIED   = 9;
+    int    INSPECTION_STAGE_CERT_REPORT_QUALIFIED   = 9;
     /**
      * 10	企业文员确认年检报告和合格证-不合格 -->停用电梯
      */
-    int      INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED = 10;
-    String   INSPECTION_NOT_EXIST                     = "年检不存在，请确认年检计划";
+    int    INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED = 10;
+    String INSPECTION_NOT_EXIST                     = "年检不存在，请确认年检计划";
+    String INSPECTION_EXIST_SAME                    = "年检计划已存在。";
 
     static String inspectionStepToNext(String previous, String current) {
         return String.format("请先完成%s再进行%s操作", previous, current);
@@ -211,7 +217,6 @@ public interface ValuePool {
         return String.format("年检必须在%s才能操作", stage);
     }
 
-    String INSPECTION_EXIST_SAME           = "年检计划已存在。";
     //===================急修相关状态值和判断方法======================================
     /**
      * 急修状态（-1 暂停中）
@@ -337,7 +342,7 @@ public interface ValuePool {
     static <T> T nullable(T object, T valueForNull) {
         return Objects.isNull(object) ? valueForNull : object;
     }
-
+    //===================维保相关======================================
     String MAINTENANCE_RECORD_NOT_EXIST     = "维保记录不存在，请核查";
     String MAINTENANCE_PLAN_NOT_EXIST       = "维保计划不存在，请核查";
     String MAINTENANCE_OPTION_NOT_EXIST     = "维保操作项不存在，请核查";

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

@@ -94,6 +94,11 @@ public class AttendanceController {
     @Validation(fields = "mtCompanyId")
     public RestResponse list(@Val @RequestBody AttendanceRequest request) {
         //签到管理: 按日期和打卡时间由近及远排序
+        LocalDate begin = request.getBegin();
+        LocalDate end = request.getEnd();
+        if(Objects.nonNull(begin) && Objects.nonNull(end)){
+            Validate.isTrue(begin.isBefore(end), ValuePool.beginTimeIllegalToEndTime(begin, end));
+        }
         request.addDesc("create_date");
 //        if (Objects.isNull(request.getClockTime())) {
 //            request.setBegin(LocalDate.now().plusDays(0 - DateUtils.daysOfYear()));