fix(jg):西安数据对接接口,bug修改

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/DictParamsConverter.java

+package com.yeejoin.amos.api.openapi.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class DictParamsConverter implements Converter<String> {
+
+    private static final Map<String, String> dictMap = new HashMap<>();
+
+    static {
+        // 填充映射关系
+        dictMap.put("油", "5961");
+        dictMap.put("电", "5962");
+        dictMap.put("煤", "5963");
+        dictMap.put("水煤浆", "5964");
+        dictMap.put("生物质", "5965");
+        dictMap.put("余热", "5966");
+        dictMap.put("其他", "5967");
+        dictMap.put("射线", "5969");
+        dictMap.put("超声", "5970");
+        dictMap.put("磁粉", "5971");
+        dictMap.put("渗透", "5972");
+        dictMap.put("固定式", "5990");
+        dictMap.put("半挂式", "5991");
+        dictMap.put("公用管道", "5992");
+        dictMap.put("工业管道", "5993");
+        dictMap.put("锅筒(锅壳)", "6005");
+        dictMap.put("过热器出口集箱", "6006");
+        dictMap.put("启动分离器", "6007");
+        dictMap.put("长输管道", "5994");
+        dictMap.put("磁粉", "5988");
+        dictMap.put("射线", "5986");
+        dictMap.put("超声", "5987");
+        dictMap.put("渗透", "5989");
+        dictMap.put("A1", "6094");
+        dictMap.put("A2", "6095");
+        dictMap.put("A7", "6100");
+        dictMap.put("A8", "6101");
+        dictMap.put("A3", "6096");
+        dictMap.put("A4", "6097");
+        dictMap.put("A5", "6098");
+        dictMap.put("A6", "6099");
+        dictMap.put("牵引索", "6167");
+        dictMap.put("平衡索", "6168");
+        dictMap.put("Ⅰ类", "1");
+        dictMap.put("Ⅱ类", "2");
+        dictMap.put("Ⅲ类", "3");
+        dictMap.put("ⅢA类", "4");
+        dictMap.put("ⅢB类", "5");
+        dictMap.put("ⅢC类", "6");
+        dictMap.put("M1", "6531");
+        dictMap.put("M2", "6532");
+        dictMap.put("M3", "6533");
+        dictMap.put("M4", "6534");
+        dictMap.put("M5", "6535");
+        dictMap.put("M6", "6536");
+        dictMap.put("M7", "6537");
+        dictMap.put("M8", "6538");
+        dictMap.put("M9", "6539");
+        dictMap.put("M10", "6540");
+        dictMap.put("A级", "5957");
+        dictMap.put("B级", "5958");
+        dictMap.put("C级", "5959");
+        dictMap.put("D级", "5960");
+        dictMap.put("GC1", "6002");
+        dictMap.put("GC2", "6003");
+        dictMap.put("GC3", "6004");
+    }
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                    GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        return dictMap.getOrDefault(cellValue, null);
+    }
+
+    @Override
+    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-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/InformationSituationConverter.java

+package com.yeejoin.amos.api.openapi.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class InformationSituationConverter implements Converter<String> {
+
+    private static final String TYPE_QR_CODE = "二维码";
+    private static final String TYPE_STAMP = "电子标签";
+    private static final String TYPE_NO = "无";
+
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                     GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        if (TYPE_QR_CODE.equals(cellValue)) {
+            return "1";
+        } else if (TYPE_STAMP.equals(cellValue)) {
+            return "2";
+        }
+        return "99";
+    }
+
+    @Override
+    public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 判断实体类中获取的值，转换为Excel预期的值，并封装为CellData对象
+        if (o == null) {
+            return new CellData("");
+        } else if (o.equals("1")) {
+            return new CellData(TYPE_QR_CODE);
+        } else if (o.equals("2")) {
+            return new CellData(TYPE_STAMP);
+        }
+        return new CellData(TYPE_NO);
+    }
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/converter/VehicleCylinderConverter.java

