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

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.maintenance.service;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceOption;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceOptionMapper;
+import cn.com.ty.lift.common.utils.ValuePool;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,7 +31,7 @@ public class MaintenanceOptionService extends ServiceImpl<MaintenanceOptionMappe
      */
     public List<MaintenanceOption> listByTypeAndLiftCategory(Integer type, Integer liftCategory, Long mtCompanyId) {
         LambdaQueryWrapper<MaintenanceOption> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.in(MaintenanceOption::getMtCompanyId, Arrays.asList(0, mtCompanyId));
+        lambdaQueryWrapper.in(MaintenanceOption::getMtCompanyId, Arrays.asList(ValuePool.PLATFORM_IDENTIFICATION, mtCompanyId));
         lambdaQueryWrapper.eq(MaintenanceOption::getType, type);
         lambdaQueryWrapper.eq(MaintenanceOption::getLiftCategory, liftCategory);
         return list(lambdaQueryWrapper);

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

@@ -89,41 +89,42 @@ public interface ValuePool {
     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_IP                     = LOG_PREFIX + "IP           : ";
+    String   LOG_CLASS_METHOD           = LOG_PREFIX + "CLASS_METHOD : ";
+    String   LOG_ARGS                   = LOG_PREFIX + "ARGS         : ";
+    String   LOG_RESPONSE               = LOG_PREFIX + "RESPONSE     : ";
+    String   LOG_STATUS                 = LOG_PREFIX + "STATUS       : ";
+    String   LOG_EXCEPTION              = LOG_PREFIX + "EXCEPTION    : ";
     //是否打印全部的结果
-    boolean  LOG_PRINT_ALL                            = false;
+    boolean  LOG_PRINT_ALL              = false;
     // 结果字符串 > LOG_PRINT_MAX ,格式化打印首尾(LOG_PRINT_MAX / 2)部分，中间省略
-    int      LOG_PRINT_MAX                            = 1000;
+    int      LOG_PRINT_MAX              = 1000;
     // 方法处理耗时 > LOG_GOOD_TIME,日志到warn中
-    long     LOG_GOOD_TIME                            = 10 * 1000;
+    long     LOG_GOOD_TIME              = 10 * 1000;
     // ---------------------------------------------------------------- array
-    String[] EMPTY_ARRAY                              = new String[0];
-    byte[]   BYTES_NEW_LINE                           = NEWLINE.getBytes();
+    String[] EMPTY_ARRAY                = new String[0];
+    byte[]   BYTES_NEW_LINE             = NEWLINE.getBytes();
+    long     PLATFORM_IDENTIFICATION    = 10086;
     //android平台的推送
-    String   QUEUE_ANDROID_TOKEN                      = "liftmanager_queue_android_token";
+    String   QUEUE_ANDROID_TOKEN        = "liftmanager_queue_android_token";
     //ios平台的推送
-    String   QUEUE_IOS_TOKEN                          = "liftmanager_queue_ios_token";
+    String   QUEUE_IOS_TOKEN            = "liftmanager_queue_ios_token";
     //android全平台的推送
-    String   QUEUE_ANDROID_ALL                        = "liftmanager_queue_android_all";
+    String   QUEUE_ANDROID_ALL          = "liftmanager_queue_android_all";
     //ios全平台的推送
-    String   QUEUE_IOS_ALL                            = "liftmanager_queue_ios_all";
+    String   QUEUE_IOS_ALL              = "liftmanager_queue_ios_all";
     //一次最多推送的账号个数
-    int      PUSH_MAX_SIZE                            = 1000;
+    int      PUSH_MAX_SIZE              = 1000;
     //消息推送失败后重新尝试的最多次数
-    int      PUSH_TRY_MAX_TIMES                       = 100;
-    String   PATTERN_NAME                             = "^[\u4e00-\u9fa5a-zA-Z0-9·.。;&\\s]{1,20}$";
-    String   PATTERN_TELEPHONE                        = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$";
+    int      PUSH_TRY_MAX_TIMES         = 100;
+    String   PATTERN_NAME               = "^[\u4e00-\u9fa5a-zA-Z0-9·.。;&\\s]{1,20}$";
+    String   PATTERN_TELEPHONE          = "^1[345789]\\d{9}|0[1-9](\\d{1,2}\\-?)[1-9]\\d{6,7}$";
     //======================年检相关状态值和判断方法======================================
     /**
      * 年检待完成
      */
-    int      INSPECTION_STATUS_TO_DO                  = 0;
-    int      INSPECTION_STATUS_COMPLETE               = 1;
+    int      INSPECTION_STATUS_TO_DO    = 0;
+    int      INSPECTION_STATUS_COMPLETE = 1;
     int      INSPECTION_STATUS_OVERDUE                = 2;
     /**
      * 年检 第一阶段