提交代码

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

@@ -1,14 +1,13 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
 
 /**
  * 调压箱详情对象 g_pressure_regulating_box_details
@@ -28,6 +27,11 @@ public class GPressureRegulatingBoxDetails extends BaseEntity {
      */
     @TableId(value = "id")
     private Long id;
+    private Date receivingTime;
+    private Long totalNumberOfHouseholds;
+    private String positionOfPressureRegulatingBox;
+    private String controlRange;
+    private String mainPowerSupplyPosition;
     /**
      * 调压箱id
      */

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

@@ -34,21 +34,18 @@ public class GPressureRegulatingBoxBo extends BaseEntity {
      * 性质
      */
     @ApiModelProperty(value = "性质", required = true)
-    @NotBlank(message = "性质不能为空", groups = { AddGroup.class, EditGroup.class })
     private String nature;
 
     /**
      * 类型
      */
     @ApiModelProperty(value = "类型", required = true)
-    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 路数
      */
     @ApiModelProperty(value = "路数", required = true)
-    @NotBlank(message = "路数不能为空", groups = { AddGroup.class, EditGroup.class })
     private String numberOfRoutes;
 
     /**
@@ -90,7 +87,6 @@ public class GPressureRegulatingBoxBo extends BaseEntity {
      * 备注
      */
     @ApiModelProperty(value = "备注", required = true)
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -1,17 +1,17 @@
 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.*;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
-import com.ruoyi.common.core.domain.BaseEntity;
-
 /**
  * 调压箱详情业务对象 g_pressure_regulating_box_details
  *
@@ -30,6 +30,10 @@ public class GPressureRegulatingBoxDetailsBo extends BaseEntity {
     @ApiModelProperty(value = "序号", required = true)
     @NotNull(message = "序号不能为空", groups = { EditGroup.class })
     private Long id;
+    private Long totalNumberOfHouseholds;
+    private String positionOfPressureRegulatingBox;
+    private String controlRange;
+    private String mainPowerSupplyPosition;
 
     /**
      * 调压箱id
@@ -38,116 +42,102 @@ public class GPressureRegulatingBoxDetailsBo extends BaseEntity {
     @NotNull(message = "调压箱id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long regulatingBoxId;
 
+    private Date receivingTime;
+
     /**
      * 阀井位置
      */
     @ApiModelProperty(value = "阀井位置", required = true)
-    @NotBlank(message = "阀井位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String valveWellPosition;
 
     /**
      * 阀井钥匙形状
      */
     @ApiModelProperty(value = "阀井钥匙形状", required = true)
-    @NotBlank(message = "阀井钥匙形状不能为空", groups = { AddGroup.class, EditGroup.class })
     private String valveWellKeyShape;
 
     /**
      * 厂家
      */
     @ApiModelProperty(value = "厂家", required = true)
-    @NotBlank(message = "厂家不能为空", groups = { AddGroup.class, EditGroup.class })
     private String manufacturer;
 
     /**
      * 流量
      */
     @ApiModelProperty(value = "流量", required = true)
-    @NotBlank(message = "流量不能为空", groups = { AddGroup.class, EditGroup.class })
     private String flow;
 
     /**
      * 进口管径
      */
     @ApiModelProperty(value = "进口管径", required = true)
-    @NotBlank(message = "进口管径不能为空", groups = { AddGroup.class, EditGroup.class })
     private String importPipeDiameter;
 
     /**
      * 出口管径
      */
     @ApiModelProperty(value = "出口管径", required = true)
-    @NotBlank(message = "出口管径不能为空", groups = { AddGroup.class, EditGroup.class })
     private String outletPipeDiameter;
 
     /**
      * 旁通管径
      */
     @ApiModelProperty(value = "旁通管径", required = true)
-    @NotBlank(message = "旁通管径不能为空", groups = { AddGroup.class, EditGroup.class })
     private String bypassPipeDiameter;
 
     /**
      * 调压器
      */
     @ApiModelProperty(value = "调压器", required = true)
-    @NotBlank(message = "调压器不能为空", groups = { AddGroup.class, EditGroup.class })
     private String voltageRegulator;
 
     /**
      * 设施规格型号
      */
     @ApiModelProperty(value = "设施规格型号", required = true)
-    @NotBlank(message = "设施规格型号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String facilitySpecificationsAndModels;
 
     /**
      * 入口压力
      */
     @ApiModelProperty(value = "入口压力", required = true)
-    @NotBlank(message = "入口压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private String inletPressure;
 
     /**
      * 出口压力
      */
     @ApiModelProperty(value = "出口压力", required = true)
-    @NotBlank(message = "出口压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private String outletPressure;
 
     /**
      * 切断压力
      */
     @ApiModelProperty(value = "切断压力", required = true)
-    @NotBlank(message = "切断压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cutOffPressure;
 
     /**
      * 放散压力
      */
     @ApiModelProperty(value = "放散压力", required = true)
-    @NotBlank(message = "放散压力不能为空", groups = { AddGroup.class, EditGroup.class })
     private String releasePressure;
 
     /**
      * 出厂编号
      */
     @ApiModelProperty(value = "出厂编号", required = true)
-    @NotBlank(message = "出厂编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String factoryNumber;
 
     /**
      * 出厂日期
      */
     @ApiModelProperty(value = "出厂日期", required = true)
-    @NotBlank(message = "出厂日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private String factoryDate;
 
     /**
      * 备注
      */
     @ApiModelProperty(value = "备注", required = true)
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

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

@@ -2,11 +2,10 @@ package com.ruoyi.gas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 
@@ -30,7 +29,11 @@ public class GPressureRegulatingBoxDetailsVo {
 	@ExcelProperty(value = "序号")
 	@ApiModelProperty("序号")
 	private Long id;
-
+	private Date receivingTime;
+	private Long totalNumberOfHouseholds;
+	private String positionOfPressureRegulatingBox;
+	private String controlRange;
+	private String mainPowerSupplyPosition;
     /**
      * 调压箱id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPressureRegulatingBoxServiceImpl.java

@@ -18,6 +18,7 @@ import com.ruoyi.gas.service.IGPressureRegulatingBoxDetailsService;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -34,7 +35,12 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
 
     @Override
     public GPressureRegulatingBoxVo queryById(Long id){
-        return getVoById(id);
+        GPressureRegulatingBoxVo voById = getVoById(id);
+        GPressureRegulatingBoxDetailsBo gPressureRegulatingBoxDetailsBo = new GPressureRegulatingBoxDetailsBo();
+        gPressureRegulatingBoxDetailsBo.setRegulatingBoxId(voById.getId());
+        TableDataInfo<GPressureRegulatingBoxDetailsVo> queriedPageList = pressureRegulatingBoxDetailsService.queryPageList(gPressureRegulatingBoxDetailsBo);
+        voById.setPressureRegulatingBoxDetailsVo(queriedPageList.getRows());
+        return voById;
     }
 
     @Autowired
@@ -71,12 +77,15 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(GPressureRegulatingBoxBo bo) {
         GPressureRegulatingBox add = BeanUtil.toBean(bo, GPressureRegulatingBox.class);
         validEntityBeforeSave(add);
         boolean flag = save(add);
         if (flag) {
             bo.setId(add.getId());
+            bo.getPressureRegulatingBoxDetailsBo().setRegulatingBoxId(add.getId());
+            pressureRegulatingBoxDetailsService.insertByBo(bo.getPressureRegulatingBoxDetailsBo());
         }
         return flag;
     }
@@ -85,6 +94,7 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
     public Boolean updateByBo(GPressureRegulatingBoxBo bo) {
         GPressureRegulatingBox update = BeanUtil.toBean(bo, GPressureRegulatingBox.class);
         validEntityBeforeSave(update);
+        pressureRegulatingBoxDetailsService.updateByBo(bo.getPressureRegulatingBoxDetailsBo());
         return updateById(update);
     }
 

ruoyi-mobile/src/main/resources/mapper/mobile/MUserMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="search2" resultType="java.util.Map">
         SELECT
         a.id AS id,
-        (SELECT name FROM g_area ar WHERE ar.id = a.area_id) AS name,
+        a.name AS name,
         a.create_time AS time
         FROM
         g_regulator_box a WHERE a.del_flag =0