From cb5be3f2bb73cea7def3d0bb9ab5d5d409d2f9df Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 四月 2024 14:19:41 +0800
Subject: [PATCH] cachegalss误删文件恢复
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 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..434db9f 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
@@ -13,7 +13,6 @@
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;
@@ -52,7 +51,7 @@
wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
BigStorageCageDetails layoutSlotInfo;
- layoutSlotInfo= bigStorageCageDetailsMapper.selectOne(wrapper);
+ layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(wrapper);
BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
@@ -66,11 +65,11 @@
.select(BigStorageCageDetails::getTemperingLayoutId);
layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(BigStorageCageDetailslambdaQueryWrapper);
- if(layoutSlotInfo != null){
+ if (layoutSlotInfo != null) {
log.info("4銆佽幏鍙栫瀛愬唴閫傚悎鐨勬牸瀛�");
- BigStorageCage bigStorageCage=bigStorageCageSlot(layoutSlotInfo.getDeviceId());
+ BigStorageCage bigStorageCage = bigStorageCageSlot(layoutSlotInfo.getDeviceId());
bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
- }else{
+ } else {
log.info("5銆佽幏鍙栨瘡涓瀛愮増鍥緄d鐨勪釜鏁�");
QueryWrapper<BigStorageCageDetails> queryWrapper = new QueryWrapper<>();
queryWrapper.select("a.device_id", "COUNT(DISTINCT b.tempering_layout_id) AS layoutCount")
@@ -78,14 +77,14 @@
.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);
+ 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){
+ BigStorageCage bigStorageCage = bigStorageCageSlot(deviceId);
+ if (bigStorageCage != null) {
bigStorageCageDetails.setSlot(bigStorageCage.getSlot());
}
}
@@ -96,34 +95,34 @@
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);
+ 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());
+ log.info("1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�" + temperingGlassInfoList.size());
- if(temperingGlassInfoList!=null){
+ if (temperingGlassInfoList != null) {
temperingGlassInfoService.addOutTask(temperingGlassInfoList);
log.info("2銆佹坊鍔犱换鍔″埌浠诲姟琛�");
return true;
- }else{
+ } else {
log.info("3銆佹病鏈夊彲鍑虹殑鐜荤拑鏃惰幏鍙栨槸鍚︽湁灏忕墖鍒伴綈鐨勭増鍥�");
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
bigStorageCageDetailslambdaQueryWrapper
--
Gitblit v1.8.0