feature 代码提交

bs-common/src/main/java/com/rongwei/safecommon/fegin/CXHysitx.java

@@ -51,7 +51,7 @@ public class CXHysitx implements CXCommonFeginClient {
     }
 
     @Override
-    public R upload(MultipartFile file) {
+    public R upload(MultipartFile file,String relationid) {
         return null;
     }
 

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -15,6 +15,12 @@ public class SaveConstans {
     public final static String ORGTYPE_CHEJIAN = "chejian";
     // 部门类型：工段
     public final static String ORGTYPE_GONGDUAN = "gongduan";
+    public static final Map<String, String> COMPANY_MAP = new HashMap<String, String>() {{
+        put("0001651000000015EFDD", "山东创新箔材科技有限公司");
+        put("0001651000000017DRZ1", "山东创新精铝金属制造有限公司");
+        put("0001S31000000000J0TR", "山东创新板材有限公司");
+    }};
+
     /**
      * 集团领导
      */
@@ -22,7 +28,7 @@ public class SaveConstans {
 
     public static final String MINUS_ONE = "-1";
     public static final String AND = "and";
-    public static final String DEFAULT_SEPARATOR="-;-";
+    public static final String DEFAULT_SEPARATOR = "-;-";
 
     /**
      * orgId和 code的对应关系
@@ -459,6 +465,24 @@ public class SaveConstans {
         /**
          * 车间维修主管
          */
-        public static final String WMS ="wms";
+        public static final String WMS = "wms";
+    }
+
+    /**
+     * 数据字典
+     */
+    public static class DictType {
+        /**
+         * 隐患任务- 任务来源
+         */
+        public static final String TASK_SOURCE_TYPE = "task_source_type";
+        /**
+         * 隐患类型
+         */
+        public static final String HIDDEN_DANGER_TYPE = "hidden_danger_type";
+        /**
+         * 跟踪状态
+         */
+        public static final String TRACK_STATUS = "track_status";
     }
 }