From 46ab834b2bb67e6dce0069a9cff397bbcf1433d8 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 16 四月 2024 13:29:13 +0800
Subject: [PATCH] 代码迁移更新
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 40 ++++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 29 +++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java | 22 +++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 5 +
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java | 12 ++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 57 ++++++++++++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java | 21 +++++
7 files changed, 182 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
index 0fb2faa..39b0e92 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageService.java
@@ -2,6 +2,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.edgstoragecage.entity.EdgStorageCage;
+import com.mes.glassinfo.entity.GlassInfo;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -13,4 +17,21 @@
*/
public interface EdgStorageCageService extends IService<EdgStorageCage> {
+ //鏌ヨ绗煎唴绌烘牸
+ public List<EdgStorageCage> selectCacheEmpty();
+
+ //鏌ヨ绗煎唴鍑虹墖椤哄簭璇︽儏
+ public List<EdgStorageCage> selectCacheOut();
+
+ //鏌ヨ绗煎唴璇︽儏
+ public List<Map> selectCacheInfos();
+
+ //娣诲姞鐞嗙墖绗间俊鎭� 浼犲叆glassid
+ public boolean insertCacheInfo(String glassid);
+
+ //淇敼鐞嗙墖绗煎唴淇℃伅
+ public boolean updateCacheInfo(String cacheId);
+
+ //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
+ public boolean deleteCacheInfo(String cacheId);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
index 6d3798c..e19b2cc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -2,6 +2,7 @@
import com.github.yulichang.query.MPJQueryWrapper;
import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
@@ -32,10 +33,13 @@
//鑾峰彇纾ㄨ竟鍓嶇紦瀛樼悊鐗囩淇℃伅
@Override
public List<Map> getEdgStorageInfos(){
- edgStorageCageDetailsMapper.selectJoinList(Map.class,
- new MPJQueryWrapper<EdgStorageCageDetails>().selectAll(EdgStorageCageDetails.class)
- .select("a.c","a.d").leftJoin("ab a on t.id=a.id").le("a.id","1"));
- return hangzhouMesMapper.selectCachInfo();
+ List<Map> map=edgStorageCageDetailsMapper.selectJoinList(
+ Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+ .select("a.c","a.d")
+ .leftJoin("ab a on t.id=a.id")
+ .le("a.id","1")
+ );
+ return map;
};
@Override
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
index 245e2be..97af910 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java
@@ -1,10 +1,17 @@
package com.mes.edgstoragecage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageMapper;
+import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.edgstoragecage.service.EdgStorageCageService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,4 +24,54 @@
@Service
public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
+ @Autowired
+ EdgStorageCageMapper edgStorageCageMapper;
+ @Autowired
+ EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+
+ @Override
+ //鏌ヨ绗煎唴绌烘牸 EdgStorageCage as esc left join EdgStorageCageDetails as escd esc.device_id=escd.device_id
+ public List<EdgStorageCage> selectCacheEmpty(){
+ List<EdgStorageCage> listEdgStorageCage= edgStorageCageMapper.selectList(null);
+ ;
+ List<EdgStorageCageDetails> orderList = listEdgStorageCage.stream()
+ .flatMap(user -> edgStorageCageDetailsMapper.selectList(
+ new QueryWrapper<EdgStorageCageDetails>().eq("user_id", user.getId())).stream()
+ )
+ .collect(Collectors.toList());
+
+ return listEdgStorageCage;
+ }
+
+ @Override
+ //鏌ヨ绗煎唴鍑虹墖浠诲姟
+ public List<EdgStorageCage> selectCacheOut(){
+ List<EdgStorageCage> list= new ArrayList<EdgStorageCage>();
+ return list;
+ }
+
+ @Override
+ //鐞嗙墖缂撳瓨璇︽儏
+ public List<Map> selectCacheInfos(){
+ List<Map> mapList=new ArrayList<>();
+ return mapList;
+ }
+
+ @Override
+ //娣诲姞鐞嗙墖绗间俊鎭� 浼犲叆glassid
+ public boolean insertCacheInfo(String glassid){
+ return false;
+ }
+
+ @Override
+ //淇敼鐞嗙墖绗煎唴淇℃伅
+ public boolean updateCacheInfo(String cacheId){
+ return false;
+ }
+
+ @Override
+ //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
+ public boolean deleteCacheInfo(String cacheId){
+ return false;
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index e80dff3..678e9a2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.glassinfo.entity.GlassInfo;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -13,4 +15,7 @@
*/
public interface GlassInfoService extends IService<GlassInfo> {
+ public List<GlassInfo> selectAll();
+ public List<GlassInfo> selectId(String glassId);
+ public List<GlassInfo> selectFlowcardId(String flowcard_id);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index 422c608..0ddcce1 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -1,10 +1,15 @@
package com.mes.glassinfo.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.glassinfo.service.GlassInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -17,4 +22,28 @@
@Service
public class GlassInfoServiceImpl extends ServiceImpl<GlassInfoMapper, GlassInfo> implements GlassInfoService {
+ @Autowired
+ GlassInfoMapper glassInfoMapper;
+
+ //鏍规嵁ID 鑾峰彇灏忕墖鏁版嵁
+ @Override
+ public List<GlassInfo> selectId(String glassId){
+ QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
+ queryWrapper.eq("id",glassId);
+ return glassInfoMapper.selectList(queryWrapper);
+ };
+
+ //鑾峰彇鍏ㄩ儴灏忕墖鏁版嵁
+ @Override
+ public List<GlassInfo> selectAll(){
+ return glassInfoMapper.selectList(null);
+ };
+
+ //鏍规嵁宸ョ▼ 鑾峰彇灏忕墖鏁版嵁
+ @Override
+ public List<GlassInfo> selectFlowcardId(String flowcardId){
+ QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<GlassInfo>();
+ queryWrapper.eq("flowcardId",flowcardId);
+ return glassInfoMapper.selectList(queryWrapper);
+ };
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
index e57f663..2d2bafc 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/TaskCacheService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.taskcache.entity.TaskCache;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -13,4 +15,24 @@
*/
public interface TaskCacheService extends IService<TaskCache> {
+ //娣诲姞鐞嗙墖绗间换鍔�
+ public boolean insertTaskCache();
+
+ //鏌ヨ纾ㄨ竟浠诲姟
+ public List<TaskCache> selectEdgInfo(String line);
+
+ //鏌ヨ鐞嗙墖浠诲姟
+ public List<TaskCache> selectCacheInfo();
+
+ //鏌ヨ鍏ㄩ儴浠诲姟
+ public List<TaskCache> selectAll();
+
+ //鏌ヨ杩涚墖浠诲姟
+ public List<TaskCache> selectInputTaskCache();
+
+ //鏌ヨ鍑虹墖浠诲姟
+ public List<TaskCache> selectOutTaskCache();
+
+ //鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ public boolean selectLastOutCacheInfo();
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 87ba952..811698b 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -6,6 +6,8 @@
import com.mes.taskcache.service.TaskCacheService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -17,4 +19,42 @@
@Service
public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
+ //娣诲姞鐞嗙墖绗间换鍔�
+ @Override
+ public boolean insertTaskCache(){
+ return false;
+ }
+
+ //鏌ヨ纾ㄨ竟浠诲姟
+ @Override
+ public List<TaskCache> selectEdgInfo(String line) {
+ return null;
+ }
+ //鏌ヨ鐞嗙墖浠诲姟
+ @Override
+ public List<TaskCache> selectCacheInfo(){
+ return null;
+ }
+ //鏌ヨ鍏ㄩ儴浠诲姟
+ @Override
+ public List<TaskCache> selectAll() {
+ return null;
+ }
+ //鏌ヨ杩涚墖浠诲姟
+ @Override
+ public List<TaskCache> selectInputTaskCache(){
+ return null;
+ }
+
+ //鏌ヨ鍑虹墖浠诲姟
+ @Override
+ public List<TaskCache> selectOutTaskCache(){
+ return null;
+ }
+
+ //鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ @Override
+ public boolean selectLastOutCacheInfo(){
+ return false;
+ }
}
--
Gitblit v1.8.0