From daed20c553f77fc48695f8523cd57bc56fb5a0fd Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期三, 10 四月 2024 08:35:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java b/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java
index 6ff9ab2..cc29839 100644
--- a/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java
+++ b/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java
@@ -4,7 +4,8 @@
import com.mes.entity.EdgStorageCageDetails;
import com.mes.entity.GlassInfo;
import com.mes.entity.Tempered;
-import com.mes.mapper.SelectInfo;
+import com.mes.mapper.HangzhouMesMapper;
+import com.mes.mapper.PpMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -12,30 +13,25 @@
import java.util.Map;
@Service
-@DS("hangzhoumes")
-public class hangzhoumesService {
+public class HangzhoumesService {
@Autowired
- private SelectInfo SelectInfo;
-
+ private HangzhouMesMapper hangzhouMesMapper;
+ //鏍规嵁缂栧彿 鏌ユ壘鐜荤拑灏忕墖淇℃伅
public GlassInfo getUserInfo(String process_id){
- return SelectInfo.SelectGlassId(process_id);
+ return hangzhouMesMapper.selectGlassId(process_id);
}
- // //璇嗗埆淇℃伅
- // public List<Map> SelectCutTerritory(String process_id){
- // return SelectInfo.SelectCutTerritory(process_id);
- // }
//鐞嗙墖缂撳瓨 绗煎唴淇℃伅
- public List<EdgStorageCageDetails> SelectCageInfo(){
- return SelectInfo.SelectCachInfo();
+ public List<Map> SelectCageInfo(){
+ return hangzhouMesMapper.selectCachInfo();
}
//纾ㄨ竟灏忕墖淇℃伅
public List<Map> SelectEdgInfo(String line){
-
- return SelectInfo.SelectEdgInfo(line);
+ return hangzhouMesMapper.selectEdgInfo(line);
}
+
}
--
Gitblit v1.8.0