From 60bf0cffa746f986d3669b6ec3da9db3d84e8817 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 13:27:29 +0800
Subject: [PATCH] 添加通讯配置
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/service/TemperingService.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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..e4b89aa 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,21 +1,19 @@
-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;
+package com.mes.temperingglass.service;
+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 org.springframework.stereotype.Service;
@Service
-@DS("glass_info")
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) {
@@ -46,13 +44,13 @@
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