+package com.yeejoin.amos.api.openapi.converter;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+public class VehicleCylinderConverter implements Converter<String> {
+
+    private static final String WHETHER = "是";
+    private static final String NOT = "否";
+
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        // Excel中对应的CellData属性类型
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                     GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        if (WHETHER.equals(cellValue)) {
+            return "1";
+        } else if (NOT.equals(cellValue)) {
+            return "0";
+        }
+        return null;
+    }
+
+    @Override
+    public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        // 判断实体类中获取的值，转换为Excel预期的值，并封装为CellData对象
+        if (o == null) {
+            return new CellData("");
+        } else if (o.equals("1")) {
+            return new CellData(WHETHER);
+        } else if (o.equals("0")) {
+            return new CellData(NOT);
+        }
+        return new CellData("");
+    }
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/dto/XiAnEquipInfoExcelDto.java

@@ -24,17 +24,17 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     //----------------------------------------------------------------------基本信息
 
     @ApiModelProperty(value = "设备种类")
-    @ExcelProperty(value = "设备种类",converter = EquListConverter.class)
+    @ExcelProperty(value = "设备种类", converter = EquListConverter.class)
     @NotBlank(message = "设备种类不能为空")
     private String equList;
 
     @ApiModelProperty(value = "设备类别")
-    @ExcelProperty(value = "设备类别",converter = EquCategoryConverter.class)
+    @ExcelProperty(value = "设备类别", converter = EquCategoryConverter.class)
     @NotBlank(message = "设备类别不能为空")
     private String equCategory;
 
     @ApiModelProperty(value = "设备品种")
-    @ExcelProperty(value = "设备品种",converter = EquDefineConverter.class)
+    @ExcelProperty(value = "设备品种", converter = EquDefineConverter.class)
     private String equDefine;
 
     @ApiModelProperty(value = "单位内编号")
@@ -64,7 +64,32 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
 
     @ApiModelProperty(value = "设备代码")
     @ExcelProperty(value = "设备代码")
-    private String equCode;//判断是否必填和位数
+    private String equCode;
+
+    @ApiModelProperty(value = "工程（装置）名称")
+    @ExcelProperty(value = "工程（装置）名称")
+    private String projectContraption;
+
+    @ApiModelProperty(value = "是否球罐")
+    @ExcelProperty(value = "是否球罐", converter = VehicleCylinderConverter.class)
+    private String whetherSphericalTank;
+
+    @ApiModelProperty(value = "是否撬装式压力容器")
+    @ExcelProperty(value = "是否撬装式压力容器")
+    private String whetherSkidMountedPressureVessel;
+
+    @ApiModelProperty(value = "是否车用气瓶")
+    @ExcelProperty(value = "是否车用气瓶", converter = VehicleCylinderConverter.class)
+    @NotBlank(message = "是否车用气瓶不能为空")
+    private String whetherVehicleCylinder;
+
+    @ApiModelProperty(value = "信息化管理情况")
+    @ExcelProperty(value = "信息化管理情况", converter = InformationSituationConverter.class)
+    private String informationSituation;
+
+    @ApiModelProperty(value = "二维码或者电子标签编号")
+    @ExcelProperty(value = "二维码或者电子标签编号")
+    private String informationManageCode;
 
     //-----------------------------------------------------------------------使用信息
 
@@ -175,7 +200,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "起升高度（m）")
     private String liftingHeight;
 
-    @ExcelProperty(value = "工作级别")
+    @ExcelProperty(value = "工作级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "工作级别")
     private String workLevel;
 
@@ -183,7 +208,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "燃爆物质")
     private String explosiveSubstance;
 
-    @ExcelProperty(value = "区域防爆等级")
+    @ExcelProperty(value = "区域防爆等级", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "区域防爆等级")
     private String explosionProofGrade;
 
@@ -340,7 +365,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "防爆温度组别")
     private String temperatureGroup;
 
-    @ExcelProperty(value = "防爆设备保护级别")
+    @ExcelProperty(value = "防爆设备保护级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "防爆设备保护级别")
     private String protectGrade;
 
@@ -382,7 +407,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
 
     //--------------------------------------------------------------锅炉----技术参数
 
-    @ExcelProperty(value = "设备级别")
+    @ExcelProperty(value = "设备级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "设备级别")
     private String deviceLevel;
 
@@ -438,11 +463,11 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "燃烧方式")
     private String combustionMode;
 
-    @ExcelProperty(value = "燃料（热源）种类")
+    @ExcelProperty(value = "燃料（热源）种类", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "燃料（热源）种类")
     private String fuelType;
 
-    @ExcelProperty(value = "主要受压部件-名称")
+    @ExcelProperty(value = "主要受压部件-名称", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "主要受压部件-名称")
     private String nameOfPressureParts;
 
@@ -454,7 +479,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "主要受压部件-壁厚(mm)")
     private String wallThicknessOfPressureParts;
 
