2022-2-14 吴卿华

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

@@ -78,10 +78,12 @@ public class TDeviceInfoController extends BaseController
     {
         //添加设备信息表数据 并且返回新增id
         tDeviceInfoService.insertTDeviceInfo(listaw.gettDeviceInfo());
-//        TDeviceInfo tDeviceInfo = new TDeviceInfo();
-//        //根据企业id查询企业名称
-//        String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tDeviceInfo.getBeyondEnterpriseId());
-//        tDeviceInfo.setBeyondEnterpriseName(EnterpriseName);
+        //将关联设备信息与设备进行绑定
+        tDeviceInfoService.updatetRelationDeviceDetailInfo(listaw.gettDeviceInfoS(),listaw.gettDeviceInfo().getDeviceId());
+        TDeviceInfo tDeviceInfo = new TDeviceInfo();
+        //根据企业id查询企业名称
+        String EnterpriseName = tEmployedPeopleInfoService.selectEnterpriseName(tDeviceInfo.getBeyondEnterpriseId());
+        tDeviceInfo.setBeyondEnterpriseName(EnterpriseName);
     }
 
     /**

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TDeviceInfoMapper.java

@@ -3,6 +3,7 @@ package com.zehong.system.mapper;
 import java.util.List;
 import com.zehong.system.domain.TDeviceInfo;
 import com.zehong.system.domain.TDeviceInfoS;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备信息Mapper接口
@@ -90,4 +91,10 @@ public interface TDeviceInfoMapper
      * @param deviceId
      */
     void deleteDetailinfOS(int deviceId);
+
+    /**
+     * 将关联设备信息与设备进行绑定
+     * @param gettDeviceInfoS
+     */
+    void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITDeviceInfoService.java

@@ -3,6 +3,7 @@ package com.zehong.system.service;
 import java.util.List;
 import com.zehong.system.domain.TDeviceInfo;
 import com.zehong.system.domain.TDeviceInfoS;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备信息Service接口
@@ -90,4 +91,10 @@ public interface ITDeviceInfoService
      * @param deviceId
      */
     void deleteDetailinfOS(int deviceId);
+
+    /**
+     * 将关联设备信息与设备进行绑定
+     * @param gettDeviceInfoS
+     */
+    void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS") List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDeviceInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.zehong.system.service.impl;
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.system.domain.TDeviceInfoS;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zehong.system.mapper.TDeviceInfoMapper;
@@ -142,4 +143,13 @@ public class TDeviceInfoServiceImpl implements ITDeviceInfoService
     public void deleteDetailinfOS(int deviceId) {
         tDeviceInfoMapper.deleteDetailinfOS(deviceId);
     }
+
+    /**
+     * 将关联设备信息与设备进行绑定
+     * @param gettDeviceInfoS
+     */
+    @Override
+    public void updatetRelationDeviceDetailInfo(@Param("gettDeviceInfoS")List<TDeviceInfoS> gettDeviceInfoS,@Param("id") Long id) {
+        tDeviceInfoMapper.updatetRelationDeviceDetailInfo(gettDeviceInfoS,id);
+    }
 }

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

@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCode != null  and deviceCode != ''"> and device_code = #{deviceCode}</if>
             <if test="deviceAddr != null  and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
         </where>
+        group by a.device_id desc
     </select>
 
     <select id="selectTDeviceInfoById" parameterType="Long" resultMap="TDeviceInfoResult">
@@ -149,14 +150,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
-    <!--添加关联设备信息表数据-->
-<!--    <insert id="insertDeviceDetailInfo" parameterType="java.util.List">-->
-<!--        INSERT INTO t_relation_device_detail_info (relation_device_id,device_name,device_model,device_type,iot_no)-->
-<!--        VALUES-->
-<!--        <foreach collection="list" item="item" index="key" separator=",">-->
-<!--            (#{item.relationDeviceId},#{item.deviceName},#{item.deviceModel},#{item.deviceType},#{item.iotNo})-->
-<!--        </foreach>-->
-<!--    </insert>-->
 
     <insert id="insertDeviceDetailInfo">
         INSERT INTO t_relation_device_detail_info (relation_device_id,device_name,device_model,device_type,iot_no,remarks)
@@ -193,4 +186,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_relation_device_detail_info set is_del='1' where relation_device_detail_id = #{deviceId}
     </update>
 
+
+    <!--将关联设备信息与设备进行绑定-->
+        <update id="updatetRelationDeviceDetailInfo" parameterType="java.util.List">
+            update t_relation_device_detail_info set relation_device_id = #{id}
+            where
+            relation_device_detail_id in
+            <foreach collection="gettDeviceInfoS" item="items" index="key" open="(" separator="," close=")">
+                #{items.relationDeviceDetailId}
+            </foreach>
+        </update>
+
 </mapper>

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

@@ -115,7 +115,7 @@
 
     <!-- 添加或修改燃气用户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="用户账号" prop="username">
           <el-input v-model="form.username" placeholder="请输入用户账号" />
         </el-form-item>