feat:新增设备区域接口上下限温度为空时自动填充设备对象上下限温度

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/param/MonitorTargetAddParam.java

@@ -13,6 +13,7 @@
 package vip.xiaonuo.coldchain.modular.monitortarget.param;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -36,6 +37,7 @@ public class MonitorTargetAddParam {
      * 状态（1：正常，2：闲置）
      */
     @Schema(description = "状态（1：正常，2：闲置）")
+    @NotNull(message = "状态不能为空")
     private String status;
 
     /**
@@ -66,12 +68,14 @@ public class MonitorTargetAddParam {
      * 报警上限
      */
     @Schema(description = "报警上限")
+    @NotNull(message = "报警上限不能为空")
     private String limitUp;
 
     /**
      * 报警下限
      */
     @Schema(description = "报警下限")
+    @NotNull(message = "报警下限不能为空")
     private String limitDown;
 
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortargetregion/param/MonitorTargetRegionAddParam.java

@@ -31,6 +31,7 @@ public class MonitorTargetRegionAddParam {
      * 区域名称
      */
     @Schema(description = "区域名称")
+    @NotNull(message = "区域名称不能为空")
     private String name;
 
     /**
@@ -40,15 +41,17 @@ public class MonitorTargetRegionAddParam {
     private String parentId;
 
     /**
-     * 监控监控对象
+     * 监控目标对象
      */
-    @Schema(description = "监控监控对象")
+    @Schema(description = "监控目标对象")
+    @NotNull(message = "监控目标对象不能为空")
     private String monitorTargetId;
 
     /**
      * 传感器编号
      */
     @Schema(description = "传感器编号")
+    @NotNull(message = "传感器编号不能为空")
     private String sensorCode;
 
     /**
@@ -61,6 +64,7 @@ public class MonitorTargetRegionAddParam {
      * 传感器路数
      */
     @Schema(description = "传感器路数")
+    @NotNull(message = "传感器路数不能为空")
     private Integer sensorRoute;
 
     /**
@@ -85,13 +89,11 @@ public class MonitorTargetRegionAddParam {
      * 报警上限
      */
     @Schema(description = "报警上限")
-    @NotNull(message = "报警上限不能为空")
     private String limitUp;
 
     /**
      * 报警下限
      */
     @Schema(description = "报警下限")
-    @NotNull(message = "报警下限不能为空")
     private String limitDown;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortargetregion/service/impl/MonitorTargetRegionServiceImpl.java

@@ -25,6 +25,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import vip.xiaonuo.coldchain.modular.monitordevice.entity.MonitorDevice;
 import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
+import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
+import vip.xiaonuo.coldchain.modular.monitortarget.service.MonitorTargetService;
 import vip.xiaonuo.coldchain.modular.monitortargetregion.entity.MonitorTargetRegion;
 import vip.xiaonuo.coldchain.modular.monitortargetregion.mapper.MonitorTargetRegionMapper;
 import vip.xiaonuo.coldchain.modular.monitortargetregion.param.MonitorTargetRegionAddParam;
@@ -48,6 +50,8 @@ import java.util.List;
 public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetRegionMapper, MonitorTargetRegion> implements MonitorTargetRegionService {
     @Resource
     private MonitorDeviceService monitorDeviceService;
+    @Resource
+    private MonitorTargetService monitorTargetService;
 
     @Override
     public Page<MonitorTargetRegion> page(MonitorTargetRegionPageParam monitorTargetRegionPageParam) {
@@ -73,9 +77,16 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
     public void add(MonitorTargetRegionAddParam monitorTargetRegionAddParam) {
         MonitorDevice monitorDevice = monitorDeviceService.queryEntity(monitorTargetRegionAddParam.getMonitorDeviceId());
         Integer sensorCount = monitorDevice.getSensorCount();
+        MonitorTarget monitorTarget = monitorTargetService.queryEntity(monitorTargetRegionAddParam.getMonitorTargetId());
         if (monitorTargetRegionAddParam.getSensorRoute() > sensorCount) {
             throw new CommonException("该传感器路数已用尽");
         }
+        if (ObjectUtil.isNull(monitorTargetRegionAddParam.getLimitUp())) {
+            monitorTargetRegionAddParam.setLimitUp(monitorTarget.getLimitUp());
+        }
+        if (ObjectUtil.isNull(monitorTargetRegionAddParam.getLimitDown())) {
+            monitorTargetRegionAddParam.setLimitDown(monitorTarget.getLimitDown());
+        }
         MonitorTargetRegion monitorTargetRegion = BeanUtil.toBean(monitorTargetRegionAddParam, MonitorTargetRegion.class);
         this.save(monitorTargetRegion);
     }