-    @ExcelProperty(value = "主要受压部件-无损检测方法")
+    @ExcelProperty(value = "主要受压部件-无损检测方法", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "主要受压部件-无损检测方法")
     private String nonDestructiveTestingMethodsForPressureParts;
 
@@ -516,7 +541,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "壁厚")
     private String wallThickness;
 
-    @ExcelProperty(value = "无损检测方法（气瓶）")
+    @ExcelProperty(value = "无损检测方法（气瓶）", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "无损检测方法（气瓶）")
     private String qpLossless;
 
@@ -552,7 +577,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "材料（瓶体）")
     private String bottleBody;
 
-    @ExcelProperty(value = "无损检测方法（管路）")
+    @ExcelProperty(value = "无损检测方法（管路）", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "无损检测方法（管路）")
     private String glLossless;
 
@@ -712,11 +737,11 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "最高允许工作压力（壳程）")
     private String maxPressureShell;
 
-    @ExcelProperty(value = "主体结构型式")
+    @ExcelProperty(value = "主体结构型式", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "主体结构型式")
     private String mainStructureType;
 
-    @ExcelProperty(value = "无损检测方法")
+    @ExcelProperty(value = "无损检测方法", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "无损检测方法")
     private String checkLossless;
 
@@ -798,7 +823,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
 
     //--------------------------------------------------------------------压力管道----技术参数
 
-    @ExcelProperty(value = "管道类别")
+    @ExcelProperty(value = "管道类别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "管道类别")
     private String pipelineClass;
 
@@ -822,8 +847,8 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "介质")
     private String medium_YLGD;
 
-    @ExcelProperty(value = "起/始位置 （经纬度）")
-    @ApiModelProperty(value = "起/始位置 （经纬度）")
+    @ExcelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
+    @ApiModelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
     private String startePosition;
 
     @ExcelProperty(value = "温度(℃)")
@@ -834,7 +859,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "管道编号")
     private String pipelineNumber;
 
-    @ExcelProperty(value = "管道级别")
+    @ExcelProperty(value = "管道级别", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "管道级别")
     private String deviceLevel_YLGD;
 
@@ -930,7 +955,7 @@ public class XiAnEquipInfoExcelDto extends BaseDto {
     @ApiModelProperty(value = "运量（p/h）")
     private String freightVolume;
 
-    @ExcelProperty(value = "运载索")
+    @ExcelProperty(value = "运载索", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "运载索")
     private String carrierLine;
 

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java

@@ -92,4 +92,14 @@ public interface TzsJgServiceFeignClient {
      */
     @RequestMapping(value = "/common/checkEquCodeUniqueness", method = RequestMethod.GET)
     Boolean selectByEquCodeAndClaimStatus(@RequestParam("equCode") String equCode);
+
+
+    /**
+     * 车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）
+     *
+     * @param factoryNum
+     * @return
+     */
+    @RequestMapping(value = "/common/checkEquCodeUniqueness", method = RequestMethod.GET)
+    Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum);
 }

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

@@ -633,4 +633,11 @@ public class CommonController extends BaseController {
     public Boolean checkEquCodeUniqueness(@RequestParam("equCode") String equCode) {
         return commonService.checkEquCodeUniqueness(equCode);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/checkFactoryNumUniquenessForVehicleCylinder")
+    @ApiOperation(httpMethod = "GET", value = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）", notes = "车用气瓶业务里面的 出厂编号/产品编码 校验唯一性（产品编号在车用气瓶范围内全局唯一）")
+    public Integer checkFactoryNumUniquenessForVehicleCylinder(@RequestParam("factoryNum") String factoryNum) {
+        return commonService.checkFactoryNumUniquenessForVehicleCylinder(factoryNum,null);
+    }
 }