From 05d3dc76af1d6631bf1bff0614dee79e3e4f6e5d Mon Sep 17 00:00:00 2001 From: zch Date: Mon, 16 Dec 2024 09:41:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(ems):=20=E6=B7=BB=E5=8A=A0=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E8=AF=A2=E7=89=A9=E8=81=94=E7=BD=91=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 boardTWTempertureDataList 接口用于看板查询温度数据列表 - 优化 TWTempertureDataController 中的代码格式和注释 - 在 recordIOTInstant.js 中添加对应的前端 API 接口 --- .../TWTempertureDataController.java | 24 +++++++++++++++---- .../src/api/ems/record/recordIOTInstant.js | 8 +++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java index 5da31dd..d2b088f 100644 --- a/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java +++ b/ruoyi-ems/src/main/java/com/ruoyi/ems/record/controller/TWTempertureDataController.java @@ -68,7 +68,11 @@ public class TWTempertureDataController extends BaseController @GetMapping("/iotInstantList") public AjaxResult iotInstantList(TWTempertureData tWTempertureData){ EmsIOTData emsIOTData = new EmsIOTData(); - int energyTypeid = Integer.parseInt(emsBaseMonitorInfoService.selectEmsBaseMonitorTypeByMonitorCode(tWTempertureData.getMonitorId())); + + //cql写的,没看懂下面这行代码的mapper + int energyTypeid = Integer.parseInt(emsBaseMonitorInfoService + .selectEmsBaseMonitorTypeByMonitorCode(tWTempertureData.getMonitorId())); + String energyName = emsBaseEnergyTypeService.queryEnergyNameByEnergyTypeId(energyTypeid); if("温湿度".equals(energyName) || "湿度".equals(energyName)){ emsIOTData.monitorTypeArr.add("温度"); @@ -213,7 +217,19 @@ public class TWTempertureDataController extends BaseController * @return 如果数据库中存在对应的温度数据,返回包含最新数据的列表;如果不存在或查询过程中发生异常,返回空列表。 */ @PostMapping("/selectLastTWTempertureData") - public List selectLastTWTempertureData(@RequestBody TWTempertureData tWTempertureData){ - return tWTempertureDataService.selectLastTWTempertureData(tWTempertureData) ; - } + public List selectLastTWTempertureData(TWTempertureData tWTempertureData){ + return tWTempertureDataService.selectLastTWTempertureData(tWTempertureData); + } + + /** + * 看板查询物联网实时数据列表 + */ + @PreAuthorize("@ss.hasPermi('ems/record:recordIOTInstant:list')") + @PostMapping("/boardTWTempertureDataList") + public AjaxResult boardTWTempertureDataList(TWTempertureData tWTempertureData) + { + List list = tWTempertureDataService.selectTWTempertureDataList(tWTempertureData); + return success(list); + } + } diff --git a/ruoyi-ui/src/api/ems/record/recordIOTInstant.js b/ruoyi-ui/src/api/ems/record/recordIOTInstant.js index 1ac847e..1e955f5 100644 --- a/ruoyi-ui/src/api/ems/record/recordIOTInstant.js +++ b/ruoyi-ui/src/api/ems/record/recordIOTInstant.js @@ -69,3 +69,11 @@ export function selectLastTWTempertureData(data) { data: data }) } + +export function boardTWTempertureDataList(data) { + return request({ + url: '/ems/record/recordIOTInstant/boardTWTempertureDataList', + method: 'post', + data: data + }) +}