From e0699feb382ad3c01040f135f53698ac5c6ec84e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 10:42:24 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageServiceImpl.java | 75 +++++++++++++++++++------------------
1 files changed, 38 insertions(+), 37 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 35202ab..b337c2d 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,23 +1,24 @@
package com.mes.edgstoragecage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.EdgStorageCageDetailsMapper;
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.ArrayList;
-import java.util.List;
import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -30,50 +31,50 @@
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=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= 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=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