fix:修改设备类型名不能正常返回bug

fix:修复获取监控设备列表不能正常查询bug
feat:新增根据modelName获取设备类型对象方法

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevice/service/impl/MonitorDeviceServiceImpl.java

@@ -96,7 +96,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
         queryWrapper.lambda().eq(MonitorDevice::getCreateOrg,loginUser.getOrgId()).eq(MonitorDevice::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
         Page<MonitorDevice> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
         for (MonitorDevice record : page.getRecords()) {
-            MonitorDeviceType monitorDeviceType = monitorDeviceTypeService.getById(record.getModelName());
+            MonitorDeviceType monitorDeviceType = monitorDeviceTypeService.getByModelName(record.getModelName());
             record.setCreateOrgName(loginUser.getOrgName());
             if (ObjectUtil.isNotNull(monitorDeviceType)) {
                 record.setTypeName(monitorDeviceType.getName());
@@ -268,7 +268,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
         }
         List<MonitorDeviceType> list = monitorDeviceTypeService.list(typeQueryWrapper);
         for (MonitorDeviceType deviceType : list) {
-            deviceQueryWrapper.or().eq(MonitorDevice::getModelName,deviceType.getId());
+            deviceQueryWrapper.or().eq(MonitorDevice::getModelName,deviceType.getCode());
         }
         if (!isAll) {
             deviceQueryWrapper.eq(MonitorDevice::getStatus, MonitorDeviceStatusEnum.NORMAL.getValue())

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/service/MonitorDeviceTypeService.java

@@ -83,4 +83,6 @@ public interface MonitorDeviceTypeService extends IService<MonitorDeviceType> {
     boolean getByCode(String code);
 
     List<MonitorDeviceType> myList(String sensorType);
+
+    MonitorDeviceType getByModelName(String modelName);
 }

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitordevicetype/service/impl/MonitorDeviceTypeServiceImpl.java

@@ -104,6 +104,13 @@ public class MonitorDeviceTypeServiceImpl extends ServiceImpl<MonitorDeviceTypeM
         return list(queryWrapper);
     }
 
+    @Override
+    public MonitorDeviceType getByModelName(String modelName) {
+        LambdaQueryWrapper<MonitorDeviceType> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MonitorDeviceType::getCode, modelName);
+        return getOne(queryWrapper);
+    }
+
     public List<MonitorDeviceType> getTypeByName(String name) {
         return this.list(new LambdaQueryWrapper<MonitorDeviceType>()
                 .eq(MonitorDeviceType::getName, name).eq(MonitorDeviceType::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE));

snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortargetregion/entity/MonitorTargetRegion.java

@@ -29,6 +29,7 @@ import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 import vip.xiaonuo.coldchain.modular.app.param.FloatNullToDashSerializer;
 import vip.xiaonuo.common.pojo.OrgEntity;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -179,6 +180,10 @@ public class MonitorTargetRegion extends OrgEntity {
     @JsonIgnore
     private List<NotificationChannel> notificationChannel = List.of(NotificationChannel.WECHAT);
 
+    @Schema(description = "勿扰开始时间")
+    private String ignoreStartTime;
 
+    @Schema(description = "勿扰结束时间")
+    private String ignoreEndTime;
 
 }

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

@@ -24,6 +24,7 @@ import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 import vip.xiaonuo.coldchain.modular.app.param.FloatNullToDashSerializer;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -147,4 +148,10 @@ public class MonitorTargetRegionAddParam {
     @TableField(value = "alarm_users", typeHandler = SensorAlarmUserTypeHandler.class)
     @Schema(description = "告警接收人，存储告警通知的接收用户信息")
     private List<SensorAlarmUser> alarmUsers = Lists.newArrayList();
+
+    @Schema(description = "勿扰开始时间")
+    private String ignoreStartTime;
+
+    @Schema(description = "勿扰结束时间")
+    private String ignoreEndTime;
 }

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

@@ -25,6 +25,7 @@ import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 import vip.xiaonuo.coldchain.modular.app.param.FloatNullToDashSerializer;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -151,4 +152,10 @@ public class MonitorTargetRegionEditParam {
     @TableField(value = "alarm_users", typeHandler = SensorAlarmUserTypeHandler.class)
     @Schema(description = "告警接收人，存储告警通知的接收用户信息")
     private List<SensorAlarmUser> alarmUsers = Lists.newArrayList();
+
+    @Schema(description = "勿扰开始时间")
+    private String ignoreStartTime;
+
+    @Schema(description = "勿扰结束时间")
+    private String ignoreEndTime;
 }