2022-2-21 吴卿华

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java

@@ -79,7 +79,7 @@ public class TDeviceInfoController extends BaseController
     {
         //添加设备信息表数据 并且返回新增id
         tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
-        if (!"null".equals(listaw.gettDeviceInfoS())){
+        if (listaw.gettDeviceInfoS()!=null){
             //将关联设备信息与设备进行绑定
             tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId(),listaw.gettDeviceInfo().getRelationDeviceType());
         }

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TSiteStationInfoController.java

@@ -88,7 +88,7 @@ public class TSiteStationInfoController extends BaseController {
         String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tSiteStationInfos.gettDeviceInfo().getBeyondEnterpriseId());
         tSiteStationInfos.gettDeviceInfo().setBeyondEnterpriseName(EnterpriseName);
         tSiteStationInfoService.insertTSiteStationInfo(tSiteStationInfos.gettDeviceInfo());
-        if (!"null".equals(tSiteStationInfos.gettDeviceInfoS())){
+        if (tSiteStationInfos.gettDeviceInfoS()!=null){
             //将关联设备信息与设备进行绑定
             tDeviceInfoService.updatetRelationDeviceDetailInfo(tSiteStationInfos.gettDeviceInfoS(),tSiteStationInfos.gettDeviceInfo().getSiteStationId(),tSiteStationInfos.gettDeviceInfo().getRelationDeviceType());
         }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDetectorUser.java

@@ -8,7 +8,7 @@ import com.zehong.common.core.domain.BaseEntity;
 
 /**
  * 燃气用户对象 t_detector_user
- * 
+ *
  * @author zehong
  * @date 2022-02-07
  */
@@ -28,7 +28,7 @@ public class TDetectorUser extends BaseEntity
     private String nickName;
 
     /** 用户类型（1居民用户，2商业用户，3工业用户） */
-    @Excel(name = "用户类型", readConverterExp = "1=居民用户，2商业用户，3工业用户")
+    @Excel(name = "用户类型")
     private String userType;
 
     /** 地址 */
@@ -62,111 +62,111 @@ public class TDetectorUser extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
-    public void setUsername(String username) 
+    public void setUsername(String username)
     {
         this.username = username;
     }
 
-    public String getUsername() 
+    public String getUsername()
     {
         return username;
     }
-    public void setNickName(String nickName) 
+    public void setNickName(String nickName)
     {
         this.nickName = nickName;
     }
 
-    public String getNickName() 
+    public String getNickName()
     {
         return nickName;
     }
-    public void setUserType(String userType) 
+    public void setUserType(String userType)
     {
         this.userType = userType;
     }
 
-    public String getUserType() 
+    public String getUserType()
     {
         return userType;
     }
-    public void setAddress(String address) 
+    public void setAddress(String address)
     {
         this.address = address;
     }
 
-    public String getAddress() 
+    public String getAddress()
     {
         return address;
     }
-    public void setLongitude(BigDecimal longitude) 
+    public void setLongitude(BigDecimal longitude)
     {
         this.longitude = longitude;
     }
 
-    public BigDecimal getLongitude() 
+    public BigDecimal getLongitude()
     {
         return longitude;
     }
-    public void setLatitude(BigDecimal latitude) 
+    public void setLatitude(BigDecimal latitude)
     {
         this.latitude = latitude;
     }
 
-    public BigDecimal getLatitude() 
+    public BigDecimal getLatitude()
     {
         return latitude;
     }
-    public void setLinkman(String linkman) 
+    public void setLinkman(String linkman)
     {
         this.linkman = linkman;
     }
 
-    public String getLinkman() 
+    public String getLinkman()
     {
         return linkman;
     }
-    public void setPhone(String phone) 
+    public void setPhone(String phone)
     {
         this.phone = phone;
     }
 
-    public String getPhone() 
+    public String getPhone()
     {
         return phone;
     }
-    public void setEmail(String email) 
+    public void setEmail(String email)
     {
         this.email = email;
     }
 
-    public String getEmail() 
+    public String getEmail()
     {
         return email;
     }
-    public void setIsDel(String isDel) 
+    public void setIsDel(String isDel)
     {
         this.isDel = isDel;
     }
 
-    public String getIsDel() 
+    public String getIsDel()
     {
         return isDel;
     }
-    public void setRemarks(String remarks) 
+    public void setRemarks(String remarks)
     {
         this.remarks = remarks;
     }
 
-    public String getRemarks() 
+    public String getRemarks()
     {
         return remarks;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPipeInfo.java

@@ -56,7 +56,6 @@ public class TPipeInfo extends BaseEntity
     private String buildUnit;
 
     /**人员类型*/
-    @Excel(name = "人员类型")
     private String peopleOccupation;
 
     /** 权属单位 */
@@ -72,7 +71,6 @@ public class TPipeInfo extends BaseEntity
     private String coordinates;
 
     /** 是否删除(0正常，1删除) */
-    @Excel(name = "是否删除(0正常，1删除)")
     private String isDel;
 
     /** 备注 */

gassafetyprogress-system/src/main/resources/mapper/system/TPipeInfoMapper.xml

@@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pipeAddr"    column="pipe_addr"    />
         <result property="buriedDepth"    column="buried_depth"    />
         <result property="pipeTrend"    column="pipe_trend"    />
-        <result property="peopleOccupation"    column="people_occupation"    />
         <result property="buildDate"    column="build_date"    />
         <result property="buildUnit"    column="build_unit"    />
         <result property="beyondEnterpriseId"    column="beyond_enterprise_id"    />
@@ -28,8 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTPipeInfoVo">
-        select pipe_id,(CASE people_occupation WHEN '1' THEN '运行维护人员' WHEN '2' THEN '抢修人员'end ) as   people_occupation,
-         pipe_length, pipe_diameter, pipe_pressure, pipe_material, pipe_addr, buried_depth, pipe_trend, build_date, build_unit, beyond_enterprise_id, beyond_enterprise_name, coordinates, create_by, create_time, update_by, update_time, is_del, remarks from t_pipe_info
+        select pipe_id,pipe_length, pipe_diameter, pipe_pressure, pipe_material, pipe_addr, buried_depth, pipe_trend, build_date, build_unit, beyond_enterprise_id, beyond_enterprise_name, coordinates, create_by, create_time, update_by, update_time, is_del, remarks from t_pipe_info
     </sql>
 
     <select id="selectTPipeInfoList" parameterType="TPipeInfo" resultMap="TPipeInfoResult">
@@ -70,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pipeTrend != null">pipe_trend,</if>
             <if test="buildDate != null">build_date,</if>
             <if test="buildUnit != null">build_unit,</if>
-            <if test="peopleOccupation != null">people_occupation,</if>
             <if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
             <if test="beyondEnterpriseName != null">beyond_enterprise_name,</if>
             <if test="coordinates != null">coordinates,</if>
@@ -91,7 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pipeTrend != null">#{pipeTrend},</if>
             <if test="buildDate != null">#{buildDate},</if>
             <if test="buildUnit != null">#{buildUnit},</if>
-            <if test="peopleOccupation != null">#{peopleOccupation},</if>
             <if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
             <if test="beyondEnterpriseName != null">#{beyondEnterpriseName},</if>
             <if test="coordinates != null">#{coordinates},</if>
@@ -116,7 +112,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pipeTrend != null">pipe_trend = #{pipeTrend},</if>
             <if test="buildDate != null">build_date = #{buildDate},</if>
             <if test="buildUnit != null">build_unit = #{buildUnit},</if>
-            <if test="peopleOccupation != null">people_occupation = #{peopleOccupation},</if>
             <if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
             <if test="beyondEnterpriseName != null">beyond_enterprise_name = #{beyondEnterpriseName},</if>
             <if test="coordinates != null">coordinates = #{coordinates},</if>

gassafetyprogress-web/src/views/regulation/device/index.vue

@@ -348,15 +348,15 @@
 <!--        </el-row>-->
 
         <el-row>
-          <el-col :span="23">
+          <el-col :span="21">
             <el-form-item label="经纬度坐标" prop="longitude">
               <el-col :span="9">
                 <el-input v-model="form.longitude" placeholder="请输入经度" />
               </el-col>
-              <el-col :span="9" style="margin-left: 10px">
+              <el-col :span="9" style="margin-left: 15px">
                 <el-input v-model="form.latitude" placeholder="请输入纬度"/>
               </el-col>
-              <el-col :span="3" style="margin-left: 30px">
+              <el-col :span="3" style="margin-left: 35px">
                 <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
               </el-col>
             </el-form-item>
@@ -564,15 +564,19 @@ export default {
       rules: {
         deviceName: [
           { required: true, message: "请输入设备名称", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         deviceCode: [
           { required: true, message: "请输入设备编号", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         deviceAddr: [
           { required: true, message: "请输入所在地址", trigger: "blur" },
+          { min: 0, max: 30, message: "长度30位", trigger: "blur" },
         ],
         deviceModel: [
           { required: true, message: "请输入设备型号", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         deviceType: [
           { required: true, message: "请选择设备类型", trigger: "blur" },
@@ -585,15 +589,18 @@ export default {
       formDetailInfoRules:{
         deviceName:[
           { required: true, message: "请输入设备名称", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         deviceModel:[
           { required: true, message: "请输入设备型号", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         deviceType:[
           { required: true, message: "请选择设备类型", trigger: "blur" },
         ],
         iotNo:[
           { required: true, message: "请输入联网编号", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
       },
     };
@@ -679,6 +686,7 @@ export default {
           deviceModel: null,
           iotNo: null,
       }
+      this.getDataList();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

gassafetyprogress-web/src/views/regulation/gasuser/index.vue

@@ -64,7 +64,7 @@
           plain
           icon="el-icon-download"
           size="mini"
-		  :loading="exportLoading"
+		      :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['supervise:user:export']"
         >导出</el-button>
@@ -163,15 +163,15 @@
 <!--        </el-row>-->
 
         <el-row>
-          <el-col :span="23">
+          <el-col :span="21">
             <el-form-item label="经纬度坐标" prop="longitude">
               <el-col :span="9">
                 <el-input v-model="form.longitude" placeholder="请输入经度" />
               </el-col>
-              <el-col :span="9" style="margin-left: 10px">
+              <el-col :span="9" style="margin-left: 15px">
                 <el-input v-model="form.latitude" placeholder="请输入纬度"/>
               </el-col>
-              <el-col :span="3" style="margin-left: 30px">
+              <el-col :span="3" style="margin-left: 33px">
                 <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
               </el-col>
             </el-form-item>
@@ -272,15 +272,18 @@ export default {
       rules: {
         username: [
           { required: true, message: "请输入用户账号", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         nickName: [
           { required: true, message: "请输入用户名称", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         userType: [
           { required: true, message: "请选择用户类型", trigger: "blur" },
         ],
         address: [
           { required: true, message: "请输入地址", trigger: "blur" },
+          { min: 0, max: 30, message: "长度30位", trigger: "blur" },
         ],
       }
     };

gassafetyprogress-web/src/views/regulation/info/index.vue

@@ -144,7 +144,8 @@
                 type="date"
                 placeholder="请选择许可证有效期"
                 format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd">
+                value-format="yyyy-MM-dd"
+                style="width: 117%">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -236,9 +237,11 @@ export default {
       rules: {
         enterpriseName: [
           { required: true, message: "请输入企业名称", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         registerAddress: [
           { required: true, message: "请输入注册地址", trigger: "blur" },
+          { min: 0, max: 20, message: "长度20位", trigger: "blur" },
         ],
         legalRepresentative: [
           { required: true, message: "请输入法定代表人", trigger: "blur" },

gassafetyprogress-web/src/views/regulation/pipe/index.vue

@@ -92,11 +92,11 @@
 
     <el-table v-loading="loading" :data="pipeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="管道长度" align="center" prop="pipeLength" />
+      <el-table-column label="管道长度(米)" align="center" prop="pipeLength" />
       <el-table-column label="走向" align="center" prop="pipeTrend" />
-      <el-table-column label="管径" align="center" prop="pipeDiameter" />
+      <el-table-column label="管径(厘米)" align="center" prop="pipeDiameter" />
       <el-table-column label="压力" align="center" prop="pipePressure" />
-      <el-table-column label="人员类型" align="center" prop="peopleOccupation" />
+<!--      <el-table-column label="人员类型" align="center" prop="peopleOccupation" />-->
       <el-table-column label="建设年代" align="center" prop="buildDate" />
       <el-table-column label="建设单位" align="center" prop="buildUnit" />
       <el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" />
@@ -138,12 +138,16 @@
         <el-row>
           <el-col :span="11">
         <el-form-item label="管道长度" prop="pipeLength">
-          <el-input v-model="form.pipeLength" placeholder="请输入管道长度" />
+          <el-input v-model="form.pipeLength" placeholder="请输入管道长度" >
+            <template slot="append">米</template>
+          </el-input>
         </el-form-item>
           </el-col>
           <el-col :span="11">
         <el-form-item label="管径" prop="pipeDiameter">
-          <el-input v-model="form.pipeDiameter" placeholder="请输入管径" />
+          <el-input v-model="form.pipeDiameter" placeholder="请输入管径" >
+          <template slot="append">厘米</template>
+          </el-input>
         </el-form-item>
           </el-col>
         </el-row>
@@ -156,14 +160,8 @@
           </el-col>
 
           <el-col :span="11">
-            <el-form-item label="建设年代" prop="buildDate">
-              <el-date-picker
-                v-model="form.buildDate"
-                type="date"
-                placeholder="请选择建设年代"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd">
-              </el-date-picker>
+            <el-form-item label="走向" prop="pipeTrend">
+              <el-input v-model="form.pipeTrend" placeholder="请输入走向" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,26 +187,34 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="11">
-            <el-form-item label="走向" prop="pipeTrend">
-              <el-input v-model="form.pipeTrend" placeholder="请输入走向" />
+            <el-form-item label="建设年代" prop="buildDate" >
+              <el-date-picker
+                v-model="form.buildDate"
+                type="date"
+                placeholder="请选择建设年代"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                style="width: 100%">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
-          <el-col :span="11">
-            <el-form-item label="人员类型" prop="peopleOccupation">
-              <el-select v-model="form.peopleOccupation" placeholder="请选择人员类型">
-                <el-option label="运行维护人员" value="1" />
-                <el-option label="抢修人员" value="2" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="11">-->
+<!--            <el-form-item label="人员类型" prop="peopleOccupation">-->
+<!--              <el-select v-model="form.peopleOccupation" placeholder="请选择人员类型">-->
+<!--                <el-option label="运行维护人员" value="1" />-->
+<!--                <el-option label="抢修人员" value="2" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <el-col :span="11">
         <el-form-item label="权属单位" prop="beyondEnterpriseName">
-          <el-select v-model="form.beyondEnterpriseId"  placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
+          <el-select style="width: 230%" v-model="form.beyondEnterpriseId"  placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
             <el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
             </el-option>
           </el-select>
@@ -311,21 +317,26 @@ export default {
       rules: {
         pipeLength: [
           { required: true, message: "请输入管道长度", trigger: "blur" },
+          { min: 0, max: 10, message: "长度10位", trigger: "blur" },
         ],
         pipeDiameter: [
           { required: true, message: "请输入管径", trigger: "blur" },
+          { min: 0, max: 15, message: "长度15位", trigger: "blur" },
         ],
         pipePressure: [
           { required: true, message: "请输入压力", trigger: "blur" },
+          { min: 0, max: 10, message: "长度10位", trigger: "blur" },
         ],
         buildDate: [
           { required: true, message: "请选择建设年代", trigger: "blur" },
         ],
         pipeMaterial: [
           { required: true, message: "请输入材质", trigger: "blur" },
+          { min: 0, max: 10, message: "长度10位", trigger: "blur" },
         ],
         buriedDepth:[
           { required: true, message: "请输入埋深", trigger: "blur" },
+          { min: 0, max: 10, message: "长度10位", trigger: "blur" },
         ],
       }
     };

gassafetyprogress-web/src/views/regulation/station/index.vue

@@ -92,7 +92,7 @@
       </el-table-column>
       <el-table-column label="建设单位" align="center" prop="buildUnit" />
       <el-table-column label="权属单位" align="center" prop="beyondEnterpriseId" />
-      <el-table-column label="权属单位名称" align="center" prop="beyondEnterpriseName" />
+      <el-table-column label="权属单位" align="center" prop="beyondEnterpriseName" />
       <el-table-column label="经度" align="center" prop="longitude" />
       <el-table-column label="纬度" align="center" prop="latitude" />
       <el-table-column label="备注" align="center" prop="remarks" />
@@ -131,7 +131,7 @@
         <el-row>
           <el-col :span="11">
         <el-form-item label="场站类型" prop="siteStationType">
-          <el-select v-model="form.siteStationType" placeholder="请选择场站类型">
+          <el-select v-model="form.siteStationType" placeholder="请选择场站类型" style="width: 100%">
             <el-option label="加气站" value="1" />
             <el-option label="门站" value="2" />
             <el-option label="调压站" value="3" />
@@ -143,7 +143,7 @@
 
             <el-col :span="11">
               <el-form-item label="权属单位" prop="beyondEnterpriseName">
-                <el-select v-model="form.beyondEnterpriseId"  placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
+                <el-select style="width: 100%" v-model="form.beyondEnterpriseId"  placeholder="请在下拉框中选择权属单位" maxlength="255" :disabled="false" clearable>
                   <el-option v-for="item in test" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId">
                   </el-option>
                 </el-select>
@@ -154,7 +154,7 @@
         <el-row>
           <el-col :span="11">
         <el-form-item label="建设年代" prop="buildDate">
-          <el-date-picker clearable size="small"
+          <el-date-picker clearable size="small" style="width: 100%"
             v-model="form.buildDate"
             type="date"
             value-format="yyyy-MM-dd"
@@ -191,15 +191,15 @@
 <!--        </el-row>-->
 
         <el-row>
-          <el-col :span="23">
+          <el-col :span="24">
             <el-form-item label="经纬度坐标" prop="longitude">
-              <el-col :span="9">
+              <el-col :span="8">
                 <el-input v-model="form.longitude" placeholder="请输入经度" />
               </el-col>
-              <el-col :span="9" style="margin-left: 10px">
+              <el-col :span="8" style="margin-left: 20px">
                 <el-input v-model="form.latitude" placeholder="请输入纬度"/>
               </el-col>
-              <el-col :span="3" style="margin-left: 30px">
+              <el-col :span="4" style="margin-left: 30px">
                 <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
               </el-col>
             </el-form-item>
@@ -866,6 +866,7 @@ export default {
         deviceModel: null,
         iotNo: null,
       }
+      this.getDataList();
     },
 
     /**

gassafetyprogress-web/src/views/regulation/supervise/index.vue

@@ -145,7 +145,8 @@
                 type="date"
                 placeholder="请输入发证日期"
                 format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd">
+                value-format="yyyy-MM-dd"
+                style="width: 100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -253,6 +254,7 @@ export default {
       rules: {
         employedPeopleName: [
           { required: true, message: "请输入姓名", trigger: "blur" },
+          { min: 0, max: 10, message: "长度10位", trigger: "blur" },
         ],
         beyondEnterpriseId: [
           { required: true, message: "请选择受聘企业名称", trigger: "blur" },