From dc7f1d12fa03f487232a00d62cdbec42fdd39d5a Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 18 四月 2024 14:40:54 +0800
Subject: [PATCH] 代码丢失重新提交
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 61 +++++++++++++++---------------
1 files changed, 30 insertions(+), 31 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..c59ac0c 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,6 +1,7 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -30,48 +31,46 @@
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;
+ //鏌ヨ绗煎唴绌烘牸
+ public List<Map> selectCacheEmpty(){
+ List<Map> map=edgStorageCageMapper.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= edgStorageCageMapper.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")
+ .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=edgStorageCageMapper.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){
+ edgStorageCageMapper.updateById(edgStorageCage);
+ return true;
}
- @Override
- //淇敼鐞嗙墖绗煎唴淇℃伅
- public boolean updateCacheInfo(String cacheId){
- return false;
- }
-
- @Override
- //鍒犻櫎鐞嗙墖绗煎唴淇℃伅
- public boolean deleteCacheInfo(String cacheId){
- return false;
- }
}
--
Gitblit v1.8.0