2904 消防水源，导入导出模板中不应该有图片

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

@@ -103,19 +103,19 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "实景图集合")
     private List<Object> realityImgList;
 
-    @ExcelProperty(value = "方位图", index = 9)
+    @ExcelIgnore
     @ApiModelProperty(value = "方位图")
     private String orientationImg;
 
-    @ExcelProperty(value = "实景图", index = 10)
+    @ExcelIgnore
     @ApiModelProperty(value = "实景图")
     private String realityImg;
 
-    @ExcelProperty(value = "联系人姓名", index = 11)
+    @ExcelProperty(value = "联系人姓名", index = 9)
     @ApiModelProperty(value = "联系人姓名")
     private String contactUser;
 
-    @ExcelProperty(value = "联系人电话", index = 12)
+    @ExcelProperty(value = "联系人电话", index = 10)
     @ApiModelProperty(value = "联系人电话")
     private String contactPhone;
 
@@ -143,7 +143,7 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "资源id")
     private Long resourceId;
 
-    @ExcelProperty(value = "高度（cm）", index = 13)
+    @ExcelProperty(value = "高度（cm）", index = 11)
     @ApiModelProperty(value = "高度（cm）")
     private Float height;
 
@@ -151,16 +151,16 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "水源可用状态类别代码")
     private String statusCode;
 
-    @ExplicitConstraint(type = "SYKYZT", indexNum = 14, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "水源可用状态", index = 14)
+    @ExplicitConstraint(type = "SYKYZT", indexNum = 12, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "水源可用状态", index = 12)
     @ApiModelProperty(value = "水源可用状态类别名称")
     private String status;
 
-    @ExcelProperty(value = "所属路段", index = 15)
+    @ExcelProperty(value = "所属路段", index = 13)
     @ApiModelProperty(value = "所属路段")
     private String section;
 
-    @ExcelProperty(value = "所属管网", index = 16)
+    @ExcelProperty(value = "所属管网", index = 14)
     @ApiModelProperty(value = "所属管网")
     private String pipeNetwork;
 
@@ -168,33 +168,33 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "消防给水管网形式类型代码")
     private String pipeTypeCode;
 
