From f77c8f18ab49b54c9c0bd7c8cae4962912f792e4 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 29 四月 2024 15:47:46 +0800
Subject: [PATCH] 增加暂停开始任务接口
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
index 362d417..863e95b 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java
@@ -1,58 +1,63 @@
-package com.mes.service;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.Tempering;
-import com.mes.mapper.TemperingMapper;
-import java.util.List;
+package com.mes.temperingglass.service;
+//import com.mes.temperingglass.entity.GlassInfo;
+
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.mapper.TemperingMapper;
+import com.mes.tools.S7control;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service
-@DS("glass_info")
public class TemperingService {
-
+
private final TemperingMapper temperingMapper;
private S7control s7control;
public TemperingService(TemperingMapper temperingMapper) {
this.temperingMapper = temperingMapper;
}
- //鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
- public GlassInfo SelectOutGlass (String glassid) {
- GlassInfo GlassInfo = temperingMapper.SelectGlass(glassid);
- return GlassInfo;
- }
+
+ // //鎺ユ敹id杩斿洖鍧愭爣鍜屾暟鎹�
+// public GlassInfo SelectOutGlass (String glassid) {
+// GlassInfo GlassInfo = temperingMapper.SelectGlass(glassid);
+// return GlassInfo;
+// }
//鍙戦�佸潗鏍囦俊鎭�
- public void SendCoordinate (short glassX,short glassY) {
+ public void SendCoordinate(short glassX, short glassY) {
s7control.WriteWord("DB100.10", glassX);
s7control.WriteWord("DB100.10", glassY);
}
+
//鍒ゆ柇鏄惁鍙互鍙戦�佽繘鐐変俊鍙�
- public int SelectTempering (String glassid) {
+ public int SelectTempering(String glassid) {
int tempering = temperingMapper.SelectTempering(glassid);
if (tempering == 1) {
return 1;
- }
- else {
+ } else {
return 0;
}
}
+
//鍙戦�佽繘鐐変俊鍙�
- public void SendIntoGlass (short start) {
+ public void SendIntoGlass(short start) {
s7control.WriteWord("DB100.10", start);
}
+
//鎺ュ彈瀹屾垚瀛楀洖澶嶇‘璁ゅ瓧
- public void SendIntoGlass () {
- s7control.WriteWord("DB100.10", (short)1);
+ public void SendIntoGlass() {
+ s7control.WriteWord("DB100.10", (short) 1);
}
+
//鏄剧ず绛夊緟涓殑鐗堝浘
- public List <Tempering> SelectWaitingGlass () {
- List<Tempering> WaitingGlass = temperingMapper.SelectWaitingGlass();
+ public List<TemperingGlassInfo> selectWaitingGlass() {
+ List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass();
return WaitingGlass;
}
+
//鏄剧ず姝ｅ湪杩涚倝鐨勭増鍥�
- public List<Tempering> SelectIntoGlass () {
- List<Tempering> IntoGlass = temperingMapper.SelectInGlass();
+ public List<TemperingGlassInfo> SelectIntoGlass() {
+ List<TemperingGlassInfo> IntoGlass = temperingMapper.SelectInGlass();
return IntoGlass;
}
}
--
Gitblit v1.8.0