Explorar el Código

fix : 设备详情

jackzhou hace 6 meses
padre
commit
e078b6f765

+ 3 - 3
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/controller/AppController.java

@@ -63,10 +63,10 @@ public class AppController {
     }
 
     // 查询设备数据接口(POST)
-    @PostMapping("/device/view/{deviceCode}/{roads}")
+    @PostMapping("/device/view")
     @Operation(summary = "查询采集设备数据")
-    public CommonResult<Map<String, Object>> queryDeviceData(@RequestBody @Valid AppDeviceQueryParams appDeviceQueryParams, @PathVariable(value = "deviceCode", required = true) String deviceCode, @PathVariable(value = "roads", required = true) Integer roads) {
-        List<SensorData> sensorDataList = appDeviceService.queryDataByDeviceIdAndRoads(appDeviceQueryParams, deviceCode, roads);
+    public CommonResult<Map<String, Object>> queryDeviceData(@RequestBody @Valid AppDeviceQueryParams appDeviceQueryParams) {
+        List<SensorData> sensorDataList = appDeviceService.queryDataByDeviceIdAndRoads(appDeviceQueryParams);
         Map<String, Object> stringObjectMap = SensorDataTransformer.transformToResponseFormat2(sensorDataList);
         return CommonResult.data((stringObjectMap));
     }

+ 3 - 0
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/app/param/AppDeviceQueryParams.java

@@ -28,4 +28,7 @@ public class AppDeviceQueryParams {
     private Double maxCo2Level;          // 最高二氧化碳浓度
     private Metric metric;  // 使用 Metric 枚举
 
+    private String sensorCode;
+    private Integer sensorRoute;
+
 }

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

@@ -145,8 +145,8 @@ public class AppDeviceService {
         return deviceStatus;
     }
 
-    public List<SensorData> queryDataByDeviceIdAndRoads(AppDeviceQueryParams appDeviceQueryParams, String deviceCode, Integer roads) {
+    public List<SensorData> queryDataByDeviceIdAndRoads(AppDeviceQueryParams appDeviceQueryParams) {
         Assert.notNull(appDeviceQueryParams, "appDeviceQueryParams cannot be null");
-        return monitorDeviceService.queryDataByDeviceIdAndRoads(deviceCode, roads, appDeviceQueryParams.getStartTime(), appDeviceQueryParams.getEndTime());
+        return monitorDeviceService.queryDataByDeviceIdAndRoads(appDeviceQueryParams.getSensorCode(), appDeviceQueryParams.getSensorRoute(), appDeviceQueryParams.getStartTime(), appDeviceQueryParams.getEndTime());
     }
 }