优化：设备管理功能，支持根据设备分类，给指定的设备分类表里添加数据

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsBoilerService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
+
 /**
  * 安全追溯-锅炉接口类
  *
@@ -9,4 +11,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
  */
 public interface IIdxBizJgTechParamsBoilerService {
 
+    void saveOrUpdateData(IdxBizJgTechParamsBoiler boiler);
+
+    IdxBizJgTechParamsBoiler getOneData(String record);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsLiftingService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
+
 /**
  * 安全追溯-起重机械接口类
  *
@@ -9,4 +11,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
  */
 public interface IIdxBizJgTechParamsLiftingService {
 
+    void saveOrUpdateData(IdxBizJgTechParamsLifting lifting);
+
+    IdxBizJgTechParamsLifting getOneData(String record);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsPipelineService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
+
 /**
  * 安全追溯-压力管道接口类
  *
@@ -9,4 +11,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
  */
 public interface IIdxBizJgTechParamsPipelineService {
 
+    void saveOrUpdateData(IdxBizJgTechParamsPipeline pipeline);
+
+    IdxBizJgTechParamsPipeline getOneData(String record);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsRidesService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
+
 /**
  * 安全追溯-游乐设施接口类
  *
@@ -9,4 +11,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
  */
 public interface IIdxBizJgTechParamsRidesService {
 
+    void saveOrUpdateData(IdxBizJgTechParamsRides rides);
+
+    IdxBizJgTechParamsRides getOneData(String record);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsRopewayService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
+
 /**
  * 安全追溯-索道接口类
  *
@@ -9,4 +11,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
  */
 public interface IIdxBizJgTechParamsRopewayService {
 
+    void saveOrUpdateData(IdxBizJgTechParamsRopeway ropeway);
+
+    IdxBizJgTechParamsRopeway getOneData(String record);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsVehicleService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
+
 /**
  * 安全追溯-场内车辆接口类
  *
@@ -9,4 +11,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
  */
 public interface IIdxBizJgTechParamsVehicleService {
 
+    void saveOrUpdateData(IdxBizJgTechParamsVehicle vehicle);
+
+    IdxBizJgTechParamsVehicle getOneData(String record);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgTechParamsVesselService.java

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
+
 /**
  * 安全追溯-压力容器接口类
  *
@@ -9,4 +11,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
  */
 public interface IIdxBizJgTechParamsVesselService {
 
+    void saveOrUpdateData(IdxBizJgTechParamsVessel vessel);
+
+    IdxBizJgTechParamsVessel getOneData(String record);
 }

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

@@ -17,6 +17,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgRegisterInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
@@ -24,7 +25,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.poi.ss.formula.functions.T;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -60,8 +60,18 @@ import static com.alibaba.fastjson.JSON.toJSONString;
  */
 @Service
 public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegisterInfoDto, IdxBizJgRegisterInfo, IdxBizJgRegisterInfoMapper> implements IIdxBizJgRegisterInfoService {
-    //设备信息表单id
-    private static final String EQUIPMENT_INFO_FORM_ID = "1734504628768239617";
+    // 设备分类表单id
+    private static final String EQUIP_CLASS_FORM_ID = "equipClass";
+    // 设备基本信息表单id
+    private static final String EQUIP_INFO_FORM_ID = "equipInfo";
+    // 设备技术参数表单id
+    private static final String EQUIP_PARAMS_FORM_ID = "equipParams";
+    // 主要零部件
+    private static final String EQUIP_MAINPARTS_FORM_ID = "mainParts";
+    // 安全附件
+    private static final String EQUIP_PROTECTIONDEVICES_FORM_ID = "protectionDevices";
+
+
     private static final String EQUSTATE = "EQU_STATE";
     private static final String CONSTRUCTIONTYPE = "CONSTRUCTION_TYPE";
     private static final String EQUDEFINE = "EQU_DEFINE";
@@ -71,11 +81,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final String OPERATESAVE = "save";
     private static final String OPERATEEDIT = "edit";
 
-    // 主要零部件
-    private static final String main_parts = "mainParts";
-    // 安全附件
-    private static final String protection_devices = "ProtectionDevices";
-
     @Autowired
     RestHighLevelClient restHighLevelClient;
 
@@ -101,6 +106,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     @Autowired
     IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
     @Autowired
+    IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
+    @Autowired
+    IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
+    @Autowired
+    IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
+    @Autowired
+    IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
+    @Autowired
+    IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
+    @Autowired
+    IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
+    @Autowired
+    IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
+    @Autowired
     IIdxBizJgMainPartsService iIdxBizJgMainPartsService;
     @Autowired
     IIdxBizJgProtectionDevicesService iIdxBizJgProtectionDevicesService;
@@ -190,95 +209,223 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
      */
     public Map<String, Map<String, Object>> getEquipmentRegisterByRecord(String record) {
         Map<String, Map<String, Object>> resultMap = new HashMap<>();
-        Map<String, Object> objMap = getStringObjectMap(record, "");
+        // 设备种类
+        Map<String, Object> equIpClassMap = this.getEquIpClassMap(record, "");
+        // 设备注册信息
+        Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "");
+        if (!ValidationUtil.isEmpty(equIpClassMap)) {
+            resultMap.put(EQUIP_CLASS_FORM_ID, equIpClassMap);
+        }
+        if (!ValidationUtil.isEmpty(equipInfoMap)) {
+            resultMap.put(EQUIP_INFO_FORM_ID, equipInfoMap);
+        }
+        //设备参数
+        if (equIpClassMap.containsKey("EQU_LIST") && !ValidationUtil.isEmpty(equIpClassMap.get("EQU_LIST").toString())) {
+            Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get("EQU_LIST").toString());
+
+            if (!ValidationUtil.isEmpty(equipParamsMap)) {
+                resultMap.put(EQUIP_PARAMS_FORM_ID, equipParamsMap);
+            }
+        }
+        return resultMap;
+    }
+
+    public Map<String, Object> getDetailByRecord(String record) {
+        Map<String, Object> resultMap = new HashMap<>();
+        // 设备种类
+        Map<String, Object> equIpClassMap = this.getEquIpClassMap(record, "");
+        // 设备注册信息
+        Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "");
+        if (!ValidationUtil.isEmpty(equIpClassMap)) {
+            resultMap.putAll(equIpClassMap);
+        }
+        if (!ValidationUtil.isEmpty(equipInfoMap)) {
+            resultMap.putAll(equipInfoMap);
+        }
+        //设备参数
+        if (equIpClassMap.containsKey("EQU_LIST") && !ValidationUtil.isEmpty(equIpClassMap.get("EQU_LIST").toString())) {
+            Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "", equIpClassMap.get("EQU_LIST").toString());
 
-        if (!ValidationUtil.isEmpty(objMap)) {
-            resultMap.put(EQUIPMENT_INFO_FORM_ID, objMap);
+            if (!ValidationUtil.isEmpty(equipParamsMap)) {
+                resultMap.putAll(equipParamsMap);
+            }
         }
         return resultMap;
     }
 
+    public Map<String, Object> getDetailFieldCamelCaseByRecord(String record) {
+        Map<String, Object> resultMap = new HashMap<>();
+        // 设备种类
+        Map<String, Object> equIpClassMap = this.getEquIpClassMap(record, "CamelCase");
+        // 设备注册信息
+        Map<String, Object> equipInfoMap = this.getEquipInfoMap(record, "CamelCase");
+        if (!ValidationUtil.isEmpty(equIpClassMap)) {
+            resultMap.putAll(equIpClassMap);
+        }
+        if (!ValidationUtil.isEmpty(equipInfoMap)) {
+            resultMap.putAll(equipInfoMap);
+        }
+        //设备参数
+        if (equIpClassMap.containsKey("EQU_LIST") && !ValidationUtil.isEmpty(equIpClassMap.get("EQU_LIST").toString())) {
+            Map<String, Object> equipParamsMap = this.getEquipParamsMap(record, "CamelCase", equIpClassMap.get("EQU_LIST").toString());
+            if (!ValidationUtil.isEmpty(equipParamsMap)) {
+                resultMap.putAll(equipParamsMap);
+            }
+        }
+        return resultMap;
+    }
+
+
     /**
+     * 查询设备种类信息
+     *
      * @param record    设备Id
      * @param fieldType 返回字段类型【CamelCase:驼峰命名，“”：纯大写加下划线】
      * @return
      */
-    private Map<String, Object> getStringObjectMap(String record, String fieldType) {
+    private Map<String, Object> getEquIpClassMap(String record, String fieldType) {
         Map<String, Object> objMap = new HashMap<>();
-        String province="";
-        String city="";
-        String county="";
-        String street="";
-        String fullAddress="";
+        //注册登记
+        IdxBizJgRegisterInfo registerInfo = this.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", record));
+        if (!ValidationUtil.isEmpty(registerInfo)) {
+            String equCategory = registerInfo.getEquCategory();//设备类别
+            String equDefine = registerInfo.getEquDefine();//设备品种
+            List<EquipmentCategory> categoryList1 = commonService.getEquipmentCategoryList(equCategory, null);
+            List<EquipmentCategory> categoryList2 = commonService.getEquipmentCategoryList(equDefine, null);
+            Map<String, Object> registerInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
+                registerInfoMap = Bean.BeantoMap(registerInfo);
+                registerInfoMap.put("registerinfoSeq", registerInfo.getSequenceNbr());
+                registerInfoMap.put("sequenceNbr", registerInfo.getSequenceNbr());
+                registerInfoMap.put("productPhoto", JSON.parseArray(registerInfo.getProductPhoto()));
+                if (CollectionUtils.isNotEmpty(categoryList1)) {
+                    registerInfoMap.put("equCategoryDesc", categoryList1.get(0).getName());
+                }
+                if (CollectionUtils.isNotEmpty(categoryList2)) {
+                    registerInfoMap.put("equDefineDesc", categoryList2.get(0).getName());
+                }
+            } else {
+                String[] fields = {"PRODUCT_PHOTO"};
+                registerInfoMap = convertCamelToUnderscore(registerInfo, fields);
+                registerInfoMap.put("REGISTERINFO_SEQ", registerInfo.getSequenceNbr());
+                registerInfoMap.put("SEQUENCE_NBR", registerInfo.getSequenceNbr());
+                if (CollectionUtils.isNotEmpty(categoryList1)) {
+                    registerInfoMap.put("EQU_CATEGORY_DESC", categoryList1.get(0).getName());
+                }
+                if (CollectionUtils.isNotEmpty(categoryList2)) {
+                    registerInfoMap.put("EQU_DEFINE_DESC", categoryList2.get(0).getName());
+                }
+            }
+            if (!registerInfoMap.isEmpty()) {
+                objMap.putAll(registerInfoMap);
+            }
+        }
+        return objMap;
+    }
+
+    /**
+     * 查询设备基本信息
+     *
+     * @param record    设备Id
+     * @param fieldType 返回字段类型【CamelCase:驼峰命名，“”：纯大写加下划线】
+     * @return
+     */
+    private Map<String, Object> getEquipInfoMap(String record, String fieldType) {
+        Map<String, Object> objMap = new HashMap<>();
+        String province = "";
+        String city = "";
+        String county = "";
+        String street = "";
+        String fullAddress = "";
         //使用信息
         IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(useInfo)) {
 
-            if(!ValidationUtil.isEmpty(useInfo.getProvince()) && !ValidationUtil.isEmpty(useInfo.getProvinceName())){
-                province = useInfo.getProvince()+"_"+useInfo.getProvinceName();
+            if (!ValidationUtil.isEmpty(useInfo.getProvince()) && !ValidationUtil.isEmpty(useInfo.getProvinceName())) {
+                province = useInfo.getProvince() + "_" + useInfo.getProvinceName();
                 fullAddress += useInfo.getProvinceName();
             }
-            if(!ValidationUtil.isEmpty(useInfo.getCity()) && !ValidationUtil.isEmpty(useInfo.getCityName())) {
+            if (!ValidationUtil.isEmpty(useInfo.getCity()) && !ValidationUtil.isEmpty(useInfo.getCityName())) {
                 city = useInfo.getCity() + "_" + useInfo.getCityName();
                 fullAddress += useInfo.getCityName();
             }
-            if(!ValidationUtil.isEmpty(useInfo.getCounty()) && !ValidationUtil.isEmpty(useInfo.getCountyName())) {
+            if (!ValidationUtil.isEmpty(useInfo.getCounty()) && !ValidationUtil.isEmpty(useInfo.getCountyName())) {
                 county = useInfo.getCounty() + "_" + useInfo.getCountyName();
                 fullAddress += useInfo.getCountyName();
             }
-            if(!ValidationUtil.isEmpty(useInfo.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(useInfo.getStreetName())) {
+            if (!ValidationUtil.isEmpty(useInfo.getFactoryUseSiteStreet()) && !ValidationUtil.isEmpty(useInfo.getStreetName())) {
                 street = useInfo.getFactoryUseSiteStreet() + "_" + useInfo.getStreetName();
                 fullAddress += useInfo.getStreetName();
             }
-            if(!ValidationUtil.isEmpty(useInfo.getAddress())) {
+            if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
                 fullAddress += useInfo.getAddress();
             }
 
-            Map<String, Object> useInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> useInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 useInfoMap = Bean.BeantoMap(useInfo);
-                if(!ValidationUtil.isEmpty(province)){ useInfoMap.put("province", province); }
-                if(!ValidationUtil.isEmpty(city)) { useInfoMap.put("city", city); }
-                if(!ValidationUtil.isEmpty(county)) { useInfoMap.put("county", county); }
-                if(!ValidationUtil.isEmpty(street)) { useInfoMap.put("street", street); }
-                if(!ValidationUtil.isEmpty(fullAddress)) { useInfoMap.put("fullAddress", fullAddress); }
+                if (!ValidationUtil.isEmpty(province)) {
+                    useInfoMap.put("province", province);
+                }
+                if (!ValidationUtil.isEmpty(city)) {
+                    useInfoMap.put("city", city);
+                }
+                if (!ValidationUtil.isEmpty(county)) {
+                    useInfoMap.put("county", county);
+                }
+                if (!ValidationUtil.isEmpty(street)) {
+                    useInfoMap.put("street", street);
+                }
+                if (!ValidationUtil.isEmpty(fullAddress)) {
+                    useInfoMap.put("fullAddress", fullAddress);
+                }
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
-            }else {
+            } else {
                 useInfoMap = convertCamelToUnderscore(useInfo, null);
-                if(!ValidationUtil.isEmpty(province)){ useInfoMap.put("PROVINCE", province); }
-                if(!ValidationUtil.isEmpty(city)) { useInfoMap.put("CITY", city); }
-                if(!ValidationUtil.isEmpty(county)) { useInfoMap.put("COUNTY", county); }
-                if(!ValidationUtil.isEmpty(street)) { useInfoMap.put("STREET", street); }
-                if(!ValidationUtil.isEmpty(fullAddress)){ useInfoMap.put("FULLADDRESS", fullAddress); }
+                if (!ValidationUtil.isEmpty(province)) {
+                    useInfoMap.put("PROVINCE", province);
+                }
+                if (!ValidationUtil.isEmpty(city)) {
+                    useInfoMap.put("CITY", city);
+                }
+                if (!ValidationUtil.isEmpty(county)) {
+                    useInfoMap.put("COUNTY", county);
+                }
+                if (!ValidationUtil.isEmpty(street)) {
+                    useInfoMap.put("STREET", street);
+                }
+                if (!ValidationUtil.isEmpty(fullAddress)) {
+                    useInfoMap.put("FULLADDRESS", fullAddress);
+                }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
             }
-            if(!useInfoMap.isEmpty()){
+            if (!useInfoMap.isEmpty()) {
                 objMap.putAll(useInfoMap);
             }
         }
         //设计制造
         IdxBizJgDesignInfo designInfo = iIdxBizJgDesignInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(designInfo)) {
-            Map<String, Object> designInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> designInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 designInfoMap = Bean.BeantoMap(designInfo);
                 designInfoMap.put("designinfoSeq", designInfo.getSequenceNbr());
                 designInfoMap.put("designDoc", JSON.parseArray(designInfo.getDesignDoc()));
                 designInfoMap.put("designStandard", JSON.parseArray(designInfo.getDesignStandard()));
-            }else {
+            } else {
                 String[] fields = {"DESIGN_DOC", "DESIGN_STANDARD"};
                 designInfoMap = convertCamelToUnderscore(designInfo, fields);
                 designInfoMap.put("DESIGNINFO_SEQ", designInfo.getSequenceNbr());
             }
-            if(!designInfoMap.isEmpty()) {
+            if (!designInfoMap.isEmpty()) {
                 objMap.putAll(designInfoMap);
             }
         }
         //制造信息
         IdxBizJgFactoryInfo factoryInfo = iIdxBizJgFactoryInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(factoryInfo)) {
-            Map<String, Object> factoryInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> factoryInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 factoryInfoMap = Bean.BeantoMap(factoryInfo);
                 String imported = factoryInfo.getImported();
                 if ("0".equals(imported)) {
@@ -290,7 +437,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 factoryInfoMap.put("factoryStandard", JSON.parseArray(factoryInfo.getFactoryStandard()));
                 factoryInfoMap.put("productQualityYieldProve", JSON.parseArray(factoryInfo.getProductQualityYieldProve()));
                 factoryInfoMap.put("insUseMaintainExplain", JSON.parseArray(factoryInfo.getInsUseMaintainExplain()));
-            }else {
+            } else {
                 String[] fields = {"FACTORY_STANDARD", "PRODUCT_QUALITY_YIELD_PROVE", "INS_USE_MAINTAIN_EXPLAIN"};
                 factoryInfoMap = convertCamelToUnderscore(factoryInfo, fields);
                 String imported = factoryInfo.getImported();
@@ -301,22 +448,22 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 }
                 factoryInfoMap.put("FACTORYINFO_SEQ", factoryInfo.getSequenceNbr());
             }
-            if(!factoryInfoMap.isEmpty()) {
+            if (!factoryInfoMap.isEmpty()) {
                 objMap.putAll(factoryInfoMap);
             }
         }
         //施工信息 【一对多，暂时只取最新一条数据】
         IdxBizJgConstructionInfo constructionInfo = iIdxBizJgConstructionInfoService.queryNewestDetailByRecord(record);
         if (!ValidationUtil.isEmpty(constructionInfo)) {
-            Map<String, Object> constructionInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> constructionInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 constructionInfoMap = Bean.BeantoMap(constructionInfo);
                 constructionInfoMap.put("constructioninfoSeq", constructionInfo.getSequenceNbr());
-            }else {
+            } else {
                 constructionInfoMap = convertCamelToUnderscore(constructionInfo, null);
                 constructionInfoMap.put("CONSTRUCTIONINFO_SEQ", constructionInfo.getSequenceNbr());
             }
-            if(!constructionInfoMap.isEmpty()) {
+            if (!constructionInfoMap.isEmpty()) {
                 objMap.putAll(constructionInfoMap);
             }
         }
@@ -327,8 +474,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             String equDefine = registerInfo.getEquDefine();//设备品种
             List<EquipmentCategory> categoryList1 = commonService.getEquipmentCategoryList(equCategory, null);
             List<EquipmentCategory> categoryList2 = commonService.getEquipmentCategoryList(equDefine, null);
-            Map<String, Object> registerInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> registerInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 registerInfoMap = Bean.BeantoMap(registerInfo);
                 registerInfoMap.put("registerinfoSeq", registerInfo.getSequenceNbr());
                 registerInfoMap.put("sequenceNbr", registerInfo.getSequenceNbr());
@@ -339,7 +486,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 if (CollectionUtils.isNotEmpty(categoryList2)) {
                     registerInfoMap.put("equDefineDesc", categoryList2.get(0).getName());
                 }
-            }else {
+            } else {
                 String[] fields = {"PRODUCT_PHOTO"};
                 registerInfoMap = convertCamelToUnderscore(registerInfo, fields);
                 registerInfoMap.put("REGISTERINFO_SEQ", registerInfo.getSequenceNbr());
@@ -351,174 +498,308 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     registerInfoMap.put("EQU_DEFINE_DESC", categoryList2.get(0).getName());
                 }
             }
-            if(!registerInfoMap.isEmpty()) {
+            if (!registerInfoMap.isEmpty()) {
                 objMap.putAll(registerInfoMap);
             }
         }
         //维保备案【一对多，暂时只取最新一条数据】
         IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = iIdxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(record);
         if (!ValidationUtil.isEmpty(maintenanceRecordInfo)) {
-            Map<String, Object> maintenanceRecordInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> maintenanceRecordInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 maintenanceRecordInfoMap = Bean.BeantoMap(maintenanceRecordInfo);
                 maintenanceRecordInfoMap.put("maintenancerecordinfoSeq", maintenanceRecordInfo.getSequenceNbr());
-            }else {
+            } else {
                 maintenanceRecordInfoMap = convertCamelToUnderscore(maintenanceRecordInfo, null);
                 maintenanceRecordInfoMap.put("MAINTENANCERECORDINFO_SEQ", maintenanceRecordInfo.getSequenceNbr());
             }
-            if(!maintenanceRecordInfoMap.isEmpty()) {
+            if (!maintenanceRecordInfoMap.isEmpty()) {
                 objMap.putAll(maintenanceRecordInfoMap);
             }
         }
         //监督管理
         IdxBizJgSupervisionInfo supervisionInfo = iIdxBizJgSupervisionInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(supervisionInfo)) {
-            Map<String, Object> supervisionInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> supervisionInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 supervisionInfoMap = Bean.BeantoMap(supervisionInfo);
                 supervisionInfoMap.put("supervisioninfoSeq", supervisionInfo.getSequenceNbr());
-            }else {
+            } else {
                 supervisionInfoMap = convertCamelToUnderscore(supervisionInfo, null);
                 supervisionInfoMap.put("SUPERVISIONINFO_SEQ", supervisionInfo.getSequenceNbr());
             }
-            if(!supervisionInfoMap.isEmpty()) {
+            if (!supervisionInfoMap.isEmpty()) {
                 objMap.putAll(supervisionInfoMap);
             }
         }
         //其他信息
         IdxBizJgOtherInfo otherInfo = iIdxBizJgOtherInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(otherInfo)) {
-            Map<String, Object> otherInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> otherInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 otherInfoMap = Bean.BeantoMap(otherInfo);
                 otherInfoMap.put("otherinfoSeq", otherInfo.getSequenceNbr());
-            }else {
+            } else {
                 otherInfoMap = convertCamelToUnderscore(otherInfo, null);
                 otherInfoMap.put("OTHERINFO_SEQ", otherInfo.getSequenceNbr());
             }
-            if(!otherInfoMap.isEmpty()) {
+            if (!otherInfoMap.isEmpty()) {
                 objMap.putAll(otherInfoMap);
             }
         }
         //检验检测【一对多，暂时只取最新一条数据】
         IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(record);
         if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
-            Map<String, Object> inspectionDetectionInfoMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
+            Map<String, Object> inspectionDetectionInfoMap;
+            if (!ValidationUtil.isEmpty(fieldType)) {
                 inspectionDetectionInfoMap = Bean.BeantoMap(inspectionDetectionInfo);
                 inspectionDetectionInfoMap.put("inspectiondetectioninfoSeq", inspectionDetectionInfo.getSequenceNbr());
                 inspectionDetectionInfoMap.put("inspectReport", JSON.parseArray(inspectionDetectionInfo.getInspectReport()));
-            }else {
+            } else {
                 String[] fields = {"INSPECT_REPORT"};
                 inspectionDetectionInfoMap = convertCamelToUnderscore(inspectionDetectionInfo, fields);
                 inspectionDetectionInfoMap.put("INSPECTIONDETECTIONINFO_SEQ", inspectionDetectionInfo.getSequenceNbr());
             }
-            if(!inspectionDetectionInfoMap.isEmpty()) {
+            if (!inspectionDetectionInfoMap.isEmpty()) {
                 objMap.putAll(inspectionDetectionInfoMap);
             }
         }
 
-        //电梯
-        IdxBizJgTechParamsElevator elevator = iIdxBizJgTechParamsElevatorService.getOneData(record);
-        if (!ValidationUtil.isEmpty(elevator)) {
-            Map<String, Object> elevatorMap = null;
-            if(!ValidationUtil.isEmpty(fieldType)){
-                elevatorMap = Bean.BeantoMap(elevator);
-                elevatorMap.put("elevatorSeq", elevator.getSequenceNbr());
-                elevatorMap.put("explosionproofSignComplete", JSON.parseArray(elevator.getExplosionproofSignComplete()));
-            }else {
-                String[] fields = {"EXPLOSIONPROOF_SIGN_COMPLETE"};
-                elevatorMap = convertCamelToUnderscore(elevator, fields);
-                elevatorMap.put("ELEVATOR_SEQ", elevator.getSequenceNbr());
+        return objMap;
+    }
+
+    /**
+     * 查询设备技术参数
+     *
+     * @param record    设备Id
+     * @param fieldType 返回字段类型【CamelCase:驼峰命名，“”：纯大写加下划线】
+     * @return
+     */
+    private Map<String, Object> getEquipParamsMap(String record, String fieldType, String equipCode) {
+
+        Map<String, Object> objMap = new HashMap<>();
+        if (EquipmentClassifityEnum.DT.getCode().equals(equipCode)) {
+            //电梯
+            IdxBizJgTechParamsElevator elevator = iIdxBizJgTechParamsElevatorService.getOneData(record);
+            if (!ValidationUtil.isEmpty(elevator)) {
+                Map<String, Object> elevatorMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    elevatorMap = Bean.BeantoMap(elevator);
+                    elevatorMap.put("elevatorSeq", elevator.getSequenceNbr());
+                    elevatorMap.put("explosionproofSignComplete", JSON.parseArray(elevator.getExplosionproofSignComplete()));
+                } else {
+                    String[] fields = {"EXPLOSIONPROOF_SIGN_COMPLETE"};
+                    elevatorMap = convertCamelToUnderscore(elevator, fields);
+                    elevatorMap.put("ELEVATOR_SEQ", elevator.getSequenceNbr());
+                }
+                if (!elevatorMap.isEmpty()) {
+                    objMap.putAll(elevatorMap);
+                }
             }
-            if(!elevatorMap.isEmpty()) {
-                objMap.putAll(elevatorMap);
+        } else if (EquipmentClassifityEnum.CC.getCode().equals(equipCode)) {
+            //厂车
+            IdxBizJgTechParamsVehicle vehicle = iIdxBizJgTechParamsVehicleService.getOneData(record);
+            if (!ValidationUtil.isEmpty(vehicle)) {
+                Map<String, Object> vehicleMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    vehicleMap = Bean.BeantoMap(vehicle);
+                    vehicleMap.put("vehicleSeq", vehicle.getSequenceNbr());
+                } else {
+                    vehicleMap = convertCamelToUnderscore(vehicle, null);
+                    vehicleMap.put("VEHICLE_SEQ", vehicle.getSequenceNbr());
+                }
+                if (!vehicleMap.isEmpty()) {
+                    objMap.putAll(vehicleMap);
+                }
             }
+            // 主要零部件
+            List<Map<String, Object>> mainPartsMapsByRecord = this.getMainPartsMapsByRecord(record, fieldType);
+            objMap.put("subForm_sey164b51a", mainPartsMapsByRecord);
+            objMap.put("subForm_tef7yf5fbr", mainPartsMapsByRecord);
+        } else if (EquipmentClassifityEnum.KYSD.getCode().equals(equipCode)) {
+            //索道
+            IdxBizJgTechParamsRopeway ropeway = iIdxBizJgTechParamsRopewayService.getOneData(record);
+            if (!ValidationUtil.isEmpty(ropeway)) {
+                Map<String, Object> ropewayMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    ropewayMap = Bean.BeantoMap(ropeway);
+                    ropewayMap.put("ropewaySeq", ropeway.getSequenceNbr());
+                } else {
+                    ropewayMap = convertCamelToUnderscore(ropeway, null);
+                    ropewayMap.put("ROPEWAY_SEQ", ropeway.getSequenceNbr());
+                }
+                if (!ropewayMap.isEmpty()) {
+                    objMap.putAll(ropewayMap);
+                }
+            }
+            // 主要零部件
+            List<Map<String, Object>> mainPartsMapsByRecord = this.getMainPartsMapsByRecord(record, fieldType);
+            objMap.put("subForm_5fi0jewuyh", mainPartsMapsByRecord);
+        } else if (EquipmentClassifityEnum.YLSS.getCode().equals(equipCode)) {
+            //游乐设施
+            IdxBizJgTechParamsRides rides = iIdxBizJgTechParamsRidesService.getOneData(record);
+            if (!ValidationUtil.isEmpty(rides)) {
+                Map<String, Object> ridesMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    ridesMap = Bean.BeantoMap(rides);
+                    ridesMap.put("ridesSeq", rides.getSequenceNbr());
+                } else {
+                    ridesMap = convertCamelToUnderscore(rides, null);
+                    ridesMap.put("RIDES_SEQ", rides.getSequenceNbr());
+                }
+                if (!ridesMap.isEmpty()) {
+                    objMap.putAll(ridesMap);
+                }
+            }
+
+        } else if (EquipmentClassifityEnum.GL.getCode().equals(equipCode)) {
+            //锅炉
+            IdxBizJgTechParamsBoiler boiler = iIdxBizJgTechParamsBoilerService.getOneData(record);
+            if (!ValidationUtil.isEmpty(boiler)) {
+                Map<String, Object> boilerMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    boilerMap = Bean.BeantoMap(boiler);
+                    boilerMap.put("boilerSeq", boiler.getSequenceNbr());
+                } else {
+                    boilerMap = convertCamelToUnderscore(boiler, null);
+                    boilerMap.put("BOILER_SEQ", boiler.getSequenceNbr());
+                }
+                if (!boilerMap.isEmpty()) {
+                    objMap.putAll(boilerMap);
+                }
+            }
+            // 安全附件
+            List<Map<String, Object>> protectionDevicesMapsByRecord = this.getProtectionDevicesMapsByRecord(record, fieldType);
+            objMap.put("subForm_1hh88r4m69", protectionDevicesMapsByRecord);
+        } else if (EquipmentClassifityEnum.YLRQ.getCode().equals(equipCode)) {
+            //压力容器
+            IdxBizJgTechParamsVessel vessel = iIdxBizJgTechParamsVesselService.getOneData(record);
+            if (!ValidationUtil.isEmpty(vessel)) {
+                Map<String, Object> vesselMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    vesselMap = Bean.BeantoMap(vessel);
+                    vesselMap.put("vesselSeq", vessel.getSequenceNbr());
+                } else {
+                    vesselMap = convertCamelToUnderscore(vessel, null);
+                    vesselMap.put("VESSEL_SEQ", vessel.getSequenceNbr());
+                }
+                if (!vesselMap.isEmpty()) {
+                    objMap.putAll(vesselMap);
+                }
+            }
+            // 主要零部件和安全附件
+            List<Map<String, Object>> mainPartsMapsByRecord = this.getMainPartsMapsByRecord(record, fieldType);
+            List<Map<String, Object>> protectionDevicesMapsByRecord = this.getProtectionDevicesMapsByRecord(record, fieldType);
+            objMap.put("subForm_fie04854f2", mainPartsMapsByRecord);
+            objMap.put("subForm_d4xdzhsgdj", protectionDevicesMapsByRecord);
+        } else if (EquipmentClassifityEnum.YLGD.getCode().equals(equipCode)) {
+            //压力管道
+            IdxBizJgTechParamsPipeline pipeline = iIdxBizJgTechParamsPipelineService.getOneData(record);
+            if (!ValidationUtil.isEmpty(pipeline)) {
+                Map<String, Object> pipelineMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    pipelineMap = Bean.BeantoMap(pipeline);
+                    pipelineMap.put("pipelineSeq", pipeline.getSequenceNbr());
+                } else {
+                    pipelineMap = convertCamelToUnderscore(pipeline, null);
+                    pipelineMap.put("PIPELINE_SEQ", pipeline.getSequenceNbr());
+                }
+                if (!pipelineMap.isEmpty()) {
+                    objMap.putAll(pipelineMap);
+                }
+            }
+            // 主要零部件
+            List<Map<String, Object>> mainPartsMapsByRecord = this.getMainPartsMapsByRecord(record, fieldType);
+            objMap.put("subForm_9n7nu55z8r", mainPartsMapsByRecord);
+        } else if (EquipmentClassifityEnum.QZJX.getCode().equals(equipCode)) {
+            //起重机械
+            IdxBizJgTechParamsLifting lifting = iIdxBizJgTechParamsLiftingService.getOneData(record);
+            if (!ValidationUtil.isEmpty(lifting)) {
+                Map<String, Object> liftingMap;
+                if (!ValidationUtil.isEmpty(fieldType)) {
+                    liftingMap = Bean.BeantoMap(lifting);
+                    liftingMap.put("liftingSeq", lifting.getSequenceNbr());
+                } else {
+                    liftingMap = convertCamelToUnderscore(lifting, null);
+                    liftingMap.put("LIFTING_SEQ", lifting.getSequenceNbr());
+                }
+                if (!liftingMap.isEmpty()) {
+                    objMap.putAll(liftingMap);
+                }
+            }
+
+            // 主要零部件和安全附件
+            List<Map<String, Object>> mainPartsMapsByRecord = this.getMainPartsMapsByRecord(record, fieldType);
+            List<Map<String, Object>> protectionDevicesMapsByRecord = this.getProtectionDevicesMapsByRecord(record, fieldType);
+            objMap.put("subForm_bqirdyvztt", mainPartsMapsByRecord);
+            objMap.put("subForm_29yy3pdzhl", protectionDevicesMapsByRecord);
+            objMap.put("subForm_h5h4x0zhur", protectionDevicesMapsByRecord);
+
         }
