2022/2/12 吴卿华

gassafetyprogress-admin/src/main/java/com/zehong/web/codeconfig/CodeConFig.java

+package com.zehong.web.codeconfig;
+
+import java.util.Random;
+
+public class CodeConFig {
+
+    //生成四位随机数
+    public static String  RandomCode(){
+        //生成一个6位随机数
+        String radom = String.valueOf(new Random().nextInt(999999));
+        String substring = radom.substring(0,4);
+        return substring;
+    }
+}

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

@@ -6,6 +6,7 @@ import com.zehong.system.domain.Listaw;
 import com.zehong.system.domain.TDetailInfoList;
 import com.zehong.system.domain.TDeviceInfoS;
 import com.zehong.system.service.ITEmployedPeopleInfoService;
+import com.zehong.web.codeconfig.CodeConFig;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -77,8 +78,12 @@ public class TDeviceInfoController extends BaseController
     @PostMapping
     public void add(@RequestBody Listaw listaw)
     {
+        //生成四位随机码
+        String code = CodeConFig.RandomCode();
+        listaw.gettDeviceInfo().setDeviceCode(code);
         //添加设备信息表数据 并且返回新增id
         tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
+
         if (listaw.gettDeviceInfoS()!=null){
             //将关联设备信息与设备进行绑定
             tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId(),listaw.gettDeviceInfo().getRelationDeviceType());

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

@@ -294,7 +294,7 @@
 
         <el-col :span="11">
         <el-form-item label="设备编号" prop="deviceCode">
-          <el-input v-model="form.deviceCode" placeholder="请输入设备编号" />
+          <el-input v-model="form.deviceCode" placeholder="请输入设备编号" :disabled="true"/>
         </el-form-item>
         </el-col>
         </el-row>
@@ -566,18 +566,10 @@ export default {
           { 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" },
         ],