fix:修改点位上下限返回值为float

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

@@ -266,6 +266,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
 
     @Override
     public List<MonitorDevice> myList(Boolean isAll,String sensorType) {
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         LambdaQueryWrapper<MonitorDevice> deviceQueryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<MonitorDeviceType> typeQueryWrapper = new LambdaQueryWrapper<>();
         if (sensorType != null) {
@@ -279,7 +280,7 @@ public class MonitorDeviceServiceImpl extends ServiceImpl<MonitorDeviceMapper, M
             deviceQueryWrapper.eq(MonitorDevice::getStatus, MonitorDeviceStatusEnum.NORMAL.getValue())
                     .orderByAsc(MonitorDevice::getSortCode);
         }
-        deviceQueryWrapper.eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        deviceQueryWrapper.eq(MonitorDevice::getCreateOrg,loginUser.getOrgId()).eq(MonitorDevice::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         return list(deviceQueryWrapper);
     }
 

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

@@ -225,12 +225,13 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
 
     @Override
     public List<MonitorTarget> myList(Boolean isAll) {
+        SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
         LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<>();
         if (!isAll) {
             queryWrapper.eq(MonitorTarget::getStatus, MonitorStatusEnum.ONLINE.getCode())
                     .orderByDesc(MonitorTarget::getCreateTime);
         }
-        queryWrapper.eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
+        queryWrapper.eq(MonitorTarget::getCreateOrg,loginUser.getOrgId()).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         return list(queryWrapper);
     }
 

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

@@ -108,14 +108,14 @@ public class MonitorTargetRegion extends OrgEntity {
      */
     @Schema(description = "温度报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float temperatureUp;
     /**
      * 温度报警下限
      */
     @Schema(description = "温度报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float temperatureDown;
 
     /**
@@ -124,14 +124,14 @@ public class MonitorTargetRegion extends OrgEntity {
 
     @Schema(description = "湿度报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float humidityUp;
     /**
      * 湿度报警下限
      */
     @Schema(description = "湿度报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float humidityDown;
 
     /**
@@ -139,7 +139,7 @@ public class MonitorTargetRegion extends OrgEntity {
      */
     @Schema(description = "二氧化碳报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float co2Up;
 
     /**
@@ -147,7 +147,7 @@ public class MonitorTargetRegion extends OrgEntity {
      */
     @Schema(description = "二氧化碳报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float co2Down;
 
     /**

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

@@ -100,14 +100,14 @@ public class MonitorTargetRegionAddParam {
      */
     @Schema(description = "温度报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float temperatureUp;
     /**
      * 温度报警下限
      */
     @Schema(description = "温度报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float temperatureDown;
 
     /**
@@ -116,14 +116,14 @@ public class MonitorTargetRegionAddParam {
 
     @Schema(description = "湿度报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float humidityUp;
     /**
      * 湿度报警下限
      */
     @Schema(description = "湿度报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float humidityDown;
 
     /**
@@ -131,7 +131,7 @@ public class MonitorTargetRegionAddParam {
      */
     @Schema(description = "二氧化碳报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float co2Up;
 
     /**
@@ -139,7 +139,7 @@ public class MonitorTargetRegionAddParam {
      */
     @Schema(description = "二氧化碳报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float co2Down;
 
     /**

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

@@ -104,14 +104,14 @@ public class MonitorTargetRegionEditParam {
      */
     @Schema(description = "温度报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float temperatureUp;
     /**
      * 温度报警下限
      */
     @Schema(description = "温度报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float temperatureDown;
 
     /**
@@ -120,14 +120,14 @@ public class MonitorTargetRegionEditParam {
 
     @Schema(description = "湿度报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float humidityUp;
     /**
      * 湿度报警下限
      */
     @Schema(description = "湿度报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float humidityDown;
 
     /**
@@ -135,7 +135,7 @@ public class MonitorTargetRegionEditParam {
      */
     @Schema(description = "二氧化碳报警上限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float co2Up;
 
     /**
@@ -143,7 +143,7 @@ public class MonitorTargetRegionEditParam {
      */
     @Schema(description = "二氧化碳报警下限")
     @JsonSerialize(using = FloatNullToDashSerializer.class)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
+//    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "#.00")
     private Float co2Down;
 
     /**