From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 27 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
index 4e13ea7..9e6a1c7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskServiceImpl.java
@@ -2,18 +2,24 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.mes.common.config.Const;
+import com.mes.common.config.ConstSysConfig;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.entity.vo.EdgSlotRemainVO;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
-import com.mes.job.OpcCacheGlassTask;
+import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.opctask.entity.EdgStorageDeviceTask;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.mapper.EdgStorageDeviceTaskMapper;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.opctask.service.EdgStorageDeviceTaskService;
+import com.mes.sysconfig.service.SysConfigService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
/**
* @Author : zhoush
@@ -33,9 +39,16 @@
@Resource
private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Resource
+ private EdgStorageCageService edgStorageCageService;
+ @Resource
EdgStorageDeviceTaskMapper edgStorageDeviceTaskMapper;
@Resource
- OpcCacheGlassTask opcCacheGlassTask;
+ SysConfigService sysConfigService;
+
+// @Value("${mes.glassGap}")
+// private int glassGap;
+// @Value("${mes.cellLength}")
+// private int cellLength;
@Override
public EdgStorageDeviceTask queryTaskMessage(String tableName) {
@@ -55,38 +68,72 @@
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
.eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId)
.orderByDesc(EdgStorageDeviceTaskHistory::getCreateTime).last("limit 1"));
- if (taskHistory == null) {
- return Boolean.FALSE;
- }
- Integer cell = taskHistory.getStartCell();
- Integer taskType = taskHistory.getTaskType();
- if (Const.GLASS_CACHE_TYPE_IN_ALL.contains(taskType)) {
- String glassId = taskHistory.getGlassIdIn();
- edgStorageCageDetailsService.remove(new LambdaQueryWrapper<EdgStorageCageDetails>()
- .eq(EdgStorageCageDetails::getDeviceId, deviceId)
- .eq(EdgStorageCageDetails::getSlot, cell)
- .eq(EdgStorageCageDetails::getGlassId, glassId));
- } else {
- String glassId = taskHistory.getGlassIdOut();
- edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
- .set(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .eq(EdgStorageCageDetails::getDeviceId, deviceId)
- .eq(EdgStorageCageDetails::getSlot, cell)
- .eq(EdgStorageCageDetails::getGlassId, glassId));
- }
+ if (taskHistory != null) {
+ Integer cell = taskHistory.getStartCell();
+ Integer taskType = taskHistory.getTaskType();
+ if (Const.GLASS_CACHE_TYPE_IN_ALL.contains(taskType)) {
+ String glassId = taskHistory.getGlassIdIn();
+ edgStorageCageDetailsService.remove(new LambdaQueryWrapper<EdgStorageCageDetails>()
+ .eq(EdgStorageCageDetails::getDeviceId, deviceId)
+ .eq(EdgStorageCageDetails::getSlot, cell)
+ .eq(EdgStorageCageDetails::getGlassId, glassId));
+ } else {
+ String glassId = taskHistory.getGlassIdOut();
+ edgStorageCageDetailsService.update(new LambdaUpdateWrapper<EdgStorageCageDetails>()
+ .set(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .eq(EdgStorageCageDetails::getDeviceId, deviceId)
+ .eq(EdgStorageCageDetails::getSlot, cell)
+ .eq(EdgStorageCageDetails::getGlassId, glassId));
+ }
- opcCacheGlassTask.updateCellRemainWidth(cell, deviceId, taskHistory);
- edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId)
- .set(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_FAILURE)
- );
+ edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId)
+ .set(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_FAILURE)
+ );
+ //璁＄畻姣忎釜鍚勮嚜鐨勫墿浣欏昂瀵镐俊鎭�
+ resetSlotRemainWidth();
+ }
//鏈�鍚庢洿鏂颁换鍔★紝淇濊瘉浠诲姟鍓嶇殑鍔ㄤ綔閮藉仛瀹�
EdgStorageDeviceTask task = new EdgStorageDeviceTask();
task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
task.setGlassIdOut("");
task.setStartCell(0);
+ task.setEndCell(0);
this.updateTaskMessage(tableName, task);
return Boolean.TRUE;
}
+
+ @Override
+ public Boolean taskSuccess(Integer deviceId) {
+ String tableName = deviceId == 1 ? EDG_STORAGE_DEVICE_ONE_TASK : EDG_STORAGE_DEVICE_TWO_TASK;
+ edgStorageDeviceTaskHistoryService.update(new LambdaUpdateWrapper<EdgStorageDeviceTaskHistory>()
+ .set(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_SUCCESS)
+ .eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
+ .eq(EdgStorageDeviceTaskHistory::getDeviceId, deviceId));
+ //璁＄畻姣忎釜鍚勮嚜鐨勫墿浣欏昂瀵镐俊鎭�
+ resetSlotRemainWidth();
+ //鏈�鍚庢洿鏂颁换鍔★紝淇濊瘉浠诲姟鍓嶇殑鍔ㄤ綔閮藉仛瀹�
+ EdgStorageDeviceTask task = new EdgStorageDeviceTask();
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+ task.setGlassIdOut("");
+ task.setStartCell(0);
+ task.setEndCell(0);
+ this.updateTaskMessage(tableName, task);
+ return Boolean.TRUE;
+ }
+
+ private boolean resetSlotRemainWidth() {
+ int cellLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_CELL_LENGTH);
+ int glassGap = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_GLASS_GAP);
+ //灏嗗昂瀵搁噸缃负鍘熷灏哄
+ edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>().set(EdgStorageCage::getRemainWidth, cellLength));
+ //鑾峰彇绗煎唴鐨勮鎯呮暟鎹�
+ List<EdgSlotRemainVO> edgSlotRemainVOS = edgStorageCageDetailsService.querySlotRemainWidth(cellLength, glassGap);
+ //鎸夌収鏌ヨ缁撴灉瀵圭鍐呯幇鏈夌幓鐠冪殑鏍煎瓙灏哄杩涜鏇存柊
+ if (CollectionUtils.isNotEmpty(edgSlotRemainVOS)) {
+ edgStorageCageService.resetSlotRemainWidth(edgSlotRemainVOS);
+ }
+ return Boolean.TRUE;
+ }
}
--
Gitblit v1.8.0