From 29ea56cf0546726a83da815ee6721090311f5567 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 四月 2024 14:09:37 +0800
Subject: [PATCH] fixbug:代码误删版本回退
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 139 ++++++++++++++++++----------------------------
1 files changed, 55 insertions(+), 84 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 6956b36..00f8430 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,7 +1,6 @@
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;
@@ -10,10 +9,7 @@
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
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;
@@ -35,119 +31,94 @@
@Service
@Slf4j
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
- @Resource
- private BigStorageCageMapper bigStorageCageMapper;
@Resource
private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
- @Resource
- private TemperingGlassInfoService temperingGlassInfoService;
-
@Override
public BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
- log.info("1銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠�");
+ //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);
+ BigStorageCageDetails layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(wrapper);
BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
- log.info("2銆佹煡璇㈢悊鐗囩鍐呯墖搴�+1绛変簬褰撳墠鐜荤拑鐗囧簭鐨勭幓鐠冪殑缁撴灉涓嶄负绌烘椂");
+ //2銆佹湁绗﹀悎鏉′欢鐨勬牸瀛愭椿鐗囧簭涓�1鏃�
+ log.info("鏈夌鍚堟潯浠剁殑鏍煎瓙娲荤墖搴忎负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);
+ //鑾峰彇涓嶅埌鏃讹細
+// 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 prefix = entry.getKey().substring(0, entry.getKey().indexOf('-'));
+// String suffix = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
+// if(suffix.equals(entry.getValue())){
+//
+// }
+// }
+// }
- if(layoutSlotInfo != null){
- log.info("4銆佽幏鍙栫瀛愬唴閫傚悎鐨勬牸瀛�");
- BigStorageCage bigStorageCage=bigStorageCageSlot(layoutSlotInfo.getDeviceId());
- 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);
- 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());
- }
- }
- }
- }
+ //鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
+// BigStorageCageDetails EmptySlotInfo = bigStorageCageMapper.selectEmptyFeedSlot();
+// if (EmptySlotInfo != null) {
+// bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
+// } else {
+// //鑾峰彇鍏朵粬绗兼牸瀛�-
+// BigStorageCageDetails OtherSlotInfo = bigStorageCageMapper.selectOtherFeedSlot();
+// bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
+// }
+ //灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
+
}
- log.info("6銆佸綋鎵惧埌鍚堥�傜殑鏍煎瓙鏃舵坊鍔犵幓鐠冨埌绗煎瓙琛�");
if (bigStorageCageDetails.getSlot() != null) {
- bigStorageCageDetails.setState(0);
bigStorageCageDetailsMapper.insert(bigStorageCageDetails);
- updateRemainWidth(bigStorageCageDetails.getSlot()) ;
+ 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 boolean outGlass() {
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list();
- log.info("1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�"+temperingGlassInfoList.size());
+// // 1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�
+// List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
+// //娌℃湁鍙嚭鐨勭幓鐠冩椂
+// if (temperingGlassInfoList != null) {
+// //鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
+// } else {
+// //缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
+// }
+ 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 prefix = entry.getKey().substring(0, entry.getKey().indexOf('-'));
+ String suffix = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
+ if (suffix.equals(entry.getValue())) {
- 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;
+ return true;
}
- //璁＄畻鏍煎瓙鍓╀綑瀹藉害
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
@Override
public void updateRemainWidth(int slot) {
- log.info("鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅锛岃绠楁牸瀛愬墿浣欏搴�");
+ //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
Integer width = 5000;
List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(slot));
for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
@@ -159,13 +130,13 @@
bigStorageCage.setRemainWidth(width);
UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
bigStorageCageWrapper.eq("remain_width", width);
- bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
+ baseMapper.update(bigStorageCage, bigStorageCageWrapper);
}
@Override
public List<BigStorageCage> querybigStorageCageDetail() {
//1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭�
- List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null);
+ List<BigStorageCage> bigStorageCages = baseMapper.selectList(null);
log.info("1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭畬鎴愶紝鑾峰彇鍒扮殑鏁版嵁{}", bigStorageCages.size());
//2鑾峰彇鐞嗙墖绗兼墍鏈変俊鎭�
List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsMapper.selectList(null);
--
Gitblit v1.8.0