From a666ac61a9a95f325cc0c926394d0d6f35c56c36 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 15 四月 2024 08:01:37 +0800
Subject: [PATCH] 代码迁移修改

---
 hangzhoumesParent/moduleService/CacheGlassModule/pom.xml                                                                                 |    5 +++++
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java            |    6 +++++-
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java |   27 +++++++++++++++++++++++++++
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java          |    8 ++++++++
 4 files changed, 45 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index b5bc8a0..27129a4 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -22,6 +22,11 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.yulichang</groupId>
+            <artifactId>mybatis-plus-join</artifactId>
+            <version>1.1.6</version>
+        </dependency>
     </dependencies>
 
     <properties>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
index 22e7512..e86fbc3 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/mapper/EdgStorageCageDetailsMapper.java
@@ -1,7 +1,11 @@
 package com.mes.edgstoragecage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
 import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -11,6 +15,6 @@
  * @author zhoush
  * @since 2024-04-07
  */
-public interface EdgStorageCageDetailsMapper extends BaseMapper<EdgStorageCageDetails> {
+public interface EdgStorageCageDetailsMapper extends MPJBaseMapper<EdgStorageCageDetails> {
 
 }
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
index 5bf28ac..b3dee22 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  鏈嶅姟绫�
@@ -12,5 +15,10 @@
  * @since 2024-04-07
  */
 public interface EdgStorageCageDetailsService extends IService<EdgStorageCageDetails> {
+    //鑾峰彇鍏ㄩ儴 纾ㄨ竟鍓嶇紦瀛樼淇℃伅
+    public List<Map> getEdgStorageInfos();
+    //淇敼 绗煎唴鏁版嵁
+    public List<Map> setEdgStorageInfos();
+
 
 }
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 78a5a2e..6d3798c 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
@@ -1,10 +1,17 @@
 package com.mes.edgstoragecage.service.impl;
 
+import com.github.yulichang.query.MPJQueryWrapper;
+import com.github.yulichang.wrapper.MPJAbstractLambdaWrapper;
 import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
 import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
+import com.mes.taskcache.mapper.HangzhouMesMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,5 +23,25 @@
  */
 @Service
 public class EdgStorageCageDetailsServiceImpl extends ServiceImpl<EdgStorageCageDetailsMapper, EdgStorageCageDetails> implements EdgStorageCageDetailsService {
+    //鑾峰彇鍏ㄩ儴鏁版嵁
+    @Autowired
+    private HangzhouMesMapper hangzhouMesMapper;
+    @Autowired
+    private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+
+    //鑾峰彇纾ㄨ竟鍓嶇紦瀛樼悊鐗囩淇℃伅
+    @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();
+    };
+
+    @Override
+    public List<Map> setEdgStorageInfos(){
+        return hangzhouMesMapper.selectCachInfo();
+    };
+
 
 }

--
Gitblit v1.8.0