feat:根据用户id获取监控对象分页时如果没穿userId就自动获取当前登录用户id

feat:新增监控区域时检验传感器路数是否用尽

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/entity/MonitorTarget.java

@@ -59,24 +59,6 @@ public class MonitorTarget {
     @Schema(description = "监控位置区域")
     private String monitorPoint;
 
-    /**
-     * 传感器类型
-     */
-    @Schema(description = "传感器类型")
-    private String sensorType;
-
-    /**
-     * 采集器编号
-     */
-    @Schema(description = "采集器编号")
-    private String monitorDeviceId;
-
-    /**
-     * 冷链编号
-     */
-    @Schema(description = "冷链编号")
-    private String code;
-
     /**
      * 报警上限
      */

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/enums/MonitorStatusEnum.java

@@ -26,7 +26,7 @@ public enum MonitorStatusEnum {
      * 设备正常
      */
     ONLINE("1", "设备启用"),
-    OFF("1", "设备停用");
+    OFF("2", "设备停用");
 
     @Getter
     private final String code;

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

@@ -46,24 +46,6 @@ public class MonitorTargetAddParam {
     @Schema(description = "监控位置区域")
     private String monitorPoint;
 
-    /**
-     * 传感器类型
-     */
-    @Schema(description = "传感器类型")
-    private String sensorType;
-
-    /**
-     * 采集器编号
-     */
-    @Schema(description = "采集器编号")
-    private String monitorDeviceId;
-
-    /**
-     * 冷链编号
-     */
-    @Schema(description = "冷链编号")
-    private String code;
-
     /**
      * 报警上限
      */

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

@@ -54,24 +54,6 @@ public class MonitorTargetEditParam {
     @Schema(description = "监控位置区域")
     private String monitorPoint;
 
-    /**
-     * 传感器类型
-     */
-    @Schema(description = "传感器类型")
-    private String sensorType;
-
-    /**
-     * 采集器编号
-     */
-    @Schema(description = "采集器编号")
-    private String monitorDeviceId;
-
-    /**
-     * 冷链编号
-     */
-    @Schema(description = "冷链编号")
-    private String code;
-
     /**
      * 报警上限
      */

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/service/impl/MonitorTargetServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
 import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
 import vip.xiaonuo.coldchain.modular.monitortarget.enums.MonitorStatusEnum;
@@ -119,7 +120,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
     public List<MonitorTarget> getListByUser(String userId) {
         LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<MonitorTarget>();
         if (ObjectUtil.isNotNull(userId)) {
-            queryWrapper.eq(MonitorTarget::getCreateBy, userId).orderByDesc(MonitorTarget::getCreateTime);
+            queryWrapper.eq(MonitorTarget::getCreateBy, userId).eq(MonitorTarget::getStatus,"1")
+                    .orderByDesc(MonitorTarget::getCreateTime);
         }
         queryWrapper.orderByDesc(MonitorTarget::getCreateTime);
         List<MonitorTarget> monitorTargetList = list(queryWrapper);
@@ -135,13 +137,17 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
         if (ObjectUtil.isNotEmpty(monitorTargetPageParam.getName())) {
             queryWrapper.lambda().like(MonitorTarget::getName, monitorTargetPageParam.getName());
         }
+        if (ObjectUtil.isNull(monitorTargetPageParam.getUserId())) {
+            queryWrapper.lambda().eq(MonitorTarget::getCreateBy, StpLoginUserUtil.getLoginUser().getId());
+        } else {
+            queryWrapper.lambda().eq(MonitorTarget::getCreateBy, monitorTargetPageParam.getUserId());
+        }
         if (ObjectUtil.isAllNotEmpty(monitorTargetPageParam.getSortField(), monitorTargetPageParam.getSortOrder())) {
             CommonSortOrderEnum.validate(monitorTargetPageParam.getSortOrder());
             queryWrapper.orderBy(true, monitorTargetPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), StrUtil.toUnderlineCase(monitorTargetPageParam.getSortField()));
         } else {
             queryWrapper.lambda().orderByAsc(MonitorTarget::getId);
         }
-        queryWrapper.lambda().eq(MonitorTarget::getCreateBy, monitorTargetPageParam.getUserId());
         Page<MonitorTarget> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         //获取设备区域列表并赋值返回
         page.getRecords().forEach(monitorTarget -> {

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

@@ -91,8 +91,16 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
         MonitorDevice monitorDevice = monitorDeviceService.queryEntity(monitorTargetRegionAddParam.getMonitorDeviceId());
         Integer sensorCount = monitorDevice.getSensorCount();
         MonitorTarget monitorTarget = monitorTargetService.queryEntity(monitorTargetRegionAddParam.getMonitorTargetId());
+        LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MonitorTargetRegion::getMonitorDeviceId,monitorTargetRegionAddParam.getMonitorDeviceId());
+        List<MonitorTargetRegion> list = list(queryWrapper);
+        for (MonitorTargetRegion monitorTargetRegion : list) {
+            if (monitorTargetRegion.getSensorRoute().equals(monitorTargetRegionAddParam.getSensorRoute())) {
+                throw new CommonException("该传感器路数已被使用，请重新选择");
+            }
+        }
         if (monitorTargetRegionAddParam.getSensorRoute() > sensorCount) {
-            throw new CommonException("该传感器路数已用尽");
+            throw new CommonException("路数超出限制，请重新选择");
         }
         if (ObjectUtil.isNull(monitorTargetRegionAddParam.getLimitUp())) {
             monitorTargetRegionAddParam.setLimitUp(monitorTarget.getLimitUp());
@@ -165,7 +173,7 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
                         new TreeNode<>(locationType.getId(), locationType.getParentId(),
                                 locationType.getName(), 0).setExtra(JSONUtil.parseObj(locationType)))
                 .collect(Collectors.toList());
-        List<Tree<String>> build = TreeUtil.build(treeNodeList, "-1");
+        List<Tree<String>> build = TreeUtil.build(treeNodeList, "0");
         return build;
     }