边带设备

securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java

@@ -47,6 +47,11 @@ public class DeviceBdDetailVo {
     @Length(max = 50, message = "检设备级联编码字符长度不能超过50", groups = {Query.class})
     private String deviceCode;
 
+    @ApiModelProperty("采集数据单位")
+    @NotBlank(message = "采集数据单位不能为空", groups = {Query.class})
+    @Length(max = 255, message = "采集数据单位字符长度不能超过50", groups = {Query.class})
+    private String unit;
+
     @ApiModelProperty("1.新增 2.修改")
     private int type;
 

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java

@@ -200,10 +200,30 @@ public interface IDeviceOfBdMapper {
 
     /**
      * 删除边带子设备详情数据
+     *
      * @param dto
      * @description
      * @author cwchen
      * @date 2024/4/2 17:40
      */
     void delDeviceBdChildDetail(DeviceBdDto dto);
+
+    /**
+     * 新增/修改 边带设备采集信息数据
+     *
+     * @param vo
+     * @description
+     * @author cwchen
+     * @date 2024/4/3 9:39
+     */
+    void addOrUpdateDeviceValue(DeviceBdDetailVo vo);
+
+    /**
+     * 删除边带设备采集信息数据
+     * @param dto
+     * @description
+     * @author cwchen
+     * @date 2024/4/3 9:44
+     */
+    void delDeviceValue(DeviceBdDto dto);
 }

securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java

@@ -228,6 +228,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
                 vo.setType(2);
             }
             mapper.addOrUpdateDeviceBdChildDetail(vo);
+            mapper.addOrUpdateDeviceValue(vo);
         } catch (Exception e) {
             log.error("新增/修改边带子设备详情数据", e);
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -255,6 +256,7 @@ public class DeviceOfBdServiceImpl implements IDeviceOfBdService {
                 return AjaxResult.error("参数不完整");
             }
             mapper.delDeviceBdChildDetail(dto);
+            mapper.delDeviceValue(dto);
         } catch (Exception e) {
             log.error("删除边带子设备详情数据", e);
             //手动回滚异常

securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml

@@ -155,6 +155,27 @@
             WHERE id = #{id}
         </if>
     </insert>
+    <!--新增/修改 设备采集信息表-->
+    <insert id="addOrUpdateDeviceValue">
+        <if test="type == 1">
+            INSERT INTO tb_device_value
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null and id != ''">attribute_id,</if>
+                <if test="unit != null and unit!=''">unit,</if>
+            </trim>
+            <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null and id != ''">#{id},</if>
+                <if test="unit != null and unit!=''">#{unit},</if>
+            </trim>
+        </if>
+        <if test="type == 2">
+            UPDATE tb_device_value
+            <set>
+                <if test="unit != null and unit != ''">unit = #{unit},</if>
+            </set>
+            WHERE attribute_id = #{id}
+        </if>
+    </insert>
     <!--删除边带设备-->
     <delete id="delDeviceBdById">
         UPDATE tb_pro_bd SET del_flag = 1 WHERE id = #{id}
@@ -163,6 +184,10 @@
     <delete id="delDeviceBdChildById">
         UPDATE tb_bd_device SET del_flag = 1 WHERE device_id = #{id}
     </delete>
+    <!--删除边带设备采集信息数据-->
+    <delete id="delDeviceValue">
+        DELETE FROM tb_device_value WHERE attribute_id = #{id}
+    </delete>
     <!--删除边带子设备详情数据-->
     <update id="delDeviceBdChildDetail">
         UPDATE tb_device_detail SET del_flag = 1 WHERE id = #{id}
@@ -305,13 +330,15 @@
     <!--边带子设备详情数据-->
     <select id="getDeviceBdChildDetailById"
             resultType="com.securitycontrol.entity.background.vo.DeviceBdDetailVo">
-        SELECT id,
+        SELECT tdd.id,
-               mode_name AS modeName,
+               tdd.mode_name AS modeName,
-               max_value AS maxValueData,
+               tdd.max_value AS maxValueData,
-               min_valu AS minValueData,
+               tdd.min_valu AS minValueData,
-               data_type AS dataType,
+               tdd.data_type AS dataType,
-               device_code AS deviceCode
+               tdd.device_code AS deviceCode,
-        FROM tb_device_detail
+               tdv.unit
+        FROM tb_device_detail tdd
+        LEFT JOIN tb_device_value tdv ON tdd.id = tdv.attribute_id
         WHERE id = #{id} AND del_flag = 0
     </select>
 </mapper>