From 27fcef09b5af8d6816babf3cf063a8d62726e1d0 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 19 四月 2024 09:18:01 +0800
Subject: [PATCH] 1、下片模块新增多数据源sqlserver配置 可供其他模块有需要配置的参考 2、 a、需要在各自pom文件中添加sqlserver依赖 b、在对应mapper文件中加入DS注解 c、在配置文件中配置数据源 d、主库不需要要添加DS注解指定数据库
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 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 e4b89aa..f122d7d 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,55 +1,62 @@
package com.mes.temperingglass.service;
-import com.mes.temperingglass.entity.GlassInfo;
+//import com.mes.temperingglass.entity.GlassInfo;
+
import com.mes.temperingglass.entity.TemperingGlassInfo;
-import com.mes.tools.S7control;
import com.mes.temperingglass.mapper.TemperingMapper;
-import java.util.List;
+import com.mes.tools.S7control;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
public class TemperingService {
-
+
private final TemperingMapper temperingMapper;
private S7control s7control;
public TemperingService(TemperingMapper temperingMapper) {
- this.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 <TemperingGlassInfo> SelectWaitingGlass () {
+ public List<TemperingGlassInfo> SelectWaitingGlass() {
List<TemperingGlassInfo> WaitingGlass = temperingMapper.SelectWaitingGlass();
return WaitingGlass;
}
+
//鏄剧ず姝ｅ湪杩涚倝鐨勭増鍥�
- public List<TemperingGlassInfo> SelectIntoGlass () {
+ public List<TemperingGlassInfo> SelectIntoGlass() {
List<TemperingGlassInfo> IntoGlass = temperingMapper.SelectInGlass();
return IntoGlass;
}
--
Gitblit v1.8.0