feat(jg):八大类历史设备导入-压力管道（未完）

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/DictParamsConverter.java

@@ -75,6 +75,10 @@ public class DictParamsConverter implements Converter<String> {
         dictMap.put("液化天然气", "LIQUEFIED_NATURAL_GAS");
         dictMap.put("液化石油气", "LIQUEFIED_PETROLEUM_GAS");
         dictMap.put("氢气", "HYDROGEN");
+        dictMap.put("集选", "1");
+        dictMap.put("并联", "2");
+        dictMap.put("按钮", "3");
+        dictMap.put("其他控制方式", "4");
     }
 
     @Override
@@ -101,8 +105,4 @@ public class DictParamsConverter implements Converter<String> {
     public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
         return new CellData("");
     }
-
-    public static void main(String[] args) {
-
-    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/EquListConverter.java

@@ -11,7 +11,7 @@ import java.util.Map;
 
 public class EquListConverter implements Converter<String> {
 
-    private static final Map<String, String> equipmentMap = new HashMap<>();
+    public static final Map<String, String> equipmentMap = new HashMap<>();
 
     static {
         // 填充映射关系

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoExcelDto.java

@@ -47,6 +47,11 @@ public class EquipInfoExcelDto extends BaseDto {
     @NotBlank(message = "产品名称不能为空")
     private String productName;
 
+    @ApiModelProperty(value = "管道名称（登记单元）")
+    @ExcelProperty(value = "管道名称（登记单元）")
+    @NotBlank(message = "管道名称不能为空")
+    private String pipeName;
+
     @ApiModelProperty(value = "设备型号")
     @ExcelProperty(value = "设备型号")
     @NotBlank(message = "设备型号不能为空")
@@ -70,6 +75,11 @@ public class EquipInfoExcelDto extends BaseDto {
     @ExcelProperty(value = "工程（装置）名称")
     private String projectContraption;
 
+
+    @ApiModelProperty(value = "工程（装置）编号")
+    @ExcelProperty(value = "工程（装置）编号")
+    private String projectContraptionNo;
+
     @ApiModelProperty(value = "是否球罐")
     @ExcelProperty(value = "是否球罐", converter = VehicleCylinderConverter.class)
     private String whetherSphericalTank;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataDockController.java

@@ -35,7 +35,7 @@ public class DataDockController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/xi-an/saveEquipmentData")
     @ApiOperation(httpMethod = "POST", value = "西安数据对接-设备批量导入", notes = "西安数据对接-导入多个设备的数据文件")
-    public ResponseModel<?> saveEquipmentData(@RequestBody List<Map<?, ?>> equLists) throws Exception {
+    public ResponseModel<?> saveEquipmentData(@RequestBody List<Map<String, Object>> equLists) throws Exception {
         return ResponseHelper.buildResponse(dataDockService.xiAnSaveEquipmentData(equLists));
     }
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 
@@ -14,7 +15,7 @@ import java.util.Map;
  * @author system_generator
  * @date 2024-12-11
  */
-public interface IIdxBizJgProjectContraptionService {
+public interface IIdxBizJgProjectContraptionService extends IService<IdxBizJgProjectContraption> {
 
     boolean saveOrUpdateData(IdxBizJgProjectContraption projectContraption);