fix(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

@@ -12,6 +12,7 @@ import java.util.Map;
 public class DictParamsConverter implements Converter<String> {
 
     public static final Map<String, String> dictMap = new HashMap<>();
+    public static final Map<String, String> reverseEquipmentMap = new HashMap<>();
 
     static {
         // 填充映射关系
@@ -77,6 +78,7 @@ public class DictParamsConverter implements Converter<String> {
         dictMap.put("其他控制方式", "4");
         dictMap.put("直接顶升", "1");
         dictMap.put("间接顶升", "2");
+        dictMap.forEach((key, value) -> reverseEquipmentMap.put(value, key));
     }
 
     @Override

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

@@ -12,7 +12,7 @@ import java.util.Map;
 public class EquCategoryConverter implements Converter<String> {
 
     public static final Map<String, String> equipmentMap = new HashMap<>();
-
+    public static final Map<String, String> reverseEquipmentMap = new HashMap<>();
     static {
         // 填充映射关系
         equipmentMap.put("承压蒸汽锅炉", "1100");
@@ -56,6 +56,7 @@ public class EquCategoryConverter implements Converter<String> {
         equipmentMap.put("长输管道", "8100");
         equipmentMap.put("公用管道", "8200");
         equipmentMap.put("工业管道", "8300");
+        equipmentMap.forEach((key, value) -> reverseEquipmentMap.put(value, key));
     }
 
     @Override

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

@@ -12,7 +12,7 @@ import java.util.Map;
 public class EquDefineConverter implements Converter<String> {
 
     private static final Map<String, String> equipmentMap = new HashMap<>();
-
+    public static final Map<String, String> reverseEquipmentMap = new HashMap<>();
     static {
         // 填充映射关系
         equipmentMap.put("有机热载体气相炉", "1310");
@@ -87,6 +87,7 @@ public class EquDefineConverter implements Converter<String> {
         equipmentMap.put("工艺管道", "8310");
         equipmentMap.put("动力管道", "8320");
         equipmentMap.put("制冷管道", "8330");
+        equipmentMap.forEach((key, value) -> reverseEquipmentMap.put(value, key));
     }
 
     @Override

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

@@ -12,7 +12,7 @@ import java.util.Map;
 public class EquListConverter implements Converter<String> {
 
     public static final Map<String, String> equipmentMap = new HashMap<>();
-
+    public static final Map<String, String> reverseEquipmentMap = new HashMap<>();
     static {
         // 填充映射关系
         equipmentMap.put("起重机械", "4000");
@@ -23,6 +23,7 @@ public class EquListConverter implements Converter<String> {
         equipmentMap.put("大型游乐设施", "6000");
         equipmentMap.put("客运索道", "9000");
         equipmentMap.put("电梯", "3000");
+        equipmentMap.forEach((key, value) -> reverseEquipmentMap.put(value, key));
     }
 
     @Override

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

@@ -11,6 +11,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 
 @Data
@@ -45,6 +46,27 @@ public class EquipInfoExcelDto extends BaseDto {
     @ExcelProperty(value = "设备品种", converter = EquDefineConverter.class)
     private String equDefine;
 
+    /**
+     * 保留导入的"设备种类"原始名称（未转换前的值）
+     */
+    @ApiModelProperty(value = "设备种类名称（原始）")
+    @ExcelIgnore
+    private String equListName;
+
+    /**
+     * 保留导入的"设备类别"原始名称（未转换前的值）
+     */
+    @ApiModelProperty(value = "设备类别名称（原始）")
+    @ExcelIgnore
+    private String equCategoryName;
+
+    /**
+     * 保留导入的"设备品种"原始名称（未转换前的值）
+     */
+    @ApiModelProperty(value = "设备品种名称（原始）")
+    @ExcelIgnore
+    private String equDefineName;
+
     @ApiModelProperty(value = "单位内编号")
     @ExcelProperty(value = "单位内编号")
     @NotBlank(message = "单位内编号不能为空")
@@ -201,6 +223,46 @@ public class EquipInfoExcelDto extends BaseDto {
     @ExcelProperty(value = "制造国")
     private String produceCountry;
 
+    //--------------------------------------------------------------------检验信息
+
+    @ApiModelProperty(value = "检验机构名称")
+    @ExcelProperty(value = "检验机构名称")
+    private String inspectOrgName;
+
+    @ApiModelProperty(value = "检验机构统一信用代码")
+    @ExcelProperty(value = "检验机构统一信用代码")
+    private String inspectOrgCode;
+
+    @ApiModelProperty(value = "检验类型")
+    @ExcelProperty(value = "检验类型")
+    private String inspectType;
+
+    @ApiModelProperty(value = "检验结论")
+    @ExcelProperty(value = "检验结论")
+    private String inspectConclusion;
+
+    @ApiModelProperty(value = "检验日期")
+    @ExcelProperty(value = "检验日期")
+    @DateTimeFormat("yyyy-MM-dd")
+    private String inspectDate;
+
+    @ApiModelProperty(value = "下次检验日期")
+    @ExcelProperty(value = "下次检验日期")
+    @DateTimeFormat("yyyy-MM-dd")
+    private String nextInspectDate;
+
+    @ApiModelProperty(value = "检验人员名称")
+    @ExcelProperty(value = "检验人员名称")
+    private String inspectStaff;
+
+    @ApiModelProperty(value = "检验人员身份证号")
+    @ExcelProperty(value = "检验人员身份证号")
+    private String inspectStaffIDNumber;
+
+    @ApiModelProperty(value = "检验报告编号")
+    @ExcelProperty(value = "检验报告编号")
+    private String inspectReportNo;
+
     //--------------------------------------------------------起重机械----技术参数
     @ExcelProperty(value = "额定起重量(t)")
     @ApiModelProperty(value = "额定起重量(t)")
@@ -1047,4 +1109,19 @@ public class EquipInfoExcelDto extends BaseDto {
     @ExcelProperty(value = "控制方式", converter = DictParamsConverter.class)
     @ApiModelProperty(value = "控制方式")
     private String CONTROL_MODE;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "附件信息")
+    private List fileData;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "设备来源")
+    private String DataSourceDesc;
+
+    /**
+     * "管道级别"
+     */
+    @ApiModelProperty(value = "管道级别")
+    @ExcelIgnore
+    private String deviceLevel_GD;
 }
\ 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/controller/DataDockController.java

@@ -60,6 +60,86 @@ public class DataDockController {
     }
 
     /**
+     * 历史-台套类设备导入字段校验
+     * @param file 导入文件
+     * @return 导入数据
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/checkHisSetEquipImportData")
+    @ApiOperation(httpMethod = "POST", value = "历史-台套类设备导入字段校验", notes = "历史-台套类设备导入字段校验")
+    public Object checkSetEquipImportData(@RequestParam MultipartFile file) {
+        // 校验文件是否为空
+        if (file.isEmpty()) {
+            return ResponseHelper.buildResponse("文件不能为空");
+        }
+        // 校验文件类型为 Excel
+        String contentType = file.getContentType();
+        String fileExtension = FilenameUtils.getExtension(file.getOriginalFilename());
+        // 校验 Excel 文件的 MIME type 和扩展名
+        if (!("application/vnd.ms-excel".equals(contentType) || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(contentType)) || !("xls".equalsIgnoreCase(fileExtension) || "xlsx".equalsIgnoreCase(fileExtension))) {
+            return ResponseHelper.buildResponse("文件类型必须是 Excel 文件");
+        }
+        return ResponseHelper.buildResponse(dataDockService.checkSetEquipImportData("his", file));
+    }
+
+    /**
+     * 新设备台套类设备导入字段校验
+     * @param file 导入文件
+     * @return 导入数据
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/checkNewSetEquipImportData")
+    @ApiOperation(httpMethod = "POST", value = "新设备台套类设备导入字段校验", notes = "新设备台套类设备导入字段校验")
+    public Object checkNewSetEquipImportData(@RequestParam MultipartFile file) {
+        // 校验文件是否为空
+        if (file.isEmpty()) {
+            return ResponseHelper.buildResponse("文件不能为空");
+        }
+        // 校验文件类型为 Excel
+        String contentType = file.getContentType();
+        String fileExtension = FilenameUtils.getExtension(file.getOriginalFilename());
+        // 校验 Excel 文件的 MIME type 和扩展名
+        if (!("application/vnd.ms-excel".equals(contentType) || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(contentType)) || !("xls".equalsIgnoreCase(fileExtension) || "xlsx".equalsIgnoreCase(fileExtension))) {
+            return ResponseHelper.buildResponse("文件类型必须是 Excel 文件");
+        }
+        return ResponseHelper.buildResponse(dataDockService.checkSetEquipImportData("new", file));
+    }
+
+    /**
+     * 新设备台套类设备导入字段校验
+     * @param file 导入文件
+     * @return 导入数据
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/checkBlackSetEquipImportData")
+    @ApiOperation(httpMethod = "POST", value = "新设备台套类设备导入字段校验", notes = "新设备台套类设备导入字段校验")
+    public Object checkBlackSetEquipImportData(@RequestParam MultipartFile file) {
+        // 校验文件是否为空
+        if (file.isEmpty()) {
+            return ResponseHelper.buildResponse("文件不能为空");
+        }
+        // 校验文件类型为 Excel
+        String contentType = file.getContentType();
+        String fileExtension = FilenameUtils.getExtension(file.getOriginalFilename());
+        // 校验 Excel 文件的 MIME type 和扩展名
+        if (!("application/vnd.ms-excel".equals(contentType) || "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet".equals(contentType)) || !("xls".equalsIgnoreCase(fileExtension) || "xlsx".equalsIgnoreCase(fileExtension))) {
+            return ResponseHelper.buildResponse("文件类型必须是 Excel 文件");
+        }
+        return ResponseHelper.buildResponse(dataDockService.checkSetEquipImportData("black", file));
+    }
+
+    /**
+     * 气瓶批量保存
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/saveSetEquipImportData")
+    @ApiOperation(httpMethod = "POST", value = "台套类设备导入字段保存", notes = "台套类设备导入字段保存")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
+    public ResponseModel<?> saveSetEquipImportData(@RequestBody Map<String, Object> paramMap) {
+        return ResponseHelper.buildResponse(dataDockService.saveSetEquipImportData(paramMap));
+    }
+
+    /**
      * 工业管道批量检查
      **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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/CommonServiceImpl.java

@@ -740,7 +740,7 @@ public class CommonServiceImpl implements ICommonService {
             Iterator<Map<String, Object>> iterator = resourceJson.get(businessType).iterator();
             while (iterator.hasNext()) {
                 Map<String, Object> item = iterator.next();
-                if (item.get(CODE).equals(PL_DR) || item.get(CODE).equals(DW_LR)) {
+                if (item.get(CODE).equals(DW_LR)) {
                     iterator.remove();
                 }
             }

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

@@ -1195,7 +1195,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if (!ObjectUtils.isEmpty(type) && "PL_DR".equals(type)) {
                 if (EquipmentClassifityEnum.YLRQ.getCode().equals(equList)) {
                     return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
-                            .filter(x -> "2300".equals(x.getDictDataKey()))
+                            .filter(x -> !"2200".equals(x.getDictDataKey()))
                             .collect(Collectors.toList());
                 }
                 if (EquipmentClassifityEnum.YLGD.getCode().equals(equList) && "his".equals(dataSource)) {