From a8daf0d336bf3d14e5020438ef4c2e1497978008 Mon Sep 17 00:00:00 2001 From: zch Date: Fri, 11 Oct 2024 10:44:15 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=89=8D=E7=AB=AF=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E8=92=B8=E6=B1=BD=E6=9B=B2=E7=BA=BF=E4=B8=BA=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=92=B8=E6=B1=BD=E6=95=B4=E7=82=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=9B=BE=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E5=80=BCinstrumentValue=EF=BC=8C=E5=90=8E=E7=AB=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EmsBaseMonitorInfoServiceImpl.java | 1 + .../controller/EmsReportPointSteamController.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java b/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java index da1f401..42232d4 100644 --- a/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java +++ b/os-ems/src/main/java/com/os/ems/base/service/impl/EmsBaseMonitorInfoServiceImpl.java @@ -146,6 +146,7 @@ public class EmsBaseMonitorInfoServiceImpl implements IEmsBaseMonitorInfoService for (EmsBaseMonitorInfo baseMonitorInfo : baseMonitorInfos) { // 如果是顶级节点, 遍历该父节点的所有子节点 + // 顶级节点的父节点是0，tesmplist没有0（因为objid是从1开始自增主键） if (!tempList.contains(baseMonitorInfo.getParentId())) { recursionFn(baseMonitorInfos, baseMonitorInfo); diff --git a/os-ems/src/main/java/com/os/ems/report/controller/EmsReportPointSteamController.java b/os-ems/src/main/java/com/os/ems/report/controller/EmsReportPointSteamController.java index 95ac9f3..9971a16 100644 --- a/os-ems/src/main/java/com/os/ems/report/controller/EmsReportPointSteamController.java +++ b/os-ems/src/main/java/com/os/ems/report/controller/EmsReportPointSteamController.java @@ -97,4 +97,14 @@ public class EmsReportPointSteamController extends BaseController { public AjaxResult remove(@PathVariable Long[] objIds) { return toAjax(emsReportPointSteamService.deleteEmsReportPointSteamByObjIds(objIds)); } + + + /** + * 查询蒸汽整点数据曲线 + */ + @PreAuthorize("@ss.hasPermi('ems/report:reportPointSteam:list')") + @GetMapping("/pointSteamInstantList") + public AjaxResult pointSteamInstantList(EmsReportPointSteam emsReportPointSteam) { + return success(emsReportPointSteamService.selectEmsReportPointSteamList(emsReportPointSteam)); + } }