From 04b841aa1661693e68f5dea1a80e7c97a209cbeb Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 13:31:48 +0800
Subject: [PATCH] 命名以及  注解修改

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java |   70 ++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 34 deletions(-)

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 97af910..e863425 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,12 +1,16 @@
 package com.mes.edgstoragecage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.query.MPJQueryWrapper;
 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 com.mes.uppattenusage.entity.UpPattenUsage;
+import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Map;
@@ -22,56 +26,54 @@
  * @since 2024-04-07
  */
 @Service
-public class EdgStorageCageServiceImpl extends ServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
+public class EdgStorageCageServiceImpl extends MPJBaseServiceImpl<EdgStorageCageMapper, EdgStorageCage> implements EdgStorageCageService {
 
-    @Autowired
-    EdgStorageCageMapper edgStorageCageMapper;
     @Autowired
     EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
+    @Autowired
+    UpPattenUsageMapper upPattenUsageMapper;
 
     @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;
+    //鏌ヨ绗煎唴绌烘牸
+    public List<Map> selectCacheEmpty(){
+        List<Map> map=baseMapper.selectJoinList(
+                Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+                        .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+                        .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+                        .isNull("escd.slot")
+        );
+        return map;
     }
 
     @Override
-    //鏌ヨ绗煎唴鍑虹墖浠诲姟
-    public List<EdgStorageCage> selectCacheOut(){
-        List<EdgStorageCage> list= new ArrayList<EdgStorageCage>();
+    //鏌ヨ绗煎唴鍑虹墖浠诲姟   鎸夐挗鍖栫増鍥惧彿+鐗堝浘鍐呭簭鍙�
+    public List<Map> selectCacheOut(){
+        List<Map> list= upPattenUsageMapper.selectJoinList(
+                Map.class,new MPJQueryWrapper<UpPattenUsage>().selectAll(UpPattenUsage.class)
+                        .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+                        .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+                        .isNotNull("escd.slot")
+                        .orderByAsc("escd.tempering_layout_id","escd.tempering_feed_sequence")
+        );
         return list;
     }
 
     @Override
     //鐞嗙墖缂撳瓨璇︽儏
-    public List<Map> selectCacheInfos(){
-        List<Map> mapList=new ArrayList<>();
-        return mapList;
+    public List<Map> selectEdgStorageCages(){
+        List<Map> map=baseMapper.selectJoinList(
+                Map.class,new MPJQueryWrapper<EdgStorageCage>().selectAll(EdgStorageCage.class)
+                        .select("escd.glass_id","escd.flow_card_id","escd.width","escd.height")
+                        .leftJoin("edg_storage_cage_details escd on t.device_id=escd.device_id and t.slot=escd.slot")
+        );
+        return map;
     }
 
     @Override
-    //娣诲姞鐞嗙墖绗间俊鎭�  浼犲叆glassid
-    public boolean insertCacheInfo(String glassid){
-        return false;
+    //淇敼鐞嗙墖绗煎唴淇℃伅 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑 銆愭坊鍔�/鍒犻櫎/鏇存崲銆�
+    public boolean updateEdgStorageCage(EdgStorageCage edgStorageCage){
+        baseMapper.updateById(edgStorageCage);
+        return true;
     }
 
-    @Override
-    //淇敼鐞嗙墖绗煎唴淇℃伅
-    public boolean updateCacheInfo(String cacheId){
-        return false;
-    }
-
-    @Override
-    //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
-    public boolean deleteCacheInfo(String cacheId){
-        return false;
-    }
 }

--
Gitblit v1.8.0