From 3c61c5f4bc92f75b4fe60653eaa676a21cde4325 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 19 十二月 2024 17:09:02 +0800
Subject: [PATCH] edit BI Device log and planList
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
index 21a3cbf..7ce7c80 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java
@@ -1,5 +1,6 @@
package com.dy.pmsOther.screen;
+import cn.hutool.json.JSONObject;
import com.dy.common.aop.SsoPowerAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
@@ -32,7 +33,7 @@
public BaseResponse<Map<String, Object>> getDeviceInfo(String deviceNo) {
log.info("DeviceReportCtl.getDeviceInfo():{}",deviceNo);
Map<String, Object> result = sv.getDeviceInfo(deviceNo);
- return BaseResponseUtils.buildSuccess(null);
+ return BaseResponseUtils.buildSuccess(result);
}
/**
* 鏍规嵁鏃堕棿鍖洪棿鏌ヨ 鎵�鏈夎繃绔欒褰�
@@ -44,7 +45,13 @@
List<StaDeviceProductionLog> log = sv.queryDeviceLog(startTime,endTime);
return BaseResponseUtils.buildSuccess(log);
}
-}
-
-
-
+ /**
+ * 浠诲姟鐪嬫澘 鏌ヨ鍦ㄤ骇浠诲姟鐪嬫澘
+ * */
+ @GetMapping(path="queryPlanList")
+ @Log("鏌ヨ鍦ㄤ骇浠诲姟鐪嬫澘")
+ public BaseResponse<List<JSONObject>> queryPlanList(){
+ List<JSONObject> list = sv.queryPlanList();
+ return BaseResponseUtils.buildSuccess(list);
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0