1.大屏业务模块详情代码提交

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/StringUtils.java

@@ -30,7 +30,7 @@ public class StringUtils {
      * @param map
      * @return
      */
-    public static String transMap2UrlParam(Map<String, Object> map) {
+    public static String transMap2UrlParam(String url,Map<String, Object> map) {
 
         StringBuilder stringBuilder = new StringBuilder();
         for (Map.Entry entry : map.entrySet()) {
@@ -39,11 +39,12 @@ public class StringUtils {
                 continue;
             try {
                 stringBuilder.append("&").append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(), "UTF-8"));
+                url = url.replaceAll("\\{"+entry.getKey()+"}",entry.getValue()+"");
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
         }
-        return stringBuilder.toString();
+        return url + stringBuilder.toString();
     }
 
     /**
@@ -52,16 +53,17 @@ public class StringUtils {
      * @param list
      * @return
      */
-    public static String transList2UrlParam(List<Map<String, Object>> list) {
+    public static String transList2UrlParam(String url,List<Map<String, Object>> list) {
         StringBuilder stringBuilder = new StringBuilder();
         list.forEach(x -> {
             Map<String, Object> map = JSONObject.parseObject(JSON.toJSONString(x));
             try {
                 stringBuilder.append("&").append(map.get("key")).append("=").append(URLEncoder.encode(map.get("value").toString(), "UTF-8"));
+                url.replaceAll("{"+map.get("key")+"}",map.get("value")+"");
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
             }
         });
-        return stringBuilder.toString();
+        return url + stringBuilder.toString();
     }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/DPSubController.java

@@ -77,6 +77,22 @@ public class DPSubController {
         } else if(template.equals("inspection")) { // 报检
             template = template + "_" + param.get("equListCode");
             Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
+        } else if(template.equals("sydj")){
+            Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
+            if("vehicle".equals(param.get("bType"))){
+                template = template + "_" + param.get("bType");
+            }
+        } else if(template.equals("azgz")){
+            Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
+        } else if(template.equals("jdjy")){
+            Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
+        } else if(template.equals("dqjy")){
+            Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
+        } else if(template.equals("bgdj")){
+            Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
+            template = template + "_" + param.get("bType");
+        } else if(template.equals("zxbf")){
+            Assert.notNull(param.get("sequenceNbr"), "sequenceNbr不能为空");
         } else {
             throw new RuntimeException("暂无模板");
         }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/azgz.json

+{
+  "name": "安装告知",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "安装告知详情",
+      "renderType": "basic",
+      "formSeq": "1734107811517853698",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-installation-notice/details",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.installationInfo"
+          }
+        }
+      },
+      "subResultParams": ["province","city","county","orgBranchCode","factoryUseSiteStreet","installLeaderId",
+        "useUnitCreditCode","propertyUnitName"]
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_cyqp.json

+{
+  "name": "车用气瓶变更",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "车用气瓶变更详情",
+      "renderType": "basic",
+      "formSeq": "1811232965410189314",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-change-vehicle-registration-unit/details",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      },
+      "subResultParams": ["useUnitCreditCode","receiveOrgCode","orgBranchCode"]
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_dw.json

+{
+  "name": "单位变更",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "单位变更详情",
+      "renderType": "basic",
+      "formSeq": "1738022519656443905",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-change-registration-unit/details",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.changeRegisInfo"
+          }
+        }
+      },
+      "subResultParams": ["useUnitCreditCode","receiveOrgCode","newUseUnitName"]
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_gm.json

+{
+  "name": "更名变更",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "更名变更详情",
+      "renderType": "basic",
+      "formSeq": "1739185443716493313",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-change-registration-name/details",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.jgRegistrationInfo"
+          }
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_gz.json

+{
+  "name": "改造变更",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "改造变更详情",
+      "renderType": "basic",
+      "formSeq": "1737034262198120450",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-change-registration-reform/getDetail",
+          "params": {
+            "currentDocumentId": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      },
+      "subResultParams": ["receiveCompanyCode"]
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/bgdj_yz.json

+{
+  "name": "移装变更",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "移装变更详情",
+      "renderType": "basic",
+      "formSeq": "1737063574276173826",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-change-registration-transfer/detail",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.changeRegistrationTransfer"
+          }
+        }
+      },
+      "subResultParams": ["receiveCompanyCode","transferProvince","transferCity","transferCounty","transferStreet",
+                  "orgBranchCode","transferUseInfo","transferSafetyManager"]
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/dqjy.json

+{
+  "name": "定期检验",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "定期检验详情",
+      "renderType": "basic",
+      "formSeq": "1735144325639073793",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jyjc/jyjc-inspection-application/{sequenceNbr}",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/jdjy.json

+{
+  "name": "监督检验",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "监督检验详情",
+      "renderType": "basic",
+      "formSeq": "1734854656288387074",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jyjc/jyjc-inspection-application/{sequenceNbr}",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/sydj.json

+{
+  "name": "使用登记",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "使用登记详情",
+      "renderType": "basic",
+      "formSeq": "1744311337623777282",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-use-registration/getDetail",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      },
+      "subResultParams": ["orgBranchCode","receiveOrgCode","estateUnitName"]
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/sydj_vehicle.json

+{
+  "name": "使用登记",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "车用气瓶登记详情",
+      "renderType": "basic",
+      "formSeq": "1770000499483897858",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-vehicle-information/details",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result"
+          }
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/zxbf.json

+{
+  "name": "注销报废",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "注销报废详情",
+      "renderType": "basic",
+      "formSeq": "1737366819582275586",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/jg-scrap-cancel/details",
+          "params": {
+            "sequenceNbr": "{sequenceNbr}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.jgScrapCancelAdd"
+          }
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file