From ce988f65d5b0c74ad5c104d05f1155ed05b1db72 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 14 一月 2025 14:08:39 +0800
Subject: [PATCH] orderList
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/screen/ScreenReportCtrl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 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..805dfca 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,10 +1,12 @@
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;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
+import com.dy.pmsGlobal.pojoPr.PrOrder;
import com.dy.pmsGlobal.pojoPr.PrProductionProcess;
import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
import jakarta.validation.Valid;
@@ -32,7 +34,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 +46,58 @@
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);
+ }
+ /**
+ * 浠诲姟鐪嬫澘 鏌ヨ宸ョ珯浣跨敤鎯呭喌
+ * */
+ @GetMapping(path="queryWorkList")
+ @Log("鏌ヨ宸ョ珯浣跨敤鎯呭喌")
+ public BaseResponse<List<JSONObject>> queryWorkList(){
+ List<JSONObject> list = sv.queryWorkList();
+ return BaseResponseUtils.buildSuccess(list);
+ }
+ /**
+ * 浠诲姟鐪嬫澘 鏌ヨ鍦ㄤ骇浠诲姟鐪嬫澘
+ * */
+ @GetMapping(path="queryTopError")
+ @Log("鏌ヨtop10涓嶈壇")
+ public BaseResponse<List<JSONObject>> queryTopError(){
+ List<JSONObject> list = sv.queryTopError();
+ return BaseResponseUtils.buildSuccess(list);
+ }
+ @GetMapping(path="queryAttendUser")
+ @Log("鏌ヨ浜哄憳鍑哄嫟鐜�")
+ public BaseResponse<JSONObject> queryAttendUser(){
+ JSONObject obj = sv.queryAttendUser();
+ return BaseResponseUtils.buildSuccess(obj);
+ }
+ @GetMapping(path="queryStatisticWork")
+ @Log("鏌ヨ缁熻浜哄憳宸ヤ綔閲�")
+ public BaseResponse<List<JSONObject>> queryStatisticWork(){
+ List<JSONObject> list = sv.queryStatisticWork();
+ return BaseResponseUtils.buildSuccess(list);
+ }
+ @GetMapping(path="queryOrderList")
+ @Log("鏌ヨ璁㈠崟鐪嬫澘")
+ public BaseResponse<List<PrOrder>> queryOrderList(){
+ List<PrOrder> list = sv.queryOrderList();
+ return BaseResponseUtils.buildSuccess(list);
+ }
+ @GetMapping(path="queryOrderStatistic")
+ @Log("鏌ヨ缁熻璁㈠崟鏁伴噺")
+ public BaseResponse<JSONObject> queryOrderStatistic(){
+ JSONObject obj = sv.queryStatisticOrder();
+ return BaseResponseUtils.buildSuccess(obj);
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0