-修改表字段

master/src/main/java/com/ruoyi/project/base/controller/TBaseDeviceController.java

@@ -169,10 +169,10 @@ public class TBaseDeviceController extends BaseController
                         entity.setRegionId(tBaseRegion.getId());
                     } else if (j == 2) {
                         // 设备描述
-                        entity.setDescribe(cellValue);
+                        entity.setDevDescribe(cellValue);
                     } else if (j == 3) {
                         //设备编号
-                        entity.setCode(cellValue);
+                        entity.setDevCode(cellValue);
                     } else if (j == 4) {
                         // 主要物料
                         entity.setMaterial(cellValue);

master/src/main/java/com/ruoyi/project/base/controller/TBasePointController.java

@@ -206,13 +206,13 @@ public class TBasePointController extends BaseController {
                         TBaseDevice tBaseDevice = new TBaseDevice();
                         tBaseDevice.setPlantId(plantId);
                         tBaseDevice.setRegionId(regionId);
-                        tBaseDevice.setCode(devCode);
-                        tBaseDevice.setDescribe(devName);
+                        tBaseDevice.setDevCode(devCode);
+                        tBaseDevice.setDevDescribe(devName);
                         TBaseDevice device = tBaseDeviceService.selectDeviceByPlantRegionAndDevice(tBaseDevice);
                         if (device == null) {
                             return AjaxResult.success("未找到对应设备！请检查装置、区域、设备无误后重新提交！", 0);
                         }
-                        entity.setDevId(device.getId());// 设备id
+                        entity.setDevId(device.getDevId());// 设备id
                     } else if (j == 9) {
                         // 群组位置
                         entity.setGroupPosition(cellValue);

master/src/main/java/com/ruoyi/project/base/domain/TBaseDevice.java

@@ -21,7 +21,7 @@ public class TBaseDevice extends BaseEntity {
     /**
      * 唯一标识id
      */
-    private Long id;
+    private Long devId;
 
     /**
      * 装置id
@@ -59,13 +59,13 @@ public class TBaseDevice extends BaseEntity {
      * 设备/管线编号
      */
     @Excel(name = "设备/管线编号")
-    private String code;
+    private String devCode;
 
     /**
      * 设备/管线描述
      */
     @Excel(name = "设备/管线描述")
-    private String describe;
+    private String devDescribe;
 
 
     /**
@@ -218,12 +218,12 @@ public class TBaseDevice extends BaseEntity {
         this.updater = updater;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public void setDevId(Long devId) {
+        this.devId = devId;
     }
 
-    public Long getId() {
-        return id;
+    public Long getDevId() {
+        return devId;
     }
 
     public void setPlantId(Long plantId) {
@@ -242,20 +242,20 @@ public class TBaseDevice extends BaseEntity {
         return regionId;
     }
 
-    public void setCode(String code) {
-        this.code = code;
+    public void setDevCode(String devCode) {
+        this.devCode = devCode;
     }
 
-    public String getCode() {
-        return code;
+    public String getDevCode() {
+        return devCode;
     }
 
-    public void setDescribe(String describe) {
-        this.describe = describe;
+    public void setDevDescribe(String devDescribe) {
+        this.devDescribe = devDescribe;
     }
 
-    public String getDescribe() {
-        return describe;
+    public String getDevDescribe() {
+        return devDescribe;
     }
 
     public void setApproveStatus(Long approveStatus) {
@@ -325,11 +325,11 @@ public class TBaseDevice extends BaseEntity {
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
+                .append("id", getDevId())
                 .append("plantId", getPlantId())
                 .append("regionId", getRegionId())
-                .append("code", getCode())
-                .append("describe", getDescribe())
+                .append("code", getDevCode())
+                .append("describe", getDevDescribe())
                 .append("remark", getRemark())
                 .append("approveStatus", getApproveStatus())
                 .append("approveTime", getApproveTime())

master/src/main/resources/mybatis/base/TBaseDeviceMapper.xml

@@ -5,15 +5,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.project.base.mapper.TBaseDeviceMapper">
 
     <resultMap type="TBaseDevice" id="TBaseDeviceResult">
-        <result property="id"    column="id"    />
+        <result property="devId"    column="dev_id"    />
         <result property="plantId"    column="plant_id"    />
         <result property="plantName"    column="plant_name"    />
         <result property="plantCode"    column="plant_code"    />
         <result property="regionId"    column="region_id"    />
         <result property="regionName"    column="region_name"    />
         <result property="regionCode"    column="region_code"    />
-        <result property="code"    column="code"    />
-        <result property="describe"    column="describe"    />
+        <result property="devCode"    column="dev_code"    />
+        <result property="devDescribe"    column="dev_describe"    />
         <result property="remarks"    column="remarks"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="approveTime"    column="approve_time"    />
@@ -31,19 +31,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBaseDeviceVo">
-        select id, plant_id, region_id, `code`, `describe`, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate,material,material_status,response_factor,response_factor_from from t_base_device
+        select dev_id, plant_id, region_id, `dev_code`, `dev_describe`, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate,material,material_status,response_factor,response_factor_from from t_base_device
     </sql>
 
     <select id="selectTBaseDeviceList" parameterType="TBaseDevice" resultMap="TBaseDeviceResult">
-        select d.id, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.code, d.describe, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, d.updater_code,su.user_name updater, d.updatedate,d.material,d.material_status,d.response_factor,d.response_factor_from from t_base_device d
+        select d.dev_id, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_code, d.dev_describe, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, d.updater_code,su.user_name updater, d.updatedate,d.material,d.material_status,d.response_factor,d.response_factor_from from t_base_device d
         left join sys_user su on su.user_id = d.updater_code
         left join t_base_plant bp on bp.id = d.plant_id
         left join t_base_region br on br.id = d.region_id
         <where>
             <if test="plantId != null "> and d.plant_id = #{plantId}</if>
             <if test="regionId != null  and regionId != ''"> and d.region_id = #{regionId}</if>
-            <if test="code != null  and code != ''"> and d.code = #{code}</if>
-            <if test="describe != null  and describe != ''"> and d.describe = #{describe}</if>
+            <if test="devCode != null  and devCode != ''"> and d.dev_code = #{devCode}</if>
+            <if test="devDescribe != null  and devDescribe != ''"> and d.dev_describe = #{devDescribe}</if>
             <if test="approveStatus != null "> and d.approve_status = #{approveStatus}</if>
             <if test="approveTime != null "> and d.approve_time = #{approveTime}</if>
             <if test="deptId != null "> and d.dept_id = #{deptId}</if>
@@ -56,16 +56,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectAllDeviceByRegionId" parameterType="long" resultMap="TBaseDeviceResult">
-        select d.id, concat(d.code, '+',d.describe) `describe` from t_base_device d where d.region_id=#{regionId} and d.del_flag=0
+        select d.dev_id, concat(d.dev_code, '+',d.dev_describe) `dev_describe` from t_base_device d where d.region_id=#{regionId} and d.del_flag=0
     </select>
 
     <select id="selectTBaseDeviceById" parameterType="Long" resultMap="TBaseDeviceResult">
         <include refid="selectTBaseDeviceVo"/>
-        where id = #{id}
+        where dev_id = #{devId}
     </select>
     <select id="selectDeviceByPlantRegionAndDevice" parameterType="TBaseDevice" resultMap="TBaseDeviceResult">
         <include refid="selectTBaseDeviceVo"/>
-        where plant_id=#{plantId} and region_id=#{regionId} and `code`=#{code} and `describe`=#{describe} and del_flag=0
+        where plant_id=#{plantId} and region_id=#{regionId} and `dev_code`=#{devCode} and `dev_describe`=#{devDescribe} and del_flag=0
     </select>
 
     <insert id="insertTBaseDevice" parameterType="TBaseDevice" useGeneratedKeys="true" keyProperty="id">
@@ -73,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="plantId != null">plant_id,</if>
             <if test="regionId != null">region_id,</if>
-            <if test="code != null">`code`,</if>
-            <if test="describe != null">`describe`,</if>
+            <if test="devCode != null">`dev_code`,</if>
+            <if test="devDescribe != null">`dev_describe`,</if>
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="approveTime != null">approve_time,</if>
@@ -92,8 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="plantId != null">#{plantId},</if>
             <if test="regionId != null">#{regionId},</if>
-            <if test="code != null">#{code},</if>
-            <if test="describe != null">#{describe},</if>
+            <if test="devCode != null">#{devCode},</if>
+            <if test="devDescribe != null">#{devDescribe},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="approveTime != null">#{approveTime},</if>
@@ -115,8 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="plantId != null">plant_id = #{plantId},</if>
             <if test="regionId != null">region_id = #{regionId},</if>
-            <if test="code != null">`code` = #{code},</if>
-            <if test="describe != null">`describe` = #{describe},</if>
+            <if test="devCode != null">`dev_code` = #{devCode},</if>
+            <if test="devDescribe != null">`dev_describe` = #{devDescribe},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="approveTime != null">approve_time = #{approveTime},</if>
@@ -131,17 +131,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="responseFactor != null">response_factor=#{responseFactor},</if>
             <if test="responseFactorFrom != null">response_factor_from=#{responseFactorFrom},</if>
         </trim>
-        where id = #{id}
+        where dev_id = #{devId}
     </update>
 
     <delete id="deleteTBaseDeviceById" parameterType="Long">
-        update t_base_device set del_flag=1 where id = #{id}
+        update t_base_device set del_flag=1 where dev_id = #{devId}
     </delete>
 
     <delete id="deleteTBaseDeviceByIds" parameterType="String">
-        update t_base_device set del_flag=1 where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
+        update t_base_device set del_flag=1 where dev_id in
+        <foreach item="devId" collection="array" open="(" separator="," close=")">
+            #{devId}
         </foreach>
     </delete>
 </mapper>

master/src/main/resources/mybatis/base/TBasePointMapper.xml

@@ -58,11 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTBasePointList" parameterType="TBasePoint" resultMap="TBasePointResult">
-        select d.id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.code dev_code,bd.`describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_point d
+        select d.id, d.net_test_value, d.leakage_degree, d.plant_id,bp.plant_name,bp.plant_type,bp.plant_code, d.region_id,br.region_code,br.region_name, d.dev_id,bd.dev_code,bd.`dev_describe` dev_name,d.medium, d.medium_type, d.point_type, d.layer, d.group_position, d.point_position, d.group_code, d.extend_code, d.sub_point_type, d.dia, d.unarrive, d.unarrive_reason, d.keep_warm, d.temperature, d.pressure, d.run_time, d.pid_no, d.pid_url, d.pic_no, d.pic_url, d.toc_mark, d.methane_mark, d.vocs_mark, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_point d
         left join sys_user su on su.user_id = d.updater_code
         left join t_base_plant bp on bp.id = d.plant_id
         left join t_base_region br on br.id = d.region_id
-        left join t_base_device bd on bd.id = d.dev_id
+        left join t_base_device bd on bd.dev_id = d.dev_id
         <where>
             <if test="netTestValue != null "> and d.net_test_value = #{netTestValue}</if>
             <if test="leakageDegree != null  and leakageDegree != ''"> and d.leakage_degree = #{leakageDegree}</if>

ui/src/views/base/device/index.vue

@@ -12,17 +12,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="设备/管线编号" prop="code" label-width="110px">
+      <el-form-item label="设备/管线编号" prop="devCode" label-width="110px">
         <el-input
-          v-model="queryParams.code"
+          v-model="queryParams.devCode"
           placeholder="请输入设备/管线编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备/管线描述" prop="describe" label-width="110px">
+      <el-form-item label="设备/管线描述" prop="devDescribe" label-width="110px">
         <el-input
-          v-model="queryParams.describe"
+          v-model="queryParams.devDescribe"
           placeholder="请输入设备/管线描述"
           clearable
           @keyup.enter.native="handleQuery"
@@ -123,8 +123,8 @@
       <el-table-column label="装置编编码" align="center" prop="plantCode" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="区域名称" align="center" prop="regionName" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="区域编号" align="center" prop="regionCode" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="设备/管线编号" align="center" prop="code" :show-overflow-tooltip="true" width="130"/>
-      <el-table-column label="设备/管线描述" align="center" prop="describe" :show-overflow-tooltip="true" width="230"/>
+      <el-table-column label="设备/管线编号" align="center" prop="devCode" :show-overflow-tooltip="true" width="130"/>
+      <el-table-column label="设备/管线描述" align="center" prop="devDescribe" :show-overflow-tooltip="true" width="230"/>
       <el-table-column label="主要物料/产品" align="center" prop="material" :show-overflow-tooltip="true" width="130"/>
       <el-table-column label="物料状态" align="center" prop="materialStatus" :show-overflow-tooltip="true" width="100"/>
       <el-table-column label="合成相应因子" align="center" prop="responseFactor" :show-overflow-tooltip="true" width="100"/>
@@ -190,11 +190,11 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="设备/管线编号" prop="code">
-          <el-input v-model="form.code" placeholder="请输入设备/管线编号"/>
+        <el-form-item label="设备/管线编号" prop="devCode">
+          <el-input v-model="form.devCode" placeholder="请输入设备/管线编号"/>
         </el-form-item>
-        <el-form-item label="设备/管线描述" prop="describe">
-          <el-input v-model="form.describe" placeholder="请输入设备/管线描述"/>
+        <el-form-item label="设备/管线描述" prop="devDescribe">
+          <el-input v-model="form.devDescribe" placeholder="请输入设备/管线描述"/>
         </el-form-item>
         <el-form-item label="主要物料/产品" prop="material">
           <el-input v-model="form.material" placeholder="请输入主要物料/产品"/>
@@ -313,8 +313,8 @@ export default {
         pageSize: 10,
         plantId: null,
         regionId: null,
-        code: null,
-        describe: null,
+        devCode: null,
+        devDescribe: null,
         approveStatus: null,
         approveTime: null,
         deptId: null,
@@ -337,10 +337,10 @@ export default {
         plantId: [
           {required: true, message: this.$t('装置') + this.$t('不能为空'), trigger: "blur"}
         ],
-        describe: [
+        devDescribe: [
           {required: true, message: this.$t('描述') + this.$t('不能为空'), trigger: "blur"}
         ],
-        code: [
+        devCode: [
           {required: true, message: this.$t('编号') + this.$t('不能为空'), trigger: "blur"}
         ],
       }
@@ -436,11 +436,11 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: null,
+        devId: null,
         plantId: null,
         regionId: null,
-        code: null,
-        describe: null,
+        devCode: null,
+        devDescribe: null,
         remark: null,
         approveStatus: 0,
         approveTime: null,
@@ -470,7 +470,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map(item => item.devId)
       this.status = selection.map(item => item.approveStatus)
       this.single = selection.length !== 1
       this.multiple = !selection.length
@@ -484,14 +484,14 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
+      const devId = row.devId || this.ids
       if (row.approveStatus != 0) {
         MessageBox.alert('已送审/已审核的数据不可修改！', '注意！', {
           confirmButtonText: '确定',
         })
         return;
       }
-      getDevice(id).then(response => {
+      getDevice(devId).then(response => {
         this.form = response.data;
         getAllRegion(this.form.plantId).then(response => {
             this.regionOperation = response.data;
@@ -506,7 +506,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
+          if (this.form.devId != null) {
             updateDevice(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -524,7 +524,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
+      const ids = row.devId || this.ids;
       if(row.approveStatus===undefined){
         for (let i = 0; i < this.status.length; i++) {
           if (this.status[i] != 0) {

ui/src/views/base/point/index.vue

@@ -27,9 +27,9 @@
         <el-select v-model="queryParams.devId" @change="handleQuery" placeholder="请选择设备" clearable size="small">
           <el-option
             v-for="dict in deviceOperation"
-            :key="dict.id"
-            :label="dict.describe"
-            :value="dict.id"
+            :key="dict.devId"
+            :label="dict.devDescribe"
+            :value="dict.devId"
           />
         </el-select>
       </el-form-item>
@@ -322,9 +322,9 @@
               <el-select v-model="form.devId" placeholder="请选择设备" clearable size="small" style="width: 100%">
                 <el-option
                   v-for="dict in deviceOperation"
-                  :key="dict.id"
-                  :label="dict.describe"
-                  :value="dict.id"
+                  :key="dict.devId"
+                  :label="dict.devDescribe"
+                  :value="dict.devId"
                 />
               </el-select>
             </el-form-item>