Browse Source

fix:修复小程序分页接口无法获取房间名问题
feat:新增/编辑冰箱时,冰箱长度限制12
fix:修复温度/湿度/CO2状态判断有误bug

黄渊昊 6 months ago
parent
commit
54d0c2afda

+ 8 - 8
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/service/AppDeviceService.java

@@ -109,19 +109,19 @@ public class AppDeviceService {
                                 float temperatureUp = Math.abs(appDeviceData.getTemperatureUp() - sensorData.getTemperature());
                                 float temperatureDown = Math.abs(appDeviceData.getTemperatureDown() - sensorData.getTemperature());
                                 appDeviceData.setTemperatureStatus(getDataStatus(temperatureUp, temperatureDown,
-                                        appDeviceData.getTemperatureUp(), appDeviceData.getTemperatureDown(), sensorData));
+                                        appDeviceData.getTemperatureUp(), appDeviceData.getTemperatureDown(), sensorData.getTemperature()));
                             }
                             if (Objects.nonNull(sensorData.getHumidity())) {
                                 float humidityUp = Math.abs(appDeviceData.getHumidityUp() - sensorData.getHumidity());
                                 float humidityDown = Math.abs(appDeviceData.getHumidityDown() - sensorData.getHumidity());
                                 appDeviceData.setHumidityStatus(getDataStatus(humidityUp, humidityDown,
-                                        appDeviceData.getHumidityUp(), appDeviceData.getHumidityDown(), sensorData));
+                                        appDeviceData.getHumidityUp(), appDeviceData.getHumidityDown(), sensorData.getHumidity()));
                             }
                             if (Objects.nonNull(sensorData.getCo2())) {
                                 float co2Up = Math.abs(appDeviceData.getCo2Up() - sensorData.getCo2());
                                 float co2Down = Math.abs(appDeviceData.getCo2Down() - sensorData.getCo2());
                                 appDeviceData.setCo2Status(getDataStatus(co2Up, co2Down,
-                                        appDeviceData.getCo2Up(), appDeviceData.getCo2Down(), sensorData));
+                                        appDeviceData.getCo2Up(), appDeviceData.getCo2Down(), sensorData.getCo2()));
                             }
                             appDeviceData.setHumidity(sensorData.getHumidity());
                             appDeviceData.setTemperature(sensorData.getTemperature());
@@ -155,19 +155,19 @@ public class AppDeviceService {
         return pageResult;
     }
 
-    private static String getDataStatus(float absUp, float absDown, float up, float down, SensorData sensorData) {
+    private static String getDataStatus(float absUp, float absDown, float up, float down, float figures) {
         if (absUp < absDown) {
-            if (up > sensorData.getTemperature() && absUp > 5) {
+            if (up > figures && absUp > 5) {
                 return "0";
-            } else if (up > sensorData.getTemperature() && absUp <= 5) {
+            } else if (up > figures && absUp <= 5) {
                 return "1";
             } else {
                 return "2";
             }
         } else {
-            if (down < sensorData.getTemperature() && absDown > 5) {
+            if (down < figures && absDown > 5) {
                 return "0";
-            } else if (down < sensorData.getTemperature() && absDown <= 5) {
+            } else if (down < figures && absDown <= 5) {
                 return "1";
             } else {
                 return "2";

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

@@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 
@@ -37,6 +38,7 @@ public class MonitorTargetAddParam {
      * 名称
      */
     @Schema(description = "名称")
+    @Length(min = 1, max = 12)
     private String name;
 
     /**

+ 2 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/param/MonitorTargetAddWithRoomParam.java

@@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 
@@ -37,6 +38,7 @@ public class MonitorTargetAddWithRoomParam {
      * 名称
      */
     @Schema(description = "名称")
+    @Length(min = 1, max = 12)
     private String name;
 
     /**

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

@@ -18,6 +18,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 
@@ -45,6 +46,7 @@ public class MonitorTargetEditParam {
      * 名称
      */
     @Schema(description = "名称")
+    @Length(min = 1, max = 12)
     private String name;
 
     /**

+ 2 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/monitortarget/param/MonitorTargetEditWithRoomParam.java

@@ -19,6 +19,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.validator.constraints.Length;
 import vip.xiaonuo.coldchain.core.alarm.bean.SensorAlarmUser;
 import vip.xiaonuo.coldchain.core.handler.SensorAlarmUserTypeHandler;
 
@@ -46,6 +47,7 @@ public class MonitorTargetEditWithRoomParam {
      * 名称
      */
     @Schema(description = "名称")
+    @Length(min = 1, max = 12)
     private String name;
 
     /**

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

@@ -239,7 +239,11 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
             monitorTargetPageParam.setOrgId(StpLoginUserUtil.getLoginUser().getOrgId());
         }
         Page<MonitorTarget> page = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());
-        return (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page,monitorTargetPageParam);
+        Page<MonitorTarget> monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam);
+        monitorTargetPage.getRecords().forEach(monitorTarget -> {
+            monitorTarget.setRoomName(targetRoomService.getById(monitorTarget.getRoomId()).getName());
+        });
+        return monitorTargetPage;
     }