-        //厂车
-        //索道
-        //游乐设施
-        //锅炉
-        //压力容器
-        //压力管道
-        //起重机械
 
-        //主要零部件【一对多，查出多条数据】
+        return objMap;
+    }
+
+    /**
+     * 查询指定设备的主要零部件【一对多，查出多条数据】
+     *
+     * @param record
+     * @param fieldType
+     * @return
+     */
+    private List<Map<String, Object>> getMainPartsMapsByRecord(String record, String fieldType) {
+        List<Map<String, Object>> resultListMap = new ArrayList<>();
         List<IdxBizJgMainParts> mainParts = iIdxBizJgMainPartsService.queryListByRecord(record);
         if (!ValidationUtil.isEmpty(mainParts)) {
-            Map<String, Object> mainPartsResultMap = new HashMap<>();
-            if(!ValidationUtil.isEmpty(fieldType)){
-                List<Map<String, Object>> list = new ArrayList<>();
-                for(IdxBizJgMainParts mainPart : mainParts){
+            if (!ValidationUtil.isEmpty(fieldType)) {
+                for (IdxBizJgMainParts mainPart : mainParts) {
                     Map<String, Object> mainPartsMap = null;
                     mainPartsMap = Bean.BeantoMap(mainPart);
                     mainPartsMap.put("mainpartsSeq", mainPart.getSequenceNbr());
-                    list.add(mainPartsMap);
-                }
-               if(!ValidationUtil.isEmpty(list)){
-                   mainPartsResultMap.put("mainparts",list);
-               }
-            }else {
-                List<Map<String, Object>> list = new ArrayList<>();
-                for(IdxBizJgMainParts mainPart : mainParts){
+                    resultListMap.add(mainPartsMap);
+                }
+            } else {
+                for (IdxBizJgMainParts mainPart : mainParts) {
                     Map<String, Object> mainPartsMap = null;
                     mainPartsMap = convertCamelToUnderscore(mainPart, null);
                     mainPartsMap.put("MAINPARTS_SEQ", mainPart.getSequenceNbr());
-                    list.add(mainPartsMap);
-                }
-                if(!ValidationUtil.isEmpty(list)){
-                    mainPartsResultMap.put("MAINPARTS",list);
+                    resultListMap.add(mainPartsMap);
                 }
             }
-
-            if(!mainPartsResultMap.isEmpty()) {
-                objMap.putAll(mainPartsResultMap);
-            }
         }
-        //安全附件【一对多，查出多条数据】
+        return resultListMap;
+    }
+
+    /**
+     * 查询指定设备的安全附件【一对多，查出多条数据】
+     *
+     * @param record
+     * @param fieldType
+     * @return
+     */
+    private List<Map<String, Object>> getProtectionDevicesMapsByRecord(String record, String fieldType) {
+        List<Map<String, Object>> resultListMap = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevices = iIdxBizJgProtectionDevicesService.queryListByRecord(record);
         if (!ValidationUtil.isEmpty(protectionDevices)) {
-            Map<String, Object> protectionDevicesResultMap = new HashMap<>();
-
-            if(!ValidationUtil.isEmpty(fieldType)){
-                List<Map<String, Object>> list = new ArrayList<>();
-                for(IdxBizJgProtectionDevices protectionDevice : protectionDevices){
+            if (!ValidationUtil.isEmpty(fieldType)) {
+                for (IdxBizJgProtectionDevices protectionDevice : protectionDevices) {
                     Map<String, Object> protectionDeviceMap = null;
                     protectionDeviceMap = Bean.BeantoMap(protectionDevice);
                     protectionDeviceMap.put("protectiondevicesSeq", protectionDevice.getSequenceNbr());
-                    list.add(protectionDeviceMap);
-                }
-                if(!ValidationUtil.isEmpty(list)){
-                    protectionDevicesResultMap.put("protectionDevices",list);
+                    resultListMap.add(protectionDeviceMap);
                 }
-            }else {
-                List<Map<String, Object>> list = new ArrayList<>();
-                for(IdxBizJgProtectionDevices protectionDevice : protectionDevices){
+            } else {
+                for (IdxBizJgProtectionDevices protectionDevice : protectionDevices) {
                     Map<String, Object> protectionDeviceMap = null;
                     protectionDeviceMap = convertCamelToUnderscore(protectionDevice, null);
                     protectionDeviceMap.put("PROTECTIONDEVICES_SEQ", protectionDevice.getSequenceNbr());
-                    list.add(protectionDeviceMap);
-                }
-                if(!ValidationUtil.isEmpty(list)){
-                    protectionDevicesResultMap.put("PROTECTIONDEVICES",list);
+                    resultListMap.add(protectionDeviceMap);
                 }
             }
-            if(!protectionDevicesResultMap.isEmpty()) {
-                objMap.putAll(protectionDevicesResultMap);
-            }
         }
-        return objMap;
+        return resultListMap;
     }
 
-    public Map<String, Object> getDetailByRecord(String record) {
-        return getStringObjectMap(record, "");
-    }
-
-    public Map<String, Object> getDetailFieldCamelCaseByRecord(String record) {
-        return getStringObjectMap(record, "CamelCase");
-    }
-
-
     /**
      * 设备注册信息分页查询
      *
@@ -575,7 +856,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         boolMust.must(meBuilder);
 
         String queryType = map.getString("QUERY_TYPE");
-        if(!ObjectUtils.isEmpty(queryType)){
+        if (!ObjectUtils.isEmpty(queryType)) {
             //查询 安装告知【可告知设备列表】【EQU_STATE=== null】
             if (ValidationUtil.equals(queryType, "AZ")) {
                 BoolQueryBuilder azBuilder = QueryBuilders.boolQuery();
@@ -729,7 +1010,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             object.put("companyName", company.getCompanyName());
             object.put("companyCode", company.getCompanyCode());
             CompanyModel result = Privilege.companyClient.queryByCompanyCode(company.getCompanyCode()).getResult();
-            if(!ValidationUtil.isEmpty(result)){
+            if (!ValidationUtil.isEmpty(result)) {
                 object.put("companyType", result.getCompanyType());
             }
         }
@@ -739,7 +1020,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private String batchSubmitOrUpdate(Map<String, Object> map) {
         Date date = new Date();
         String record = null;
-        LinkedHashMap equipmentInfoForm = (LinkedHashMap) map.get(EQUIPMENT_INFO_FORM_ID);
+        LinkedHashMap equipmentClassForm = (LinkedHashMap) map.get(EQUIP_CLASS_FORM_ID);
+        LinkedHashMap equipmentInfoForm = (LinkedHashMap) map.get(EQUIP_INFO_FORM_ID);
+        LinkedHashMap equipmentParamsForm = (LinkedHashMap) map.get(EQUIP_PARAMS_FORM_ID);
+
         //操作类型
         String operateType = ValidationUtil.isEmpty(equipmentInfoForm.get("SEQUENCE_NBR")) ? OPERATESAVE : OPERATEEDIT;
         record = OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : equipmentInfoForm.get("RECORD").toString();
@@ -748,21 +1032,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         IdxBizJgUseInfo useInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgUseInfo.class);
         useInfo.setRecord(record);
         useInfo.setRecDate(date);
-        useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
+        useInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("USEINFO_SEQ")));
         idxBizJgUseInfoService.saveOrUpdateData(useInfo);
 
         //设计制造
         IdxBizJgDesignInfo designInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgDesignInfo.class);
         designInfo.setRecord(record);
         designInfo.setRecDate(date);
-        designInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("DESIGNINFO_SEQ")));
+        designInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("DESIGNINFO_SEQ")));
         iIdxBizJgDesignInfoService.saveOrUpdateData(designInfo);
 
         //制造信息
         IdxBizJgFactoryInfo factoryInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgFactoryInfo.class);
         factoryInfo.setRecord(record);
         factoryInfo.setRecDate(date);
-        factoryInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("FACTORYINFO_SEQ")));
+        factoryInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("FACTORYINFO_SEQ")));
         iIdxBizJgFactoryInfoService.saveOrUpdateData(factoryInfo);
 
         //施工信息
@@ -775,74 +1059,181 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         constructionInfo.setRecDate(date);
         constructionInfo.setUscUnitCreditCode(companyCode);
         constructionInfo.setUscUnitName(companyName);
-        constructionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("CONSTRUCTIONINFO_SEQ")));
+        constructionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("CONSTRUCTIONINFO_SEQ")));
         iIdxBizJgConstructionInfoService.saveOrUpdateData(constructionInfo);
 
         //注册登记
+        IdxBizJgRegisterInfo equipmentClassRegisterInfo = JSON.parseObject(JSON.toJSONString(equipmentClassForm), IdxBizJgRegisterInfo.class);
         IdxBizJgRegisterInfo registerInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgRegisterInfo.class);
+        Bean.copyExistPropertis(equipmentClassRegisterInfo, registerInfo);
         registerInfo.setRecord(record);
         registerInfo.setRecDate(date);
-        registerInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("REGISTERINFO_SEQ")));
+        registerInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("REGISTERINFO_SEQ")));
         this.saveOrUpdate(registerInfo);
 
         //维保备案
         IdxBizJgMaintenanceRecordInfo maintenanceRecordInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgMaintenanceRecordInfo.class);
         maintenanceRecordInfo.setRecord(record);
         maintenanceRecordInfo.setRecDate(date);
-        maintenanceRecordInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
+        maintenanceRecordInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("MAINTENANCERECORDINFO_SEQ")));
         iIdxBizJgMaintenanceRecordInfoService.saveOrUpdateData(maintenanceRecordInfo);
 
         //监督管理
         IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgSupervisionInfo.class);
         supervisionInfo.setRecord(record);
         supervisionInfo.setRecDate(date);
-        supervisionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("SUPERVISIONINFO_SEQ")));
+        supervisionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("SUPERVISIONINFO_SEQ")));
         iIdxBizJgSupervisionInfoService.saveOrUpdateData(supervisionInfo);
 
         //其他信息
         IdxBizJgOtherInfo otherInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgOtherInfo.class);
         otherInfo.setRecord(record);
         otherInfo.setRecDate(date);
-        otherInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("OTHERINFO_SEQ")));
+        otherInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("OTHERINFO_SEQ")));
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
 
         //检验检测
         IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
         inspectionDetectionInfo.setRecord(record);
         inspectionDetectionInfo.setRecDate(date);
-        inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
+        inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
         iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
 
 
-        //八大类技术参数表
-        //电梯
-        IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgTechParamsElevator.class);
-        if (!ValidationUtil.isEmpty(elevator)) {
-            elevator.setRecord(record);
-            elevator.setRecDate(date);
-            elevator.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("ELEVATOR_SEQ")));
-            iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
-        }
-        //厂车
-        //索道
-        //游乐设施
-        //锅炉
-        //压力容器
-        //压力管道
-        //起重机械
-
-        //八大类技术参数中主要零部件和安全附件表
+        //八大类技术参数和主要零部件和安全附件表
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
-        //要零部件
-        List<String> subFormMainPartsList = new ArrayList<>();
-        subFormMainPartsList.add("subForm_fie04854f2");
-        mainPartsList = getAccessoryEntity(equipmentInfoForm, subFormMainPartsList, main_parts, record, date, operateType);
-        //安全附件
-        List<String> subFormProtectionDevicesList = new ArrayList<>();
-        subFormProtectionDevicesList.add("subForm_d4xdzhsgdj");
-        protectionDevicesList = getAccessoryEntity(equipmentInfoForm, subFormProtectionDevicesList, protection_devices, record, date, operateType);
+        // 设备种类
+        String equList = equipmentClassForm.get("EQU_LIST").toString();
+        // 电梯
+        if (EquipmentClassifityEnum.DT.getCode().equals(equList)) {
+            IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsElevator.class);
+            if (!ValidationUtil.isEmpty(elevator)) {
+                elevator.setRecord(record);
+                elevator.setRecDate(date);
+                elevator.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("ELEVATOR_SEQ")));
+                iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
+            }
+        }
+        // 厂车
+        else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
+            IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsVehicle.class);
+            if (!ValidationUtil.isEmpty(vehicle)) {
+                vehicle.setRecord(record);
+                vehicle.setRecDate(date);
+                vehicle.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("VEHICLE_SEQ")));
+                iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle);
+            }
 
+            //主要零部件
+            List<String> subFormMainPartsList = new ArrayList<>();
+            subFormMainPartsList.add("subForm_sey164b51a");
+            subFormMainPartsList.add("subForm_tef7yf5fbr");
+            mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+        }
+        // 索道
+        else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
+            IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsRopeway.class);
+            if (!ValidationUtil.isEmpty(ropeway)) {
+                ropeway.setRecord(record);
+                ropeway.setRecDate(date);
+                ropeway.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("ROPEWAY_SEQ")));
+                iIdxBizJgTechParamsRopewayService.saveOrUpdateData(ropeway);
+            }
+
+            //主要零部件
+            List<String> subFormMainPartsList = new ArrayList<>();
+            subFormMainPartsList.add("subForm_5fi0jewuyh");
+            mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+        }
+        // 游乐设施
+        else if (EquipmentClassifityEnum.YLSS.getCode().equals(equList)) {
+            IdxBizJgTechParamsRides rides = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsRides.class);
+            if (!ValidationUtil.isEmpty(rides)) {
+                rides.setRecord(record);
+                rides.setRecDate(date);
+                rides.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("RIDES_SEQ")));
+                iIdxBizJgTechParamsRidesService.saveOrUpdateData(rides);
+            }
+        }
+        // 锅炉
+        else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
+            IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsBoiler.class);
+            if (!ValidationUtil.isEmpty(boiler)) {
+                boiler.setRecord(record);
+                boiler.setRecDate(date);
+                boiler.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("BOILER_SEQ")));
+                iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler);
+            }
+
+            //主要零部件
+            List<String> subFormMainPartsList = new ArrayList<>();
+            subFormMainPartsList.add("subForm_1hh88r4m69");
+            mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+        }
+        // 压力容器
+        else if (EquipmentClassifityEnum.YLRQ.getCode().equals(equList)) {
+            IdxBizJgTechParamsVessel vessel = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsVessel.class);
+            if (!ValidationUtil.isEmpty(vessel)) {
+                vessel.setRecord(record);
+                vessel.setRecDate(date);
+                vessel.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("VESSEL_SEQ")));
+                iIdxBizJgTechParamsVesselService.saveOrUpdateData(vessel);
+            }
+
+            //主要零部件
+            List<String> subFormMainPartsList = new ArrayList<>();
+            subFormMainPartsList.add("subForm_fie04854f2");
+            mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+            //安全附件
+            List<String> subFormProtectionDevicesList = new ArrayList<>();
+            subFormProtectionDevicesList.add("subForm_d4xdzhsgdj");
+            protectionDevicesList = this.getAccessoryEntity(equipmentParamsForm, subFormProtectionDevicesList, EQUIP_PROTECTIONDEVICES_FORM_ID, record, date, operateType);
+
+        }
+        // 压力管道
+        else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
+            IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsPipeline.class);
+            if (!ValidationUtil.isEmpty(pipeline)) {
+                pipeline.setRecord(record);
+                pipeline.setRecDate(date);
+                pipeline.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("PIPELINE_SEQ")));
+                iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline);
+            }
+
+            //主要零部件
+            List<String> subFormMainPartsList = new ArrayList<>();
+            subFormMainPartsList.add("subForm_9n7nu55z8r");
+            mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+        }
+        // 起重机械
+        else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
+            IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(equipmentParamsForm), IdxBizJgTechParamsLifting.class);
+            if (!ValidationUtil.isEmpty(lifting)) {
+                lifting.setRecord(record);
+                lifting.setRecDate(date);
+                lifting.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentParamsForm.get("LIFTING_SEQ")));
+                iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting);
+            }
+
+            //主要零部件
+            List<String> subFormMainPartsList = new ArrayList<>();
+            subFormMainPartsList.add("subForm_bqirdyvztt");
+            mainPartsList = this.getAccessoryEntity(equipmentParamsForm, subFormMainPartsList, EQUIP_MAINPARTS_FORM_ID, record, date, operateType);
+
+            //安全附件
+            List<String> subFormProtectionDevicesList = new ArrayList<>();
+            subFormProtectionDevicesList.add("subForm_29yy3pdzhl");
+            subFormProtectionDevicesList.add("subForm_h5h4x0zhur");
+            protectionDevicesList = this.getAccessoryEntity(equipmentParamsForm, subFormProtectionDevicesList, EQUIP_PROTECTIONDEVICES_FORM_ID, record, date, operateType);
+
+        }
+
+        //八大类技术参数和主要零部件和安全附件表
         if (!ValidationUtil.isEmpty(mainPartsList)) {
             iIdxBizJgMainPartsService.saveOrUpdateBatchData(mainPartsList);
         }
@@ -872,7 +1263,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();
         List<IdxBizJgProtectionDevices> protectionDevicesList = new ArrayList<>();
 
-        if ("mainParts".equals(subFormType)) {
+        if (EQUIP_MAINPARTS_FORM_ID.equals(subFormType)) {
             for (Object s : list) {
                 List subFormMainPartsList = (ArrayList) map.get(s);
                 if (!ObjectUtils.isEmpty(subFormMainPartsList)) {
@@ -887,7 +1278,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 }
             }
             return mainPartsList;
-        } else {
+        } else if (EQUIP_PROTECTIONDEVICES_FORM_ID.equals(subFormType)) {
             for (Object s : list) {
                 List subFormProtectionDevicesList = (ArrayList) map.get(s);
                 if (!ObjectUtils.isEmpty(subFormProtectionDevicesList)) {
@@ -903,6 +1294,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             }
             return protectionDevicesList;
         }
+        return null;
     }
 
     /**
@@ -929,7 +1321,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             } catch (IllegalAccessException e) {
                 throw new RuntimeException(e);
             }
-            if(!ValidationUtil.isEmpty(value)){
+            if (!ValidationUtil.isEmpty(value)) {
                 result.put(underscoreFieldName.toUpperCase(), value);
             }
         }

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsBoilerService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsBoilerDto;
@@ -18,6 +19,15 @@ import java.util.List;
  */
 @Service
 public class IdxBizJgTechParamsBoilerServiceImpl extends BaseService<IdxBizJgTechParamsBoilerDto,IdxBizJgTechParamsBoiler,IdxBizJgTechParamsBoilerMapper> implements IIdxBizJgTechParamsBoilerService {
+
+    public void saveOrUpdateData(IdxBizJgTechParamsBoiler boiler) {
+        this.saveOrUpdate(boiler);
+    }
+
+    public IdxBizJgTechParamsBoiler getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsBoiler>().eq("RECORD", record));
+    }
+
     /**
      * 分页查询
      */
@@ -31,4 +41,6 @@ public class IdxBizJgTechParamsBoilerServiceImpl extends BaseService<IdxBizJgTec
     public List<IdxBizJgTechParamsBoilerDto> queryForIdxBizJgTechParamsBoilerList()   {
         return this.queryForList("" , false);
     }
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsLiftingService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsLiftingDto;
@@ -18,6 +19,15 @@ import java.util.List;
  */
 @Service
 public class IdxBizJgTechParamsLiftingServiceImpl extends BaseService<IdxBizJgTechParamsLiftingDto,IdxBizJgTechParamsLifting,IdxBizJgTechParamsLiftingMapper> implements IIdxBizJgTechParamsLiftingService {
+
+    public void saveOrUpdateData(IdxBizJgTechParamsLifting lifting) {
+        this.saveOrUpdate(lifting);
+    }
+
+    public IdxBizJgTechParamsLifting getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsLifting>().eq("RECORD", record));
+    }
+
     /**
      * 分页查询
      */
@@ -31,4 +41,5 @@ public class IdxBizJgTechParamsLiftingServiceImpl extends BaseService<IdxBizJgTe
     public List<IdxBizJgTechParamsLiftingDto> queryForIdxBizJgTechParamsLiftingList()   {
         return this.queryForList("" , false);
     }
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsPipelineService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsPipelineDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsPipelineMapper;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -18,6 +20,15 @@ import java.util.List;
  */
 @Service
 public class IdxBizJgTechParamsPipelineServiceImpl extends BaseService<IdxBizJgTechParamsPipelineDto,IdxBizJgTechParamsPipeline,IdxBizJgTechParamsPipelineMapper> implements IIdxBizJgTechParamsPipelineService {
+
+    public void saveOrUpdateData(IdxBizJgTechParamsPipeline pipeline) {
+        this.saveOrUpdate(pipeline);
+    }
+
+    public IdxBizJgTechParamsPipeline getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsPipeline>().eq("RECORD", record));
+    }
+
     /**
      * 分页查询
      */
@@ -31,4 +42,6 @@ public class IdxBizJgTechParamsPipelineServiceImpl extends BaseService<IdxBizJgT
     public List<IdxBizJgTechParamsPipelineDto> queryForIdxBizJgTechParamsPipelineList()   {
         return this.queryForList("" , false);
     }
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsRidesService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsRidesDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRidesMapper;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -18,6 +20,15 @@ import java.util.List;
  */
 @Service
 public class IdxBizJgTechParamsRidesServiceImpl extends BaseService<IdxBizJgTechParamsRidesDto,IdxBizJgTechParamsRides,IdxBizJgTechParamsRidesMapper> implements IIdxBizJgTechParamsRidesService {
+
+    public void saveOrUpdateData(IdxBizJgTechParamsRides rides) {
+        this.saveOrUpdate(rides);
+    }
+
+    public IdxBizJgTechParamsRides getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsRides>().eq("RECORD", record));
+    }
+
     /**
      * 分页查询
      */
@@ -31,4 +42,6 @@ public class IdxBizJgTechParamsRidesServiceImpl extends BaseService<IdxBizJgTech
     public List<IdxBizJgTechParamsRidesDto> queryForIdxBizJgTechParamsRidesList()   {
         return this.queryForList("" , false);
     }
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsRopewayService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsRopewayDto;
@@ -18,6 +19,15 @@ import java.util.List;
  */
 @Service
 public class IdxBizJgTechParamsRopewayServiceImpl extends BaseService<IdxBizJgTechParamsRopewayDto,IdxBizJgTechParamsRopeway,IdxBizJgTechParamsRopewayMapper> implements IIdxBizJgTechParamsRopewayService {
+
+    public void saveOrUpdateData(IdxBizJgTechParamsRopeway ropeway) {
+        this.saveOrUpdate(ropeway);
+    }
+
+    public IdxBizJgTechParamsRopeway getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsRopeway>().eq("RECORD", record));
+    }
+
     /**
      * 分页查询
      */
