Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

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

@@ -32,13 +32,13 @@ public class GlobalDefaultExceptionHandler {
     }
 
     @ExceptionHandler(value = Exception.class)
-    public Object defaultErrorHandler(final HttpServletRequest req, final HttpServletResponse resp, final Exception error) throws Exception {
+    public Object defaultErrorHandler(final HttpServletRequest req, final HttpServletResponse resp, final Exception error) {
         // 原始错误集合数据偏多，包含native错误
         final StackTraceElement[] stackTrace = error.getStackTrace();
         // 过滤错误信息
         final List<StackTraceElement> filters = new LinkedList<>();
         for (StackTraceElement st : stackTrace)
-            if (st.getClassName().contains("cn.com.ty.lift.business") && st.getFileName().contains(".java")) filters.add(st);
+            if (st.getClassName().contains("cn.com.ty.lift.system") && st.getFileName().contains(".java")) filters.add(st);
 
         final StackTraceElement[] dwStackTrace = new StackTraceElement[filters.size()];
         // 计数器

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/GlobalSet.java

@@ -81,13 +81,11 @@ public class GlobalSet implements Serializable {
 
     public GlobalSet(){}
 
-    public GlobalSet(Long companyId, String name, int value, String code, Integer type, String description){
+    public GlobalSet(Long companyId, int value, String code, Integer type){
         this.companyId = companyId;
-        this.name = name;
         this.value = value;
         this.code = code;
         this.type = type;
-        this.description = description;
     }
 
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/GlobalSetServiceImpl.java

@@ -33,11 +33,9 @@ public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet
          *     默认值:(1)是
          */
         globalSetList.add(new GlobalSet(companyId,
-                "项目组维保工是否能查看到项目的所有电梯，并接收该项目所有维保任务",
                 ApiConstants.GlobalSetConstants.VALUE_YES,
                 ApiConstants.GlobalSetConstants.WORK_LIFT,
-                ApiConstants.GlobalSetConstants.TYPE_PROJECT,
-                "暂无"));
+                ApiConstants.GlobalSetConstants.TYPE_PROJECT));
         /**
          * 名称:2.维保类型选项
          * 类型:电梯保养设置 值为2
@@ -46,11 +44,9 @@ public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet
          *     默认值:2:文员选择
          */
         globalSetList.add(new GlobalSet(companyId,
-                "维保类型选项",
                 ApiConstants.GlobalSetConstants.MT_CLERK_CHOOSE,
                 ApiConstants.GlobalSetConstants.MT_TYPE_OPTION,
-                ApiConstants.GlobalSetConstants.TYPE_LIFT,
-                "暂无"));
+                ApiConstants.GlobalSetConstants.TYPE_LIFT));
 
         /**
          * 名称:3.可同时签到保养的台量
@@ -59,11 +55,9 @@ public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet
          *     默认值:1
          */
         globalSetList.add(new GlobalSet(companyId,
-                "可同时签到保养的台量",
                 1,
                 ApiConstants.GlobalSetConstants.MT_SAME_UNITS,
-                ApiConstants.GlobalSetConstants.TYPE_LIFT,
-                "暂无"));
+                ApiConstants.GlobalSetConstants.TYPE_LIFT));
 
         /**
          * 名称:4.签退时，是否需要定位
@@ -73,11 +67,9 @@ public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet
          *     默认值:(0)否
          */
         globalSetList.add(new GlobalSet(companyId,
-                "签退时，是否需要定位",
                 ApiConstants.GlobalSetConstants.VALUE_NO,
                 ApiConstants.GlobalSetConstants.SIGN_OUT_LOCATE,
-                ApiConstants.GlobalSetConstants.TYPE_LIFT,
-                "暂无"));
+                ApiConstants.GlobalSetConstants.TYPE_LIFT));
         /**
          * 名称:5.保养单是否显示停梯时间和恢复时间
          * 类型:电梯保养设置 值为2
@@ -86,11 +78,9 @@ public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet
          *     默认值:(0)否
          */
         globalSetList.add(new GlobalSet(companyId,
-                "保养单是否显示停梯时间和恢复时间",
                 ApiConstants.GlobalSetConstants.VALUE_NO,
                 ApiConstants.GlobalSetConstants.SHOW_LIFT_TIME,
-                ApiConstants.GlobalSetConstants.TYPE_LIFT,
-                "暂无"));
+                ApiConstants.GlobalSetConstants.TYPE_LIFT));
         /**
          * 名称:6.默认维保间隔
          * 类型:电梯保养设置 值为2
@@ -98,11 +88,9 @@ public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet
          *     默认值:15
          */
         globalSetList.add(new GlobalSet(companyId,
-                "默认维保间隔",
                 15,
                 ApiConstants.GlobalSetConstants.MT_INTERVAL,
-                ApiConstants.GlobalSetConstants.TYPE_LIFT,
-                "暂无"));
+                ApiConstants.GlobalSetConstants.TYPE_LIFT));
         /**
          * 名称:7.补录权限
          * 类型:电梯保养设置 值为2
@@ -111,11 +99,9 @@ public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet
          *     默认值:(1)文员补录
          */
         globalSetList.add(new GlobalSet(companyId,
-                "补录权限",
                 ApiConstants.GlobalSetConstants.CLERK_ADD,
                 ApiConstants.GlobalSetConstants.ADD_AUTHORITY,
-                ApiConstants.GlobalSetConstants.TYPE_LIFT,
-                "暂无"));
+                ApiConstants.GlobalSetConstants.TYPE_LIFT));
         this.saveBatch(globalSetList);
     }
 }