feat:新增app专用获取监控设备列表接口

feat:新增电源编号查询条件
feat:新增电源标号唯一校验

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/controller/MonitorDeviceController.java

@@ -127,7 +127,7 @@ public class MonitorDeviceController {
     /**
      * 获取监控设备列表
      *
-     * @param 是否查询所有
+     * @param
      */
     @Operation(summary = "获取监控设备列表")
     @SaCheckPermission("/coldchain/monitordevice/list")
@@ -136,6 +136,18 @@ public class MonitorDeviceController {
         return CommonResult.data(monitorDeviceService.myList(isAll,sensorType));
     }
 
+    /**
+     * 获取监控设备列表(APP专用)
+     *
+     * @param
+     */
+    @Operation(summary = "获取监控设备列表(APP专用)")
+    @SaCheckPermission("/coldchain/monitordevice/list")
+    @GetMapping("/api/coldchain/monitordevice/list")
+    public CommonResult<List<MonitorDevice>> appList(Boolean isAll,String sensorType) {
+        return CommonResult.data(monitorDeviceService.myList(isAll,sensorType));
+    }
+
     /**
     * 检查设备名是否已注册
     */

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicepower/entity/MonitorDevicePower.java

@@ -26,8 +26,8 @@ public class MonitorDevicePower extends OrgEntity {
     @Schema(description = "电源编码")
     private String powerCode;
 
-    /** 电源类型 */
-    @Schema(description = "电源类型")
+    /** 电源型号 */
+    @Schema(description = "电源型号")
     private String powerType;
 
     /** ip */

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicepower/param/MonitorDevicePowerPageParam.java

@@ -55,4 +55,10 @@ public class MonitorDevicePowerPageParam {
      */
     @Schema(description = "设备名称")
     private String powerName;
+
+    /**
+     * 电源编号
+     */
+    @Schema(description = "电源编号")
+    private String powerCode;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicepower/service/impl/MonitorDevicePowerServiceImpl.java

@@ -1,6 +1,7 @@
 package vip.xiaonuo.coldchain.modular.monitordevicepower.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -35,6 +36,8 @@ public class MonitorDevicePowerServiceImpl extends ServiceImpl<MonitorDevicePowe
         queryWrapper.lambda().eq(StrUtil.isNotBlank(monitorDevicePowerPageParam.getPowerName())
                 , MonitorDevicePower::getPowerName, monitorDevicePowerPageParam.getPowerName())
                 .eq(MonitorDevicePower::getCreateOrg,loginUser.getOrgId())
+                .eq(StrUtil.isNotBlank(monitorDevicePowerPageParam.getPowerCode())
+                , MonitorDevicePower::getPowerCode, monitorDevicePowerPageParam.getPowerCode())
                 .orderByAsc(MonitorDevicePower::getSortCode);
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
@@ -42,6 +45,9 @@ public class MonitorDevicePowerServiceImpl extends ServiceImpl<MonitorDevicePowe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void add(MonitorDevicePowerAddParam monitorDevicePowerAddParam) {
+        if (!getPowerListByName(monitorDevicePowerAddParam.getPowerName()).isEmpty()) {
+            throw new CommonException("该电源编号已存在！请重新输入");
+        }
         MonitorDevicePower monitorDevicePower = BeanUtil.copyProperties(monitorDevicePowerAddParam, MonitorDevicePower.class);
         this.save(monitorDevicePower);
     }
@@ -57,7 +63,7 @@ public class MonitorDevicePowerServiceImpl extends ServiceImpl<MonitorDevicePowe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(List<MonitorDevicePowerIdParam> monitorDevicePowerIdParamList) {
-        this.removeByIds(monitorDevicePowerIdParamList);
+        this.removeByIds(CollStreamUtil.toList(monitorDevicePowerIdParamList, MonitorDevicePowerIdParam::getId));
     }
 
     @Override
@@ -82,4 +88,13 @@ public class MonitorDevicePowerServiceImpl extends ServiceImpl<MonitorDevicePowe
                 .eq(MonitorDevicePower::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         return list(queryWrapper);
     }
+
+    public List<MonitorDevicePower> getPowerListByName(String powerName) {
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+        LambdaQueryWrapper<MonitorDevicePower> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MonitorDevicePower::getCreateOrg,loginUser.getOrgId())
+                .eq(MonitorDevicePower::getPowerName, powerName)
+                .eq(MonitorDevicePower::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        return list(queryWrapper);
+    }
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/entity/MonitorDeviceType.java

@@ -108,5 +108,5 @@ public class MonitorDeviceType extends CommonEntity {
 
     /** 厂家 */
     @Schema(description = "厂家")
-    private String makers;
+    private String factory;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/param/MonitorDeviceTypeAddParam.java

@@ -94,4 +94,8 @@ public class MonitorDeviceTypeAddParam {
     /** 供电类型 */
     @Schema(description = "供电类型")
     private String powerType;
+
+    /** 厂家 */
+    @Schema(description = "厂家")
+    private String factory;
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/param/MonitorDeviceTypeEditParam.java

@@ -95,4 +95,8 @@ public class MonitorDeviceTypeEditParam {
     /** 供电类型 */
     @Schema(description = "供电类型")
     private String powerType;
+
+    /** 厂家 */
+    @Schema(description = "厂家")
+    private String factory;
 }