2023-05-24 12:14:36 优化完善能源监测查询接口!

psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java

@@ -45,7 +45,7 @@ public class PsdcElectricRtdataServiceImpl implements IPsdcElectricRtdataService
             devicePowerRes.setTodayUsePowers(hdata96);
             return devicePowerRes;
         } else {
-            return "该设备今日暂无数据！";
+            return null;
         }
     }
 }

psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java

@@ -32,7 +32,7 @@ public class AirSourcePumpController {
     @PreAuthorize("@ss.hasPermi('emonitor:kqyrb')")
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){
-        AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId));
+        AjaxResult ajax = AjaxResult.success().put("data", psdcElectricRtdataService.queryById(deviceId));
         return ajax;
     }
 

psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java

@@ -32,7 +32,7 @@ public class ElectromagneticBoilerController {
     @PreAuthorize("@ss.hasPermi('emonitor:drgl')")
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){
-        AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId));
+        AjaxResult ajax = AjaxResult.success().put("data", psdcElectricRtdataService.queryById(deviceId));
         return ajax;
     }
 

psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java

@@ -32,7 +32,7 @@ public class HeatingCableController {
     @PreAuthorize("@ss.hasPermi('emonitor:frdl')")
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){
-        AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId));
+        AjaxResult ajax = AjaxResult.success().put("data", psdcElectricRtdataService.queryById(deviceId));
         return ajax;
     }
 

psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java

@@ -26,7 +26,7 @@ public class SandTableController {
     @PreAuthorize("@ss.hasPermi('emonitor:sp')")
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){
-        AjaxResult ajax = AjaxResult.success(psdcDeviceService.queryDeviceStatusById(deviceId));
+        AjaxResult ajax = AjaxResult.success().put("data",psdcDeviceService.queryDeviceStatusById(deviceId));
         return ajax;
     }
 

psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java

@@ -32,7 +32,7 @@ public class StorageBoilerController {
     @PreAuthorize("@ss.hasPermi('emonitor:xrgl')")
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult seldrgl1(@PathVariable(value = "deviceId", required = false) Integer deviceId){
-        AjaxResult ajax = AjaxResult.success(psdcElectricRtdataService.queryById(deviceId));
+        AjaxResult ajax = AjaxResult.success().put("data", psdcElectricRtdataService.queryById(deviceId));
         return ajax;
     }
 

psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java

@@ -81,7 +81,7 @@ public class TotalElectricMeterController {
             AjaxResult ajax = AjaxResult.success(devicePowerRes);
             return ajax;
         } else {
-            return AjaxResult.success("该设备今日暂无数据！");
+            return AjaxResult.success("该设备今日暂无数据！").put("data", null);
         }
 
     }