@@ -31,4 +41,6 @@ public class IdxBizJgTechParamsRopewayServiceImpl extends BaseService<IdxBizJgTe
     public List<IdxBizJgTechParamsRopewayDto> queryForIdxBizJgTechParamsRopewayList()   {
         return this.queryForList("" , false);
     }
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsVehicleService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsVehicleDto;
@@ -18,6 +19,15 @@ import java.util.List;
  */
 @Service
 public class IdxBizJgTechParamsVehicleServiceImpl extends BaseService<IdxBizJgTechParamsVehicleDto,IdxBizJgTechParamsVehicle,IdxBizJgTechParamsVehicleMapper> implements IIdxBizJgTechParamsVehicleService {
+
+    public void saveOrUpdateData(IdxBizJgTechParamsVehicle vehicle) {
+        this.saveOrUpdate(vehicle);
+    }
+
+    public IdxBizJgTechParamsVehicle getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsVehicle>().eq("RECORD", record));
+    }
+
     /**
      * 分页查询
      */
@@ -31,4 +41,6 @@ public class IdxBizJgTechParamsVehicleServiceImpl extends BaseService<IdxBizJgTe
     public List<IdxBizJgTechParamsVehicleDto> queryForIdxBizJgTechParamsVehicleList()   {
         return this.queryForList("" , false);
     }
+
+
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgTechParamsVesselService;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgTechParamsVesselDto;
@@ -18,6 +19,16 @@ import java.util.List;
  */
 @Service
 public class IdxBizJgTechParamsVesselServiceImpl extends BaseService<IdxBizJgTechParamsVesselDto,IdxBizJgTechParamsVessel,IdxBizJgTechParamsVesselMapper> implements IIdxBizJgTechParamsVesselService {
+
+    public void saveOrUpdateData(IdxBizJgTechParamsVessel vessel) {
+        this.saveOrUpdate(vessel);
+    }
+
+    @Override
+    public IdxBizJgTechParamsVessel getOneData(String record) {
+        return this.getOne(new QueryWrapper<IdxBizJgTechParamsVessel>().eq("RECORD", record));
+    }
+
     /**
      * 分页查询
      */
@@ -31,4 +42,6 @@ public class IdxBizJgTechParamsVesselServiceImpl extends BaseService<IdxBizJgTec
     public List<IdxBizJgTechParamsVesselDto> queryForIdxBizJgTechParamsVesselList()   {
         return this.queryForList("" , false);
     }
+
+
 }
\ No newline at end of file