diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java index 460e4f3..e1c0d1a 100644 --- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/background/vo/DeviceBdDetailVo.java +++ b/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; diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java index 7a6b293..1278c03 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/mapper/IDeviceOfBdMapper.java +++ b/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); } diff --git a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java b/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java index 7bfdfea..b73a7ee 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/java/com/securitycontrol/background/service/impl/DeviceOfBdServiceImpl.java +++ b/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); //手动回滚异常 diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml index 63d314c..46b4c3c 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/DeviceBdMapper.xml @@ -155,6 +155,27 @@ WHERE id = #{id} + + + + INSERT INTO tb_device_value + + attribute_id, + unit, + + + #{id}, + #{unit}, + + + + UPDATE tb_device_value + + unit = #{unit}, + + WHERE attribute_id = #{id} + + UPDATE tb_pro_bd SET del_flag = 1 WHERE id = #{id} @@ -163,6 +184,10 @@ UPDATE tb_bd_device SET del_flag = 1 WHERE device_id = #{id} + + + DELETE FROM tb_device_value WHERE attribute_id = #{id} + UPDATE tb_device_detail SET del_flag = 1 WHERE id = #{id} @@ -305,13 +330,15 @@ \ No newline at end of file