Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_new_patrol

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -408,4 +408,24 @@ public class DataDictionaryController extends BaseController {
 		return ResponseHelper.buildResponse(iDataDictionaryService.getByParent(parent));
 
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/dataDictionary/{type}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
+	public ResponseModel<Object> dataDictionary(@PathVariable String type) throws Exception {
+		QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("type", type);
+		queryWrapper.orderByAsc("sort_num");
+
+		if (redisUtils.hasKey(RedisKey.DATA_DICTIONARY_CODE + type)) {
+			Object obj = redisUtils.get(RedisKey.DATA_DICTIONARY_CODE + type);
+			return ResponseHelper.buildResponse(obj);
+		} else {
+			Collection<DataDictionary> list = iDataDictionaryService.list(queryWrapper);
+			List<MenuFrom> menus = TreeParser.getTreexin(null, list, DataDictionary.class.getName(), "getCode", 0,
+					"getName", "getParent", null);
+			redisUtils.set(RedisKey.DATA_DICTIONARY_CODE + type, JSON.toJSON(menus), time);
+			return ResponseHelper.buildResponse(menus);
+		}
+	}
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/EquipmentClassifityEnum.java

@@ -21,12 +21,17 @@ public enum EquipmentClassifityEnum {
     YLSS("大型游乐设施","6000"),
     KYSD("压力管道元件","9000"),
     YLGD("压力管道","8000"),
+    QP("气瓶","2300"),
+
     //树类型
 
     //设备认领状态
     SBRLZT("设备认领状态","rlzt"),
     BDLS("八大类树","eightCategory"),
-    RENLING("其他","other");
+    RENLING("其他","other"),
+
+    CYLINDER("气瓶","cylinder");
+
     private String name;
     private String code;
     public static Map<String,String> getName=new HashMap<>();

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/IEquipmentCategoryService.java

@@ -17,30 +17,36 @@ import java.util.Map;
  */
 public interface IEquipmentCategoryService {
 
-    List<Map<String,Object>> equipTree(String type);
+	List<Map<String, Object>> equipTree(String type);
 
-    Page equipClaimOverview();
+	Page equipClaimOverview();
 
-    Map<String, String> createSupervisorCode(Map<String, Object> map, String record);
+	Map<String, String> createSupervisorCode(Map<String, Object> map, String record);
 
-    List<LinkedHashMap> getTree();
-    List<LinkedHashMap> creatTree();
+	List<LinkedHashMap> getTree();
 
-    List<LinkedHashMap> getRegion(String level, String parentId);
+	List<LinkedHashMap> creatTree();
 
-    Map<String,Object> getCategoryAndDefineByRecord(String rowId);
+	List<LinkedHashMap> getRegion(String level, String parentId);
 
-    List<CategoryOtherInfo> checkCode(Map<String, Object> obj);
+	Map<String, Object> getCategoryAndDefineByRecord(String rowId);
 
-    List<String> updateOtherInfo(Map<String, Object> map);
+	List<CategoryOtherInfo> checkCode(Map<String, Object> obj);
 
-    Map<String,Map<String,Object>> getFormRecordById(Map<String, Object> map);
+	List<String> updateOtherInfo(Map<String, Object> map);
 
-    void checkEsData(String id);
+	Map<String, Map<String, Object>> getFormRecordById(Map<String, Object> map);
 
-    void createEquipmentCategoryData();
+	void checkEsData(String id);
 
-    List<String> deleteBatch(Map<String, Object> map);
+	void createEquipmentCategoryData();
 
-    ResponseModel submit(Map<String, Object> map);
+	List<String> deleteBatch(Map<String, Object> map);
+
+	ResponseModel submit(Map<String, Object> map);
+
+	/**
+	 * 企业设备树查询
+	 */
+	List<Map<String, Object>> unitEquipTree();
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/json/equipCategory.json

@@ -114,5 +114,11 @@
       "name": "客运索道",
       "code": "9000"
     }
+  ],
+  "cylinder": [
+    {
+      "instanceName": "气瓶",
+      "instanceId": "2300"
+    }
   ]
 }
\ No newline at end of file