//BUG 2920 管网压力字段冗余 BUG 2953 导入模板没有设备编码生成

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -298,7 +298,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "状态物联编码")
     private String iotStatus;
 
-    @ExcelProperty(value = "管网压力", index = 43)
+    //BUG 2920 管网压力字段冗余
+    @ExcelIgnore
     @ApiModelProperty(value = "管网压力物联编码")
     private String iotPipePressure;
 
@@ -310,21 +311,21 @@ public class WaterResourceDto extends BaseDto {
     private Long equipId;
 
     @ApiModelProperty("设施定义名称")
-    @ExcelProperty(value = "设施定义名称", index = 44)
+    @ExcelProperty(value = "设施定义名称", index = 43)
     private String equipName;
 
     @ApiModelProperty("设施分类id")
     private Long equipCategoryId;
 
     @ApiModelProperty("设施分类名称")
-    @ExcelProperty(value = "设施分类名称", index = 45)
+    @ExcelProperty(value = "设施分类名称", index = 44)
     private String equipCategoryName;
 
     @ApiModelProperty("设施编码")
-    @ExcelProperty(value = "设施编码", index = 46)
+    @ExcelProperty(value = "设施编码", index = 45)
     private String equipCode;
 
     @ApiModelProperty("维保周期")
-    @ExcelProperty(value = "维保周期(月)", index = 47)
+    @ExcelProperty(value = "维保周期(月)", index = 46)
     private String maintenancePeriod;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -10,6 +10,7 @@ import com.itextpdf.text.pdf.PdfStructTreeController.returnType;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
+import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
@@ -617,7 +618,11 @@ public class ExcelServiceImpl {
 
 	private void excelImportWaterResource(MultipartFile multipartFile) throws Exception {
 		List<WaterResourceDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, WaterResourceDto.class, 1);
+
 		excelDtoList.forEach(item -> {
+			//BUG 2953  导入模板没有设备编码生成 2021-09-18 陈召开始
+			item.setEquipCode(QRCodeUtil.generateQRCode());
+			//BUG 2953  导入模板没有设备编码生成 2021-09-18 陈召结束
 			if (item.getResourceTypeName() != null) {
 				String[] resourceTypeName = item.getResourceTypeName().split("@");
 				item.setResourceTypeName(resourceTypeName[0]);