From 2022682967ad0b0d1cd6e2e86f8fb628478d4e9c Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 11 十月 2025 12:00:03 +0800
Subject: [PATCH] 1、 上片界面/钢化前大理片笼数据推送接口，供第一次进入界面调用
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
index 1830ca0..c1ea1e6 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/loadglassdevicetaskhistory/controller/LoadGlassDeviceTaskHistoryController.java
@@ -2,22 +2,25 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.job.PlcLoadGlassTask;
+import com.mes.loadglassdevicetaskhistory.entity.request.LoadGlassRequest;
import com.mes.opctask.entity.LoadGlassDeviceTaskHistory;
import com.mes.opctask.entity.request.LoadGlassDeviceTaskHistoryRequest;
import com.mes.opctask.service.LoadGlassDeviceTaskHistoryService;
-import com.mes.pp.service.OptimizeProjectService;
-import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
-import java.util.List;
+import javax.annotation.Resource;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author wf
@@ -27,15 +30,23 @@
@RequestMapping("/loadglassdevicetaskhistory")
public class LoadGlassDeviceTaskHistoryController {
+ @Resource
+ PlcLoadGlassTask plcLoadGlassTask;
@Autowired
private LoadGlassDeviceTaskHistoryService loadGlassDeviceTaskHistoryService;
@ApiOperation("鎸夌収鏌ヨ鏉′欢鏌ヨ涓婄墖鍘嗗彶浠诲姟")
@PostMapping("/queryLoadGlassHistoryTask") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
- @ResponseBody
public Result<Page<LoadGlassDeviceTaskHistory>> queryBigStorageCageHistoryTask(@RequestBody @Validated LoadGlassDeviceTaskHistoryRequest request) {
return Result.build(200, "鏌ヨ鎴愬姛", loadGlassDeviceTaskHistoryService.queryLoadGlassHistoryTask(request));
}
+ @ApiOperation("鏌ヨ绾胯矾鎵�鏈夋暟鎹�")
+ @PostMapping("/queryAllMessage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ public Result<String> queryAllMessage(@RequestBody @Validated LoadGlassRequest request) {
+ return Result.build(200, "鏌ヨ鎴愬姛", plcLoadGlassTask.loadGlassChild(request.getRedisRequest(), request.getStationCell(),
+ request.getTableName(), request.getWebSocketName()));
+ }
+
}
--
Gitblit v1.8.0