*）模板配置表单中的部分API，减少网络请求

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
+import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.jyjc.biz.util.DpSubUtils;
 import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonValueUtils;
 import com.yeejoin.amos.boot.module.jyjc.biz.util.RestTemplateUtils;
@@ -47,6 +50,9 @@ public class DPSubServiceImpl {
     @LoadBalanced
     private RestTemplate restTemplate;
 
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+
     public JSONObject commonQuery(String template, @RequestBody Map<String, Object> param) {
         JSONObject result = new JSONObject();
         String templateJson = DpSubUtils.getFileContent(template + ".json");
@@ -378,11 +384,25 @@ public class DPSubServiceImpl {
         Object value = apiResult.get(fieldKey);
 
         Object paramFieldKeys = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.paramFieldKeys");
+        Object dictionaryFieldKeys = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.dictionaryFieldKeys");
         JSONObject param = tab.getJSONObject("param");
         jsonObject.put("type", "text");
         jsonObject.put("value", value);
         if (!ValidationUtil.isEmpty(paramFieldKeys) && ((JSONArray) paramFieldKeys).contains(fieldKey)){
             jsonObject.put("value", param.getString(fieldKey));
+        } else if(!ValidationUtil.isEmpty(dictionaryFieldKeys) && ((JSONArray) dictionaryFieldKeys).stream().anyMatch(map -> fieldKey.equals(((JSONObject) map).getString("fieldKey")))){
+            ((JSONArray) dictionaryFieldKeys).stream().filter(map -> fieldKey.equals(((JSONObject) map).getString("fieldKey"))).findFirst().ifPresent(y -> {
+                JSONObject yObj = (JSONObject) y;
+                String dictionaryType = yObj.getString("dictionaryType");
+                try {
+                    List<DataDictionary> dataDictionaryList = iDataDictionaryService.getByType(dictionaryType);
+                    dataDictionaryList.stream().filter(dataDictionary -> dataDictionary.getCode().equals(value)).findFirst().ifPresent(map -> {
+                        jsonObject.put("value", map.getName());
+                    });
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
         } else {
             if ("upload".equals(xObj.getString("componentKey"))) {
                 JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/company.json

@@ -14,7 +14,17 @@
             "useCode": "{useUnitCode}"
           }
         },
-        "resultConvert": ""
+        "resultConvert": "",
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "industrySupervisor",
+            "dictionaryType": "HYZGBM"
+          },
+          {
+            "fieldKey": "registeredOrganCode",
+            "dictionaryType": "DJJG"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_1000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {
@@ -35,7 +49,21 @@
           "ruleData": {
             "responseSuccess": "data.result.equipParams"
           }
-        }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "DEVICE_LEVEL",
+            "dictionaryType": "GLJB"
+          },
+          {
+            "fieldKey": "FUEL_TYPE",
+            "dictionaryType": "GLZL"
+          },
+          {
+            "fieldKey": "NAME_OF_PRESSURE_PARTS",
+            "dictionaryType": "GLBJMC"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_2000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {
@@ -35,7 +49,25 @@
           "ruleData": {
             "responseSuccess": "data.result.equipParams"
           }
-        }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "QP_LOSSLESS",
+            "dictionaryType": "RQJCFF"
+          },
+          {
+            "fieldKey": "RQJCFF",
+            "dictionaryType": "RQJCFF"
+          },
+          {
+            "fieldKey": "MAIN_STRUCTURE_TYPE",
+            "dictionaryType": "RQJG"
+          },
+          {
+            "fieldKey": "CHECK_LOSSLESS",
+            "dictionaryType": "RQJCFF"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_3000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {
@@ -35,7 +49,21 @@
           "ruleData": {
             "responseSuccess": "data.result.equipParams"
           }
-        }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "CONTROL_MODE",
+            "dictionaryType": "KZFS"
+          },
+          {
+            "fieldKey": "EXPLOSIONPROOF_GRADE",
+            "dictionaryType": "FBDJ"
+          },
+          {
+            "fieldKey": "JACKING_TYPE",
+            "dictionaryType": "DSXS"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_4000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {
@@ -35,7 +49,17 @@
           "ruleData": {
             "responseSuccess": "data.result.equipParams"
           }
-        }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "WORK_LEVEL",
+            "dictionaryType": "GZJB"
+          },
+          {
+            "fieldKey": "select_bq8h7v9tj1",
+            "dictionaryType": "FBDJ"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_5000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {
@@ -35,7 +49,13 @@
           "ruleData": {
             "responseSuccess": "data.result.equipParams"
           }
-        }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "PROTECT_GRADE",
+            "dictionaryType": "FBDJ"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_6000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_8000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {
@@ -35,7 +49,13 @@
           "ruleData": {
             "responseSuccess": "data.result.equipParams"
           }
-        }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "GDLB",
+            "dictionaryType": "GDLB"
+          }
+        ]
       }
     },
     {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_9000.json

@@ -17,7 +17,21 @@
             "responseSuccess": "data.result.equipInfo"
           }
         },
-        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"],
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "IMPORTED",
+            "dictionaryType": "BOOLEN"
+          },
+          {
+            "fieldKey": "USE_PLACE",
+            "dictionaryType": "ADDRESS"
+          },
+          {
+            "fieldKey": "INSPECT_CONCLUSION",
+            "dictionaryType": "JYJL"
+          }
+        ]
       }
     },
     {
@@ -35,7 +49,13 @@
           "ruleData": {
             "responseSuccess": "data.result.equipParams"
           }
-        }
+        },
+        "dictionaryFieldKeys": [
+          {
+            "fieldKey": "CARRIER_LINE",
+            "dictionaryType": "YZS"
+          }
+        ]
       }
     },
     {