From 6f7892a50d1e8ec145c81109476b041ed04a1da5 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Wed, 24 May 2023 14:50:18 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-24=2012:14:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=83=BD=E6=BA=90=E7=9B=91=E6=B5=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java | 2 +- .../com/psdc/controller/monitor/AirSourcePumpController.java | 2 +- .../controller/monitor/ElectromagneticBoilerController.java | 2 +- .../com/psdc/controller/monitor/HeatingCableController.java | 2 +- .../java/com/psdc/controller/monitor/SandTableController.java | 2 +- .../com/psdc/controller/monitor/StorageBoilerController.java | 2 +- .../psdc/controller/monitor/TotalElectricMeterController.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java index 567e1a1..3a0c5b5 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcElectricRtdataServiceImpl.java +++ b/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; } } } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java index 3fc7d51..931bf48 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/AirSourcePumpController.java +++ b/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; } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java index 568e21b..0ccc79b 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/ElectromagneticBoilerController.java +++ b/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; } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java index c223d68..2daf9a3 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/HeatingCableController.java +++ b/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; } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java index 4b56c58..be78c32 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/SandTableController.java +++ b/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; } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java index e729537..75dac8a 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/StorageBoilerController.java +++ b/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; } diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java index 833b298..f40f559 100644 --- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java +++ b/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); } }