提交代码

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.java

@@ -40,10 +40,11 @@ public class GRegulatorBox extends BaseEntity {
      * 编号
      */
     private String number;
+    private String isNotXtv;
     /**
      * 商服
      */
-    private Boolean businessService;
+    private String businessService;
     /**
      * 外观
      */
@@ -71,7 +72,7 @@ public class GRegulatorBox extends BaseEntity {
     /**
      * 是否泄露
      */
-    private Boolean isThereALeak;
+    private String isThereALeak;
     /**
      * 调压器
      */
@@ -107,15 +108,15 @@ public class GRegulatorBox extends BaseEntity {
     /**
      * 有无控温器
      */
-    private Boolean thermostat;
+    private String thermostat;
     /**
      * 有无防爆开关
      */
-    private Boolean explosionProofSwitch;
+    private String explosionProofSwitch;
     /**
      * 切断器测试
      */
-    private Boolean cutterTested;
+    private String cutterTested;
     /**
      * 切断器(放散阀)测试情况
      */
@@ -135,7 +136,7 @@ public class GRegulatorBox extends BaseEntity {
     /**
      * 主副路交替
      */
-    private Boolean manOfAccessoryAlternating;
+    private String manOfAccessoryAlternating;
     /**
      * 过滤器
      */
@@ -159,7 +160,7 @@ public class GRegulatorBox extends BaseEntity {
     /**
      * 阀井测试
      */
-    private Boolean valveWellTesting;
+    private String valveWellTesting;
     /**
      * 阀井情况
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java

@@ -1,14 +1,12 @@
 package com.ruoyi.gas.domain.bo;
 
 import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
@@ -43,7 +41,6 @@ public class GRegulatorBoxBo extends BaseEntity {
      * 管理所
      */
     @ApiModelProperty(value = "管理所", required = true)
-    @NotBlank(message = "管理所不能为空", groups = { AddGroup.class, EditGroup.class })
     private String administrativeOffice;
     private String name;
 
@@ -51,195 +48,168 @@ public class GRegulatorBoxBo extends BaseEntity {
      * 编号
      */
     @ApiModelProperty(value = "编号", required = true)
-    @NotBlank(message = "编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String number;
 
     /**
      * 商服
      */
     @ApiModelProperty(value = "商服", required = true)
-    @NotNull(message = "商服不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Boolean businessService;
+    private String businessService;
+    private String isNotXtv;
 
     /**
      * 外观
      */
     @ApiModelProperty(value = "外观", required = true)
-    @NotBlank(message = "外观不能为空", groups = { AddGroup.class, EditGroup.class })
     private String appearance;
 
     /**
      * 主路
      */
     @ApiModelProperty(value = "主路", required = true)
-    @NotBlank(message = "主路不能为空", groups = { AddGroup.class, EditGroup.class })
     private String mainRoad;
     /**
      * 方砖
      */
     @ApiModelProperty(value = "方砖", required = true)
-    @NotBlank(message = "方砖不能为空", groups = { AddGroup.class, EditGroup.class })
     private String squareBrick;
 
     /**
      * 护栏
      */
     @ApiModelProperty(value = "护栏", required = true)
-    @NotBlank(message = "护栏不能为空", groups = { AddGroup.class, EditGroup.class })
     private String guardrail;
 
     /**
      * 基础
      */
     @ApiModelProperty(value = "基础", required = true)
-    @NotBlank(message = "基础不能为空", groups = { AddGroup.class, EditGroup.class })
     private String foundation;
 
     /**
      * 压力表
      */
     @ApiModelProperty(value = "压力表", required = true)
-    @NotBlank(message = "压力表不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pressureGage;
 
     /**
      * 阀门
      */
     @ApiModelProperty(value = "阀门", required = true)
-    @NotBlank(message = "阀门不能为空", groups = { AddGroup.class, EditGroup.class })
     private String valve;
 
     /**
      * 是否泄露
      */
     @ApiModelProperty(value = "是否泄露", required = true)
-    @NotNull(message = "是否泄露不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Boolean isThereALeak;
+    private String isThereALeak;
 
     /**
      * 调压器
      */
     @ApiModelProperty(value = "调压器", required = true)
-    @NotBlank(message = "调压器不能为空", groups = { AddGroup.class, EditGroup.class })
     private String voltageRegulator;
 
     /**
      * 入口压力
      */
     @ApiModelProperty(value = "入口压力", required = true)
-    @NotNull(message = "入口压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal inletPressure;
 
     /**
      * 出口压力(主路)
      */
     @ApiModelProperty(value = "出口压力(主路)", required = true)
-    @NotNull(message = "出口压力(主路)不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal exportPressureMain;
 
     /**
      * 出口压力(副路)
      */
     @ApiModelProperty(value = "出口压力(副路)", required = true)
-    @NotNull(message = "出口压力(副路)不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal exportPressureAccessory;
 
     /**
      * 关闭压力(主路)
      */
     @ApiModelProperty(value = "关闭压力(主路)", required = true)
-    @NotNull(message = "关闭压力(主路)不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal closingPressureMain;
 
     /**
      * 关闭压力(副路)
      */
     @ApiModelProperty(value = "关闭压力(副路)", required = true)
-    @NotNull(message = "关闭压力(副路)不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal closingPressureAccessory;
 
     /**
      * 伴热带
      */
     @ApiModelProperty(value = "伴热带", required = true)
-    @NotBlank(message = "伴热带不能为空", groups = { AddGroup.class, EditGroup.class })
     private String xtv;
 
     /**
      * 有无控温器
      */
     @ApiModelProperty(value = "有无控温器", required = true)
-    @NotNull(message = "有无控温器不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Boolean thermostat;
+    private String thermostat;
 
     /**
      * 有无防爆开关
      */
     @ApiModelProperty(value = "有无防爆开关", required = true)
-    @NotNull(message = "有无防爆开关不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Boolean explosionProofSwitch;
+    private String explosionProofSwitch;
 
     /**
      * 切断器测试
      */
     @ApiModelProperty(value = "切断器测试", required = true)
-    @NotNull(message = "切断器测试不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Boolean cutterTested;
+    private String cutterTested;
 
     /**
      * 切断器(放散阀)测试情况
      */
     @ApiModelProperty(value = "切断器(放散阀)测试情况", required = true)
-    @NotBlank(message = "切断器(放散阀)测试情况不能为空", groups = { AddGroup.class, EditGroup.class })
     private String disconnectorTestStatus;
 
     /**
      * 切断压力(主路)
      */
     @ApiModelProperty(value = "切断压力(主路)", required = true)
-    @NotNull(message = "切断压力(主路)不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal cutOffPressureMain;
 
     /**
      * 切断压力(副路)
      */
     @ApiModelProperty(value = "切断压力(副路)", required = true)
-    @NotNull(message = "切断压力(副路)不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal cutOffPressureAccessory;
 
     /**
      * 放散压力
      */
     @ApiModelProperty(value = "放散压力", required = true)
-    @NotNull(message = "放散压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal releasePressure;
 
     /**
      * 主副路交替
      */
     @ApiModelProperty(value = "主副路交替", required = true)
-    @NotNull(message = "主副路交替不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Boolean manOfAccessoryAlternating;
+    private String manOfAccessoryAlternating;
 
     /**
      * 过滤器
      */
     @ApiModelProperty(value = "过滤器", required = true)
-    @NotBlank(message = "过滤器不能为空", groups = { AddGroup.class, EditGroup.class })
     private String filter;
 
     /**
      * 调压设施特例
      */
     @ApiModelProperty(value = "调压设施特例", required = true)
-    @NotBlank(message = "调压设施特例不能为空", groups = { AddGroup.class, EditGroup.class })
     private String specialCaseOfPressureRegulatingFacilities;
 
     /**
      * 超期巡检天数
      */
     @ApiModelProperty(value = "超期巡检天数", required = true)
-    @NotBlank(message = "超期巡检天数不能为空", groups = { AddGroup.class, EditGroup.class })
     private String overdueInspectionDays;
 
     /**
@@ -258,14 +228,12 @@ public class GRegulatorBoxBo extends BaseEntity {
      * 阀井测试
      */
     @ApiModelProperty(value = "阀井测试", required = true)
-    @NotNull(message = "阀井测试不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Boolean valveWellTesting;
+    private String valveWellTesting;
 
     /**
      * 阀井情况
      */
     @ApiModelProperty(value = "阀井情况", required = true)
-    @NotBlank(message = "阀井情况不能为空", groups = { AddGroup.class, EditGroup.class })
     private String valveWellCondition;
 
     /**

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java

@@ -61,13 +61,14 @@ public class GRegulatorBoxVo extends BaseEntity {
 	@ExcelProperty(value = "编号")
 	@ApiModelProperty("编号")
 	private String number;
+	private String isNotXtv;
 
     /**
      * 商服
      */
 	@ExcelProperty(value = "商服")
 	@ApiModelProperty("商服")
-	private Boolean businessService;
+	private String businessService;
 
     /**
      * 外观
@@ -130,7 +131,7 @@ public class GRegulatorBoxVo extends BaseEntity {
      */
 	@ExcelProperty(value = "是否泄露")
 	@ApiModelProperty("是否泄露")
-	private Boolean isThereALeak;
+	private String isThereALeak;
 
     /**
      * 调压器
@@ -188,21 +189,21 @@ public class GRegulatorBoxVo extends BaseEntity {
      */
 	@ExcelProperty(value = "有无控温器")
 	@ApiModelProperty("有无控温器")
-	private Boolean thermostat;
+	private String thermostat;
 
     /**
      * 有无防爆开关
      */
 	@ExcelProperty(value = "有无防爆开关")
 	@ApiModelProperty("有无防爆开关")
-	private Boolean explosionProofSwitch;
+	private String explosionProofSwitch;
 
     /**
      * 切断器测试
      */
 	@ExcelProperty(value = "切断器测试")
 	@ApiModelProperty("切断器测试")
-	private Boolean cutterTested;
+	private String cutterTested;
 
     /**
      * 切断器(放散阀)测试情况
@@ -238,7 +239,7 @@ public class GRegulatorBoxVo extends BaseEntity {
      */
 	@ExcelProperty(value = "主副路交替")
 	@ApiModelProperty("主副路交替")
-	private Boolean manOfAccessoryAlternating;
+	private String manOfAccessoryAlternating;
 
     /**
      * 过滤器
@@ -284,7 +285,7 @@ public class GRegulatorBoxVo extends BaseEntity {
      */
 	@ExcelProperty(value = "阀井测试")
 	@ApiModelProperty("阀井测试")
-	private Boolean valveWellTesting;
+	private String valveWellTesting;
 
     /**
      * 阀井情况