From 3f94fedcc24f3dd289061e3d32959c5cab00f5ec Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 六月 2024 15:03:39 +0800
Subject: [PATCH] 大理片笼出逻辑功能实现，已完成版图到齐逻辑
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 217 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 156 insertions(+), 61 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index 6e71ea3..a9bfa0c 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -3,13 +3,17 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
@@ -18,6 +22,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -34,7 +39,7 @@
*/
@Service
@Slf4j
-public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
+public class BigStorageCageServiceImpl extends MPJBaseServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
@Resource
private BigStorageCageMapper bigStorageCageMapper;
@@ -44,56 +49,102 @@
@Resource
private TemperingGlassInfoService temperingGlassInfoService;
+ @Resource
+ private GlassInfoService glassInfoService;
+
+ //杩涚墖閫昏緫
@Override
public BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
-
- log.info("1銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠�");
- LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
- .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
- BigStorageCageDetails layoutSlotInfo;
- layoutSlotInfo= bigStorageCageDetailsMapper.selectOne(wrapper);
-
BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ //鐜荤拑涓嶉挗鍖栨椂
+ if(glassInfo.getTemperingLayoutId()==null){
- log.info("2銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓嶄负绌烘椂");
- if (layoutSlotInfo.getSlot() != null) {
- bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
- } else {
- log.info("3銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓虹┖鏃惰幏鍙栧綋鍓嶇幓鐠冪増鍥緄d鏄惁瀛樺湪鐞嗙墖绗煎唴");
- LambdaQueryWrapper<BigStorageCageDetails> BigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
- BigStorageCageDetailslambdaQueryWrapper
- .select(BigStorageCageDetails::getTemperingLayoutId);
- layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(BigStorageCageDetailslambdaQueryWrapper);
+ BigStorageCage bigStorageCage=baseMapper.selectJoinOne(BigStorageCage.class, new MPJLambdaWrapper<BigStorageCage>()
+ .selectAll(BigStorageCage.class)
+ .leftJoin(BigStorageCageDetails.class, on -> on
+ .eq(BigStorageCage::getDeviceId, BigStorageCageDetails::getDeviceId)
+ .eq(BigStorageCage::getSlot, BigStorageCageDetails::getSlot))
+ .isNull(BigStorageCageDetails::getTemperingLayoutId)
+ .gt(BigStorageCage::getRemainWidth, 2000)
+ .orderByAsc(BigStorageCage::getDeviceId, BigStorageCage::getSlot)
+ .last("limit 1")
+ );
- if(layoutSlotInfo != null){
- log.info("4銆佽幏鍙栫瀛愬唴閫傚悎鐨勬牸瀛�");
- BigStorageCage bigStorageCage=bigStorageCageSlot(layoutSlotInfo.getDeviceId());
+ if(bigStorageCage.getSlot()!=null){
bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
- }else{
- log.info("5銆佽幏鍙栨瘡涓瀛愮増鍥緄d鐨勪釜鏁�");
- QueryWrapper<BigStorageCageDetails> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("a.device_id", "COUNT(DISTINCT b.tempering_layout_id) AS layoutCount")
- .groupBy("a.device_id")
- .apply("LEFT JOIN (SELECT device_id, tempering_layout_id FROM big_storage_cage_details) b ON a.device_id = b.device_id AND a.slot = b.slot")
- .orderByAsc("layoutCount")
- .orderByAsc("a.device_id");
- List<Map<String, Object>> BigStorageCageDetailsCount= bigStorageCageDetailsMapper.selectMaps(queryWrapper);
+ bigStorageCageDetails.setDeviceId(bigStorageCage.getDeviceId());
+ }
+ }else{
+ //鐜荤拑閽㈠寲鏃�
+ BigStorageCage bigStorageCage=new BigStorageCage();
- log.info("5銆佹煡璇㈢瀛愬唴鏄惁鏈夊悎閫傜殑鏍煎瓙");
- for (Map<String, Object> map : BigStorageCageDetailsCount) {
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- int deviceId = Integer.parseInt(entry.getKey());
- BigStorageCage bigStorageCage=bigStorageCageSlot(deviceId);
- if(bigStorageCage!=null){
- bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
+ bigStorageCage=baseMapper.selectJoinOne(BigStorageCage.class, new MPJLambdaWrapper<BigStorageCage>()
+ .selectAll(BigStorageCage.class)
+ .leftJoin(BigStorageCageDetails.class, on -> on
+ .eq(BigStorageCage::getDeviceId, BigStorageCageDetails::getDeviceId)
+ .eq(BigStorageCage::getSlot, BigStorageCageDetails::getSlot))
+ .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() - 1)
+ .gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
+ );
+ log.info("1銆佹煡璇㈢悊鐗囩鍐呯墖搴�-1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠�"+bigStorageCage);
+
+ log.info("2銆佹煡璇㈢悊鐗囩鍐呯墖搴�-1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓嶄负绌烘椂"+bigStorageCage.getSlot());
+ if (bigStorageCage.getSlot() != null) {
+ bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
+ bigStorageCageDetails.setDeviceId(bigStorageCage.getDeviceId());
+ } else {
+ log.info("3銆佹煡璇㈢悊鐗囩鍐呯墖搴�-1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓虹┖鏃惰幏鍙栧綋鍓嶇幓鐠冪増鍥緄d鏄惁瀛樺湪鐞嗙墖绗煎唴");
+
+ bigStorageCage=baseMapper.selectJoinOne(BigStorageCage.class, new MPJLambdaWrapper<BigStorageCage>()
+ .selectAll(BigStorageCage.class)
+ .leftJoin(BigStorageCageDetails.class, on -> on
+ .eq(BigStorageCage::getDeviceId, BigStorageCageDetails::getDeviceId)
+ .eq(BigStorageCage::getSlot, BigStorageCageDetails::getSlot))
+ .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
+ );
+
+ if(bigStorageCage != null){
+ log.info("4銆佽幏鍙栫瀛愬唴閫傚悎鐨勬牸瀛�");
+ BigStorageCage bigStorageCages=bigStorageCageSlot(bigStorageCage.getDeviceId());
+ bigStorageCageDetails.setSlot(bigStorageCages.getSlot());
+ bigStorageCageDetails.setDeviceId(bigStorageCages.getDeviceId());
+ }else{
+ log.info("5銆佽幏鍙栨瘡涓瀛愮増鍥緄d鐨勪釜鏁�");
+ QueryWrapper<BigStorageCageDetails> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("a.device_id", "COUNT(DISTINCT b.tempering_layout_id) AS layoutCount")
+ .groupBy("a.device_id")
+ .apply("LEFT JOIN (SELECT device_id, tempering_layout_id FROM big_storage_cage_details) b ON a.device_id = b.device_id AND a.slot = b.slot")
+ .orderByAsc("layoutCount")
+ .orderByAsc("a.device_id");
+ List<Map<String, Object>> bigStorageCageDetailsCount= bigStorageCageDetailsMapper.selectMaps(queryWrapper);
+
+ log.info("5銆佹煡璇㈢瀛愬唴鏄惁鏈夊悎閫傜殑鏍煎瓙");
+ boolean found=false;
+ for (Map<String, Object> map : bigStorageCageDetailsCount) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ int deviceId = Integer.parseInt(entry.getKey());
+ BigStorageCage bigStorageCages=bigStorageCageSlot(deviceId);
+ if(bigStorageCage!=null){
+ bigStorageCageDetails.setSlot(bigStorageCages.getSlot());
+ bigStorageCageDetails.setDeviceId(deviceId);
+ found=true;
+ break;
+ }
+ }
+ if(found){
+ break;
}
}
}
}
}
- log.info("6銆佸綋鎵惧埌鍚堥�傜殑鏍煎瓙鏃舵坊鍔犵幓鐠冨埌绗煎瓙琛�");
+
+
+
if (bigStorageCageDetails.getSlot() != null) {
+ log.info("6銆佸綋鎵惧埌鍚堥�傜殑鏍煎瓙鏃舵坊鍔犵幓鐠冨埌绗煎瓙琛�");
bigStorageCageDetails.setState(0);
bigStorageCageDetailsMapper.insert(bigStorageCageDetails);
updateRemainWidth(bigStorageCageDetails.getSlot()) ;
@@ -113,29 +164,47 @@
return bigStorageCageMapper.selectOne(bigStorageCageWrapper);
}
-
+ //鍑虹墖閫昏緫
@Override
public boolean outGlass() {
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list();
+ LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper=new LambdaQueryWrapper<>();
+ temperingGlassInfoWrapper.eq(TemperingGlassInfo::getState,-1);
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(temperingGlassInfoWrapper);
log.info("1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�"+temperingGlassInfoList.size());
-
- if(temperingGlassInfoList!=null){
+ if(temperingGlassInfoList.size()>0){
temperingGlassInfoService.addOutTask(temperingGlassInfoList);
log.info("2銆佹坊鍔犱换鍔″埌浠诲姟琛�");
return true;
}else{
log.info("3銆佹病鏈夊彲鍑虹殑鐜荤拑鏃惰幏鍙栨槸鍚︽湁灏忕墖鍒伴綈鐨勭増鍥�");
- LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
- bigStorageCageDetailslambdaQueryWrapper
- .select(BigStorageCageDetails::getTemperingLayoutId)
- .groupBy(BigStorageCageDetails::getTemperingLayoutId);
- List<Map<String, Object>> temperingLayoutIdList = bigStorageCageDetailsMapper.selectMaps(bigStorageCageDetailslambdaQueryWrapper);
- for (Map<String, Object> map : temperingLayoutIdList) {
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- String layoutId = entry.getKey().substring(0, entry.getKey().indexOf('-'));
- String layoutNum = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
- if (layoutNum.equals(entry.getValue())) {
- //4銆佹坊鍔犳閽㈠寲鐗堝浘id鎵�鏈夊皬鐗囧皬鐗囧埌閽㈠寲灏忕墖琛�
+
+ QueryWrapper<BigStorageCageDetails> wrapper = Wrappers.query();
+ wrapper.select("tempering_layout_id", "count(tempering_layout_id)")
+ .groupBy("tempering_layout_id");
+ List<Map<String, Object>> temperingLayoutIdList = bigStorageCageDetailsMapper.selectMaps(wrapper);
+
+ boolean key=false;
+ for (Map<String, Object> row : temperingLayoutIdList) {
+ for (Map.Entry<String, Object> entry : row.entrySet()) {
+ String temperingId = entry.getKey();
+ Object temperingNo = entry.getValue();
+
+ LambdaQueryWrapper<GlassInfo> glassInfoWrapper=new LambdaQueryWrapper<>();
+ glassInfoWrapper.eq(GlassInfo::getTemperingLayoutId,temperingId)
+ .orderByDesc(GlassInfo::getTemperingFeedSequence);
+ List<GlassInfo> glassInfoList= glassInfoService.list(glassInfoWrapper);
+ if(glassInfoList.size()==Integer.parseInt(temperingNo.toString())){
+ for (GlassInfo glassInfo:glassInfoList
+ ) {
+
+ TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
+ BeanUtils.copyProperties(glassInfo, temperingGlassInfo);
+ temperingGlassInfoService.save(temperingGlassInfo);
+
+ }
+ key=true;
+ }
+ if(key){
return false;
}
}
@@ -162,16 +231,21 @@
bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
}
-
-
-
+ //鏌ヨ澶х悊鐗囦俊鎭紝鍓嶇灞曠ず鐢�
@Override
- public List<BigStorageCage> querybigStorageCageDetail() {
- //1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭�
- List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null);
+ public List<BigStorageCage> querybigStorageCageDetail(int deviceId) {
+ LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper =new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper =new LambdaQueryWrapper<>();
+ if(deviceId!=0){
+ bigStorageCageWrapper.eq(BigStorageCage::getDeviceId,deviceId);
+ bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getDeviceId,deviceId);
+ }
+
+ List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(bigStorageCageWrapper);
log.info("1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭畬鎴愶紝鑾峰彇鍒扮殑鏁版嵁{}", bigStorageCages.size());
- //2鑾峰彇鐞嗙墖绗兼墍鏈変俊鎭�
- List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(null);
+
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(bigStorageCageDetailsWrapper);
+
Map<Integer, List<BigStorageCageDetails>> listMap = bigStorageCageDetailsList.stream().collect(Collectors.groupingBy(BigStorageCageDetails::getSlot));
for (BigStorageCage bigStorageCage : bigStorageCages) {
List<BigStorageCageDetails> bigStorageCageDetails = listMap.get(bigStorageCage.getSlot());
@@ -180,4 +254,25 @@
return bigStorageCages;
}
+ //绗煎瓙浣跨敤鎯呭喌锛岀晫闈㈠睍绀虹敤
+ @Override
+ public List<Map<String, Object>> selectBigStorageCageUsage() {
+ QueryWrapper<BigStorageCage> wrapper = new QueryWrapper<>();
+ wrapper.select("device_id,ROUND(1 - SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) / COUNT(device_id), 2) AS percentage,COUNT(device_id) - SUM(CASE WHEN remain_width = 5000 THEN 1 ELSE 0 END) AS count")
+
+ .groupBy("device_id");
+ List<Map<String, Object>> bigStorageCageUsages=baseMapper.selectMaps(wrapper);
+
+ return bigStorageCageUsages;
+ }
+
+ //绗煎瓙鐨勫惎鐢�/绂佺敤
+ @Override
+ public void updateStorageCageDisabled(int slot,int enableState){
+ BigStorageCage bigStorageCage=new BigStorageCage();
+ bigStorageCage.setEnableState(enableState);
+ LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageWrapper.eq(BigStorageCage::getSlot,slot);
+ baseMapper.update(bigStorageCage,bigStorageCageWrapper);
+ }
}
--
Gitblit v1.8.0