-    @ExplicitConstraint(type = "XFJSGWXS", indexNum = 17, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防给水管网形式", index = 17)
+    @ExplicitConstraint(type = "XFJSGWXS", indexNum = 15, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防给水管网形式", index = 15)
     @ApiModelProperty(value = "消防给水管网形式")
     private String pipeTypeName;
 
-    @ExcelProperty(value = "管网直径（cm）", index = 18)
+    @ExcelProperty(value = "管网直径（cm）", index = 16)
     @ApiModelProperty(value = "管网直径（cm）")
     private Float pipeDiameter;
 
-    @ExcelProperty(value = "进水管直径(cm)", index = 19)
+    @ExcelProperty(value = "进水管直径(cm)", index = 17)
     @ApiModelProperty(value = "进水管直径(cm)")
     private Float inletPipeDiameter;
 
-    @ExcelProperty(value = "出水管直径(cm)", index = 20)
+    @ExcelProperty(value = "出水管直径(cm)", index = 18)
     @ApiModelProperty(value = "出水管直径(cm)")
     private Float outletPipeDiameter;
 
-    @ExcelProperty(value = "加水车道数量(个)", index = 21)
+    @ExcelProperty(value = "加水车道数量(个)", index = 19)
     @ApiModelProperty(value = "加水车道数量(个)")
     private Integer waterfillingLaneNum;
 
-    @ExcelProperty(value = "供水单位名称", index = 22)
+    @ExcelProperty(value = "供水单位名称", index = 20)
     @ApiModelProperty(value = "供水单位名称")
     private String waterSupplyName;
 
-    @ExplicitConstraint(type = "XHSXTLX", indexNum = 23, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消火栓系统类型", index = 23)
+    @ExplicitConstraint(type = "XHSXTLX", indexNum = 21, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消火栓系统类型", index = 21)
     @ApiModelProperty(value = "消火栓系统类型")
     private String systemType;
 
@@ -202,7 +202,7 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "消火栓系统类型code")
     private String systemTypeCode;
 
-    @ExcelProperty(value = "消防设施状况", index = 24)
+    @ExcelProperty(value = "消防设施状况", index = 22)
     @ApiModelProperty(value = "消防设施状况分类")
     private String facilitiesCategory;
 
@@ -210,12 +210,12 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "消防设施状况分类code")
     private String facilitiesCategoryCode;
 
-    @ExcelProperty(value = "道路路口路段", index = 25)
+    @ExcelProperty(value = "道路路口路段", index = 23)
     @ApiModelProperty(value = "道路路口路段简要情况")
     private String roadJunctionInfo;
 
-    @ExplicitConstraint(type = "XHSFZXS", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消火栓放置形式", index = 26)
+    @ExplicitConstraint(type = "XHSFZXS", indexNum = 24, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消火栓放置形式", index = 24)
     @ApiModelProperty(value = "消火栓放置形式")
     private String placeForm;
 
@@ -223,8 +223,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "消火栓放置形式code")
     private String placeFormCode;
 
-    @ExplicitConstraint(type = "XFSDJK", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "消防水带接口", index = 27)
+    @ExplicitConstraint(type = "XFSDJK", indexNum = 25, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "消防水带接口", index = 25)
     @ApiModelProperty(value = "消防水带接口")
     private String hoseConnection;
 
@@ -232,8 +232,8 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "消防水带接口code")
     private String hoseConnectionCode;
 
-    @ExplicitConstraint(type = "QSXS", indexNum = 28, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "取水形式", index = 28)
+    @ExplicitConstraint(type = "QSXS", indexNum = 26, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "取水形式", index = 26)
     @ApiModelProperty(value = "取水形式")
     private String intakeForm;
 
@@ -241,61 +241,61 @@ public class WaterResourceDto extends BaseDto {
     @ApiModelProperty(value = "水源类型代码")
     private String typeCode;
 
-    @ExplicitConstraint(type = "TRSYLX", indexNum = 29, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
-    @ExcelProperty(value = "水源类型", index = 29)
+    @ExplicitConstraint(type = "TRSYLX", indexNum = 27, sourceClass = RoleNameExplicitConstraint.class) //动态下拉内容
+    @ExcelProperty(value = "水源类型", index = 27)
     @ApiModelProperty(value = "水源类型")
     private String type;
 
-    @ExcelProperty(value = "容积（m³）", index = 30)
+    @ExcelProperty(value = "容积（m³）", index = 28)
     @ApiModelProperty(value = "容积（m³）")
     private Float volume;
 
-    @ExcelProperty(value = "面积（㎡）", index = 31)
+    @ExcelProperty(value = "面积（㎡）", index = 29)
     @ApiModelProperty(value = "面积（㎡）")
     private Float area;
 
-    @ExcelProperty(value = "水质情况", index = 32)
+    @ExcelProperty(value = "水质情况", index = 30)
     @ApiModelProperty(value = "水质情况")
     private String qualitySituationInfo;
 
-    @ExcelProperty(value = "四季变化简要情况", index = 33)
+    @ExcelProperty(value = "四季变化简要情况", index = 31)
     @ApiModelProperty(value = "四季变化简要情况")
     private String seasonChangeInfo;
 
-    @ExplicitConstraint(indexNum = 34, source = {"1", "0"}) //固定下拉内容
-    @ExcelProperty(value = "有无枯水期", index = 34)
+    @ExplicitConstraint(indexNum = 32, source = {"1", "0"}) //固定下拉内容
+    @ExcelProperty(value = "有无枯水期", index = 32)
     @ApiModelProperty(value = "有无枯水期")
     private Boolean hasDrySeason;
 
-    @ExcelProperty(value = "枯水期跨度简要情况", index = 35)
+    @ExcelProperty(value = "枯水期跨度简要情况", index = 33)
     @ApiModelProperty(value = "枯水期跨度简要情况")
     private String dryPeriodSpan;
 
-    @ExcelProperty(value = "取水高度(cm)", index = 36)
+    @ExcelProperty(value = "取水高度(cm)", index = 34)
     @ApiModelProperty(value = "取水高度(cm)")
     private Float intakeHeight;
 
-    @ExcelProperty(value = "水源标高差(cm)", index = 37)
+    @ExcelProperty(value = "水源标高差(cm)", index = 35)
     @ApiModelProperty(value = "水源标高差(cm)")
     private Float elevationDifference;
 
-    @ExcelProperty(value = "停车位置", index = 38)
+    @ExcelProperty(value = "停车位置", index = 36)
     @ApiModelProperty(value = "停车位置")
     private String parkingPosition;
 
-    @ExcelProperty(value = "停车数量(个)", index = 39)
+    @ExcelProperty(value = "停车数量(个)", index = 37)
     @ApiModelProperty(value = "停车数量(个)")
     private Integer parkingNum;
 
-    @ExcelProperty(value = "储水量容积", index = 40)
+    @ExcelProperty(value = "储水量容积", index = 38)
     @ApiModelProperty(value = "储水量容积物联编码")
     private String iotWaterStorage;
 
-    @ExcelProperty(value = "流量", index = 41)
+    @ExcelProperty(value = "流量", index = 39)
     @ApiModelProperty(value = "流量物联编码")
     private String iotFlowRate;
 
-    @ExcelProperty(value = "状态", index = 42)
+    @ExcelProperty(value = "状态", index = 40)
     @ApiModelProperty(value = "状态物联编码")
     private String iotStatus;
 
@@ -313,7 +313,7 @@ public class WaterResourceDto extends BaseDto {
     private Long equipId;
 
     @ApiModelProperty("设施定义名称")
-    @ExcelProperty(value = "设施定义名称", index = 43)
+    @ExcelProperty(value = "设施定义名称", index = 41)
     private String equipName;
 
     @ExcelIgnore
@@ -322,7 +322,7 @@ public class WaterResourceDto extends BaseDto {
     //  BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
     @ApiModelProperty("设施分类名称")
     @ExplicitConstraint(indexNum = 44, sourceClass = RoleNameExplicitConstraint.class, method = "getEquipCategory")
-    @ExcelProperty(value = "设施分类名称", index = 44)
+    @ExcelProperty(value = "设施分类名称", index = 42)
     private String equipCategoryName;
 
     @ApiModelProperty("设施编码")
@@ -330,6 +330,6 @@ public class WaterResourceDto extends BaseDto {
     private String equipCode;
 
     @ApiModelProperty("维保周期")
-    @ExcelProperty(value = "维保周期(月)", index = 45)
+    @ExcelProperty(value = "维保周期(月)", index = 43)
     private String maintenancePeriod;
 }