From c7b4647fbcebf9a097a948110ca9a195827ac430 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 13 五月 2024 11:00:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 141 insertions(+), 32 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 ac3ee85..51d5f49 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
@@ -1,75 +1,184 @@
package com.mes.bigstorage.service.impl;
+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.extension.service.impl.ServiceImpl;
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.uppattenusage.entity.GlassInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
+import lombok.extern.slf4j.Slf4j;
+import com.mes.glassinfo.entity.GlassInfo;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
+import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
* @since 2024-03-27
*/
@Service
+@Slf4j
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
- @Autowired
+ @Resource
private BigStorageCageMapper bigStorageCageMapper;
- @Autowired
+
+ @Resource
private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
+
+ @Resource
+ private TemperingGlassInfoService temperingGlassInfoService;
+
@Override
- public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
+ 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);
- //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
- BigStorageCageDetails layoutSlotInfo =bigStorageCageMapper.SelectTemperingFeedSlot(glassInfo);
- //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
- if (layoutSlotInfo!=null) {
- //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
+ BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+
+ log.info("2銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓嶄负绌烘椂");
+ if (layoutSlotInfo.getSlot() != null) {
bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
- }else{
- //鑾峰彇涓嶅埌鏃讹細
+ } else {
+ log.info("3銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓虹┖鏃惰幏鍙栧綋鍓嶇幓鐠冪増鍥緄d鏄惁瀛樺湪鐞嗙墖绗煎唴");
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageDetailslambdaQueryWrapper
+ .select(BigStorageCageDetails::getTemperingLayoutId);
+ layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(bigStorageCageDetailslambdaQueryWrapper);
- //鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
- BigStorageCageDetails EmptySlotInfo=bigStorageCageMapper.SelectEmptyFeedSlot();
- if (EmptySlotInfo!=null){
- bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
+ if(layoutSlotInfo != null){
+ log.info("4銆佽幏鍙栫瀛愬唴閫傚悎鐨勬牸瀛�");
+ BigStorageCage bigStorageCage=bigStorageCageSlot(layoutSlotInfo.getDeviceId());
+ bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
}else{
- //鑾峰彇鍏朵粬绗兼牸瀛�-
- BigStorageCageDetails OtherSlotInfo=bigStorageCageMapper.SelectOtherFeedSlot();
- bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
- }
- //灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
+ 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銆佹煡璇㈢瀛愬唴鏄惁鏈夊悎閫傜殑鏍煎瓙");
+ 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());
+ }
+ }
+ }
+ }
}
- updateRemainWidth(bigStorageCageDetails.getSlot());
+ if (bigStorageCageDetails.getSlot() != null) {
+ log.info("6銆佸綋鎵惧埌鍚堥�傜殑鏍煎瓙鏃舵坊鍔犵幓鐠冨埌绗煎瓙琛�");
+ bigStorageCageDetails.setState(0);
+ bigStorageCageDetailsMapper.insert(bigStorageCageDetails);
+ updateRemainWidth(bigStorageCageDetails.getSlot()) ;
+ }
return bigStorageCageDetails;
}
- //淇敼鏍煎瓙鍓╀綑瀹藉害
+ //鑾峰彇绗煎瓙鍐呯殑绌烘牸瀛�
+ private BigStorageCage bigStorageCageSlot(Integer deviceId) {
+ LambdaQueryWrapper<BigStorageCage> bigStorageCageWrapper=new LambdaQueryWrapper<>();
+ bigStorageCageWrapper
+ .eq(BigStorageCage::getRemainWidth,"5000")
+ .eq(BigStorageCage::getEnableState,"0")
+ .eq(BigStorageCage::getDeviceId,deviceId)
+ .orderByAsc(BigStorageCage::getSlot)
+ .last("LIMIT 1");
+ return bigStorageCageMapper.selectOne(bigStorageCageWrapper);
+ }
+
+
@Override
- public void updateRemainWidth(int Slot){
- //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
- int width=5000;
- List<BigStorageCageDetails> bigStorageCageDetailsList= Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
- for (BigStorageCageDetails bigStorageCageDetails:bigStorageCageDetailsList
+ public boolean outGlass() {
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list();
+ log.info("1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�"+temperingGlassInfoList.size());
+
+ if(temperingGlassInfoList!=null){
+ 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鎵�鏈夊皬鐗囧皬鐗囧埌閽㈠寲灏忕墖琛�
+ return false;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ //璁＄畻鏍煎瓙鍓╀綑瀹藉害
+ @Override
+ public void updateRemainWidth(int slot) {
+ log.info("鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅锛岃绠楁牸瀛愬墿浣欏搴�");
+ Integer width = 5000;
+ List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(slot));
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
) {
- width-=Integer.parseInt(bigStorageCageDetails.getWidth().toString())+bigStorageCageDetails.getGap();
+ width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
}
//淇敼鏍煎瓙鍓╀綑瀹藉害
- bigStorageCageMapper.UpdateRemainWidth(Slot,width);
+ BigStorageCage bigStorageCage = new BigStorageCage();
+ bigStorageCage.setRemainWidth(width);
+ UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
+ bigStorageCageWrapper.eq("remain_width", width);
+ bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
+ }
+
+
+
+
+ @Override
+ public List<BigStorageCage> querybigStorageCageDetail() {
+ //1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭�
+ List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null);
+ log.info("1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭畬鎴愶紝鑾峰彇鍒扮殑鏁版嵁{}", bigStorageCages.size());
+ //2鑾峰彇鐞嗙墖绗兼墍鏈変俊鎭�
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(null);
+ Map<Integer, List<BigStorageCageDetails>> listMap = bigStorageCageDetailsList.stream().collect(Collectors.groupingBy(BigStorageCageDetails::getSlot));
+ for (BigStorageCage bigStorageCage : bigStorageCages) {
+ List<BigStorageCageDetails> bigStorageCageDetails = listMap.get(bigStorageCage.getSlot());
+ bigStorageCage.setBigStorageCageDetails(bigStorageCageDetails);
+ }
+ return bigStorageCages;
}
}
--
Gitblit v1.8.0