From 2c08bfb96d6523dfbf5ae543e94495c151aadbf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 14 三月 2025 17:53:18 +0800
Subject: [PATCH] 大屏嵌入历史任务，生产统计显示
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index feefee2..b99bef0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -1,6 +1,7 @@
package com.mes.taskcache.controller;
-import com.mes.edgglasstask.entity.request.IdentWornRequest;
+import cn.hutool.json.JSONObject;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.service.TaskCacheService;
@@ -50,14 +51,14 @@
@ApiOperation("璇嗗埆鏄剧ず:褰撳墠鐗堝浘,闇�瑕佸綋鍓嶅崸寮忕悊鐗囪澶噄d銆佷笂鐗囩嚎璺�")
@PostMapping("/queryCurrentCutDrawing")
- public Result queryCurrentCutDrawing(int deviceId, int stationCell) {
- List<CutDrawingVO> cutDrawingVOS = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
- return Result.build(200, "鎴愬姛", cutDrawingVOS);
+ public Result<JSONObject> queryCurrentCutDrawing(int deviceId, int stationCell) {
+ JSONObject jsonObject = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
+ return Result.build(200, "鎴愬姛", jsonObject);
}
@ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
@PostMapping("/identControls")
- public Result<String> identControls(@RequestBody @Validated IdentWornRequest request) {
+ public Result<String> identControls(@RequestBody @Validated DamageRequest request) {
return Result.build(200, "鎴愬姛", edgStorageCageDetailsService.identControls(request));
}
--
Gitblit v1.8.0