实名用户添加必填校验

储罐添加必填校验
储罐实体类修改数据类型为Double

data-ui/src/views/data/housingconstruction/enterprise/index.vue

@@ -336,9 +336,9 @@ export default {
         issuingAuthority: [
           {required: true, message: "发证机关不能为空", trigger: "blur"}
         ],
-        /*deptId:[
-          {required: true, message: "所属部门不能为空", trigger: "blur"}
-        ]*/
+        attachPaths:[
+          {required: true, message: "企业图片不能为空", trigger: "blur"}
+        ]
       }
     };
   },

data-ui/src/views/data/housingconstruction/realnameuser/index.vue

@@ -337,6 +337,9 @@ export default {
           {required: true, message: '纬度不能为空', trigger: ['change', 'blur']},
           {validator: checkLat, trigger: 'blur'}
         ],
+        deptId:[
+          {required: true, message: "所属部门不能为空", trigger: "blur"}
+        ]
       }
     };
   },

data-ui/src/views/data/housingconstruction/storagetank/index.vue

@@ -204,7 +204,7 @@
         <el-row :gutter="24">
           <el-col :span="12">
             <el-form-item label="内部气压" prop="pressure">
-              <el-input v-model="form.pressure" placeholder="请输入内部气压(单位为: PMa)"/>
+              <el-input v-model="form.pressure" placeholder="请输入内部气压(单位为: MPa)"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -313,6 +313,9 @@ export default {
         gasLeak: [
           {required: true, message: "周边可燃性气体泄漏不能为空", trigger: "blur"}
         ],
+        deptId:[
+          {required: true, message: "所属部门不能为空", trigger: "blur"}
+        ]
       }
     };
   },
@@ -471,7 +474,7 @@ export default {
       return `${cellValue.heat} ℃`;
     },
     formatPressure(cellValue) {
-      return `${cellValue.pressure} PMa`;
+      return `${cellValue.pressure} MPa`;
     },
     formatGasLeak(cellValue){
       return `${cellValue.gasLeak} %LEL`;

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionStoragetank.java

@@ -60,37 +60,37 @@ public class CenterdataTHousingconstructionStoragetank extends BaseBusinessEntit
      * 存储量
      */
     @Excel(name = "存储量")
-    private Integer storageCapacity;
+    private Double storageCapacity;
 
     /**
      * 液体液位上限
      */
     @Excel(name = "液体液位上限")
-    private Integer levelCeiling;
+    private Double levelCeiling;
 
     /**
      * 液体液位下限
      */
     @Excel(name = "液体液位下限")
-    private Integer levelFloor;
+    private Double levelFloor;
 
     /**
      * 温度
      */
     @Excel(name = "温度")
-    private Integer heat;
+    private Double heat;
 
     /**
      * 内部气压
      */
     @Excel(name = "内部气压")
-    private Integer pressure;
+    private Double pressure;
 
     /**
      * 周边可燃性气体泄漏
      */
     @Excel(name = "周边可燃性气体泄漏")
-    private Integer gasLeak;
+    private Double gasLeak;
 
     private String state;
 

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionStoragetankLog.java

@@ -50,25 +50,25 @@ public class CenterdataTHousingconstructionStoragetankLog extends BaseBusinessEn
      * 液体液位
      */
     @Excel(name = "液体液位")
-    private Integer level;
+    private Double level;
 
     /**
      * 温度
      */
     @Excel(name = "温度")
-    private Integer heat;
+    private Double heat;
 
     /**
      * 内部气压
      */
     @Excel(name = "内部气压")
-    private Integer pressure;
+    private Double pressure;
 
     /**
      * 周边可燃性气体泄漏
      */
     @Excel(name = "周边可燃性气体泄漏")
-    private Integer gasLeak;
+    private Double gasLeak;
 
     /**
      * 安全状态

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionStoragetankLogServiceImpl.java

@@ -108,35 +108,35 @@ public class CenterdataTHousingconstructionStoragetankLogServiceImpl extends Bas
         );
 
         //液位上限
-        if(storagetankLog.getLevel() >= MapUtils.getInteger(storagetank, "levelCeiling")){
+        if(storagetankLog.getLevel() >= MapUtils.getDouble(storagetank, "levelCeiling")){
             //当前液位高于上限或低于下限, 触发时间告警
             securityState.append("1").append(",");
             sendEvent.sendEvent(template.toString(), StaticEntity.LEVEL_CEILING_NAME, MapUtils.getString(storagetank, "levelCeiling") + units.get(0), storagetankLog.getLevel() + units.get(0), sensorEventVo, StaticEntity.LEVEL_CEILING_CODE);
         }
 
         //液位下限
-        if(storagetankLog.getLevel() <= MapUtils.getInteger(storagetank, "levelFloor")){
+        if(storagetankLog.getLevel() <= MapUtils.getDouble(storagetank, "levelFloor")){
             //当前液位高于上限或低于下限, 触发时间告警
             securityState.append("1").append(",");
             sendEvent.sendEvent(template.toString(), StaticEntity.LEVEL_FLOOR_NAME, MapUtils.getString(storagetank, "levelFloor") + units.get(0), storagetankLog.getLevel() + units.get(0), sensorEventVo, StaticEntity.LEVEL_FLOOR_CODE);
         }
 
         //温度
-        if(storagetankLog.getHeat() >= MapUtils.getInteger(storagetank, "heat")){
+        if(storagetankLog.getHeat() >= MapUtils.getDouble(storagetank, "heat")){
             //当前温度高于设定温度阈值
             securityState.append("2").append(",");
             sendEvent.sendEvent(template.toString(), StaticEntity.HEAT_NAME, MapUtils.getString(storagetank, "heat") + units.get(1), storagetankLog.getHeat() + units.get(1), sensorEventVo, StaticEntity.HEAT_CODE);
         }
 
         //内部气压
-        if(storagetankLog.getPressure() >= MapUtils.getInteger(storagetank, "pressure")){
+        if(storagetankLog.getPressure() >= MapUtils.getDouble(storagetank, "pressure")){
             //当前内部气压高于设定阈值
             securityState.append("3").append(",");
             sendEvent.sendEvent(template.toString(), StaticEntity.PRESSURE_NAME, MapUtils.getString(storagetank, "pressure") + units.get(2), storagetankLog.getPressure() + units.get(2), sensorEventVo, StaticEntity.PRESSURE_CODE);
         }
 
         //可燃气体
-        if(storagetankLog.getGasLeak() >= MapUtils.getInteger(storagetank, "gasLeak")){
+        if(storagetankLog.getGasLeak() >= MapUtils.getDouble(storagetank, "gasLeak")){
             //可燃性气体泄露值高于设定的阈值
             securityState.append("4").append(",");
             sendEvent.sendEvent(template.toString(), StaticEntity.GAS_LEAK_NAME, MapUtils.getString(storagetank, "gasLeak") + units.get(3), storagetankLog.getGasLeak() + units.get(3), sensorEventVo, StaticEntity.GAS_LEAK_CODE);