From 8bd3fa89541cdf63ed4e9c932c5336621ba58ed3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 31 十月 2024 15:01:43 +0800
Subject: [PATCH] 义乌上片功能（部分）
---
UI-Project/src/views/Returns/upreturns.vue | 2
/dev/null | 111 -------------------------------------
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 9 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java | 12 ++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 2
5 files changed, 21 insertions(+), 115 deletions(-)
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 8efd86a..941cb20 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -85,7 +85,7 @@
});
const selectgong = async () => {
try {
- const response = await request.post('/loadGlass/upEngineering/selectTask')
+ const response = await request.post('/loadGlass/engineering/engineering/selectTask')
if (response.code == 200) {
titleSelectJson.value.engineerId = response.data;
} else {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
index 23b8d67..7841c36 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -26,17 +26,29 @@
* @return List<Engineering>
*/
List<Engineering> selectEngineering(String engineeringId);
+
/**
* 淇濆瓨閽㈠寲淇℃伅
*/
void saveEngineering(List<Engineering> engineering);
+
/**
* 鏌ヨ鏄惁鏈変笂鐗囦换鍔�
+ *
* @return Engineering
*/
Engineering selectInitiate(Integer state);
+
+ /**
+ * 鏌ヨ鏄惁鏈変笂鐗囦换鍔w
+ *
+ * @return Engineering
+ */
+ Engineering selectUpInitiate(Integer state, Integer equipmentId);
+
/**
* 鏌ヨ涓婄墖浠诲姟
+ *
* @return Engineering
*/
List<Engineering> selectTask();
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 3b1819f..89651e7 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -95,14 +95,19 @@
}
@Override
- public Engineering selectInitiate(Integer state) {
+ public Engineering selectInitiate(Integer state) {
//鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟
QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
- wrapper.eq("state", state);
+ wrapper.eq("state", state);
return engineeringMapper.selectOne(wrapper);
}
@Override
+ public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
+ return null;
+ }
+
+ @Override
public List<Engineering> selectTask() {
//鏌ヨ鍙紑濮嬩换鍔＄殑宸ョ▼
QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcUpLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcUpLoadGlassTask.java
deleted file mode 100644
index 87dcff9..0000000
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcUpLoadGlassTask.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.mes.job;
-
-import cn.hutool.json.JSONObject;
-import com.mes.common.S7object;
-import com.mes.device.PlcParameterObject;
-import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.service.EngineeringService;
-import com.mes.tools.WebSocketServer;
-import com.mes.uppattenusage.entity.UpPattenUsage;
-import com.mes.uppattenusage.service.UpPattenUsageService;
-import com.mes.workstation.entity.UpWorkstation;
-import com.mes.workstation.service.UpWorkstationService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author SNG-010
- */
-@Component
-@Slf4j
-public class PlcUpGlassTask {
-
- @Autowired
- private UpPattenUsageService upPattenUsageService;
- @Autowired
- private UpWorkstationService upWorkstationService;
- @Autowired
- private EngineeringService engineeringService;
-
- PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
-
- /**
- * fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
- * fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
- */
-
-// @Scheduled(fixedDelay = 300)
- public void plcLoadGlassTask() throws InterruptedException {
- try {
- //鍏堝垽鏂槸鍚︽湁姝ｅ湪寮�濮嬬殑宸ョ▼
- Engineering engineering = engineeringService.selectInitiate(1, 1);
- //鑾峰彇鏄惁鏈変笂鐗囪姹�
- String loadRequest1 = plcParameterObject.getPlcParameter("loadRequest").getValue();
- //褰撳悓鏃舵湁涓婄墖璇锋眰鍜屾湁姝ｅ湪寮�濮嬬殑宸ョ▼鏃惰繘鍏ヤ笂鐗囧垽鏂�
- if (loadRequest1.equals(1) && engineering != null) {
- //鑾峰彇褰撳墠寮�濮嬬殑宸ョ▼鍙�
- UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
- //鐢ㄥ伐绋嬪彿鏌ヨ鏈涓婄墖鐨勫昂瀵镐俊鎭幏鍙栧伐浣嶄綅缃�
- //UpWorkstation upwork = upWorkstationService.selectWorkstation(upPattenUsage);
-
- }
- //鎵ц鍚庝紤鐪�300姣
- //Thread.sleep(300);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- // @Scheduled(fixedDelay = 300)
- public void plcLoadGlassTask2() throws InterruptedException {
- try {
- //鍏堝垽鏂槸鍚︽湁姝ｅ湪寮�濮嬬殑宸ョ▼
- Engineering engineering = engineeringService.selectInitiate(2, 1);
- //鑾峰彇鏄惁鏈変笂鐗囪姹�
- String loadRequest2 = plcParameterObject.getPlcParameter("loadRequest").getValue();
- //褰撳悓鏃舵湁涓婄墖璇锋眰鍜屾湁姝ｅ湪寮�濮嬬殑宸ョ▼鏃惰繘鍏ヤ笂鐗囧垽鏂�
- if (loadRequest2.equals(1) && engineering != null) {
- //鑾峰彇褰撳墠寮�濮嬬殑宸ョ▼鍙�
- UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
- //鐢ㄥ伐绋嬪彿鏌ヨ鏈涓婄墖鐨勫昂瀵镐俊鎭幏鍙栧伐浣嶄綅缃�
- //UpWorkstation upwork = upWorkstationService.selectWorkstation(upPattenUsage);
-
- }
- //鎵ц鍚庝紤鐪�300姣
- //Thread.sleep(300);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- @Scheduled(fixedDelay = 3000)
- public void loadGlassHome() {
- JSONObject jsonObject = new JSONObject();
- //姝ｅ湪杩涜鐨勪换鍔�
- //宸ヤ綅淇℃伅
- List<UpWorkstation> upWorkstations = upWorkstationService.list();
- jsonObject.append("list", upWorkstations);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("uploadGlass");
- if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- if (webserver != null) {
- webserver.sendMessage(jsonObject.toString());
-// List<String> messages = webserver.getMessages();
-// if (!messages.isEmpty()) {
-// // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
-// webserver.clearMessages();
-// }
- } else {
- log.info("Home is closed");
- }
- }
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index d4558c8..e7d0a13 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
hangzhoumes:
- url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
--
Gitblit v1.8.0