From 66d9a37adfa32014d479ae1e67575d2392084676 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 12 九月 2025 09:05:51 +0800
Subject: [PATCH] 1、大屏动画修改
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java | 106 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 89 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
index 54f9a88..ba8f83f 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
@@ -1,14 +1,20 @@
package com.mes.bigstoragetask.service.impl;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
+import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import com.mes.common.config.Const;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -17,7 +23,7 @@
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -33,6 +39,8 @@
BigStorageCageOutTaskMapper bigStorageCageOutTaskMapper;
@Resource
BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
+ @Resource
+ BigStorageCageDetailsService bigStorageCageDetailsService;
@Override
public boolean saveBatch(List<BigStorageCageOutTask> list) {
@@ -54,10 +62,10 @@
* 妫�娴婸LC鏄惁瀹屾垚浠诲姟
*/
@Override
- public void updateOutTask(){
- List<BigStorageCageOutTask> bigStorageCageOutTaskList=querybigStorageCageOutTask(1);
- log.info("鏌ヨ浠诲姟琛ㄦ槸鍚︽湁宸插畬鎴愮殑鍑虹墖浠诲姟"+bigStorageCageOutTaskList.size());
- for (BigStorageCageOutTask bigStorageCageOutTask:bigStorageCageOutTaskList
+ public void updateOutTask() {
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = querybigStorageCageOutTask(1);
+ log.info("鏌ヨ浠诲姟琛ㄦ槸鍚︽湁宸插畬鎴愮殑鍑虹墖浠诲姟" + bigStorageCageOutTaskList.size());
+ for (BigStorageCageOutTask bigStorageCageOutTask : bigStorageCageOutTaskList
) {
deleteOutTask(bigStorageCageOutTask.getGlassId());
}
@@ -67,29 +75,93 @@
* 瀹屾垚鍑虹墖浠诲姟
*/
@Override
- public void deleteOutTask(String glassId){
+ public void deleteOutTask(String glassId) {
log.info("鏍规嵁浠诲姟id淇敼閽㈠寲灏忕墖琛ㄧ姸鎬侊紝鍒犻櫎宸插畬鎴愮殑鍑虹墖浠诲姟,鍒犻櫎绗煎瓙琛ㄧ幓鐠�");
- LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper =new LambdaQueryWrapper<>();
- temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId,glassId);
- TemperingGlassInfo temperingGlassInfo=temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
+ LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoWrapper = new LambdaQueryWrapper<>();
+ temperingGlassInfoWrapper.eq(TemperingGlassInfo::getGlassId, glassId);
+ TemperingGlassInfo temperingGlassInfo = temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
//鍒ゆ柇鏄惁鎵嬪姩浠诲姟锛屼笉閽㈠寲浠诲姟瀹屾垚鍚庡垹鎺夛紝閽㈠寲浠诲姟瀹屾垚鍚庢敼鐘舵�佷负0
- if(temperingGlassInfo.getState()==-2){
+ if (temperingGlassInfo.getState() == -2) {
temperingGlassInfoMapper.deleteById(temperingGlassInfo.getId());
- }else{
+ } else {
temperingGlassInfo.setState(0);
temperingGlassInfoMapper.updateById(temperingGlassInfo);
}
- LambdaQueryWrapper<BigStorageCageOutTask> bigStorageCageOutTaskWrapper =new LambdaQueryWrapper<>();
- bigStorageCageOutTaskWrapper.eq(BigStorageCageOutTask::getGlassId,glassId);
- BigStorageCageOutTask bigStorageCageOutTask=bigStorageCageOutTaskMapper.selectOne(bigStorageCageOutTaskWrapper);
+ LambdaQueryWrapper<BigStorageCageOutTask> bigStorageCageOutTaskWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageOutTaskWrapper.eq(BigStorageCageOutTask::getGlassId, glassId);
+ BigStorageCageOutTask bigStorageCageOutTask = bigStorageCageOutTaskMapper.selectOne(bigStorageCageOutTaskWrapper);
bigStorageCageOutTaskMapper.deleteById(bigStorageCageOutTask.getId());
- LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper =new LambdaQueryWrapper<>();
- bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId,glassId);
- BigStorageCageDetails bigStorageCageDetails=bigStorageCageDetailsMapper.selectOne(bigStorageCageDetailsWrapper);
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId);
+ BigStorageCageDetails bigStorageCageDetails = bigStorageCageDetailsMapper.selectOne(bigStorageCageDetailsWrapper);
bigStorageCageDetailsMapper.deleteById(bigStorageCageOutTask.getId());
}
+
+ @Override
+ public void deleteTask(List<BigStorageCageOutTask> outGlassId) {
+ baseMapper.deleteTask(outGlassId);
+ }
+
+ @Override
+ public List<BigStorageCageOutTask> selectBigStorageCageOutTask(BigStorageCageOutTask bigStorageCageOutTask, String startTime, String endTime) {
+ if (endTime != null && !endTime.isEmpty()) {
+ endTime = endTime + " 23:59:59";
+ }
+ LambdaQueryWrapper<BigStorageCageOutTask> wrapper = new LambdaQueryWrapper<>();
+ if (bigStorageCageOutTask.getStartSlot() != null) {
+ wrapper.eq(BigStorageCageOutTask::getStartSlot, bigStorageCageOutTask.getStartSlot());
+ }
+ if (bigStorageCageOutTask.getWidth() != null) {
+ wrapper.eq(BigStorageCageOutTask::getWidth, bigStorageCageOutTask.getWidth());
+ }
+ if (bigStorageCageOutTask.getHeight() != null) {
+ wrapper.eq(BigStorageCageOutTask::getHeight, bigStorageCageOutTask.getHeight());
+ }
+ if (bigStorageCageOutTask.getEndSlot() != 0) {
+ wrapper.eq(BigStorageCageOutTask::getEndSlot, bigStorageCageOutTask.getEndSlot());
+ }
+ if (bigStorageCageOutTask.getTaskState() != -1) {
+ wrapper.eq(BigStorageCageOutTask::getTaskState, bigStorageCageOutTask.getTaskState());
+ }
+ if (startTime != null && !startTime.isEmpty()) {
+ wrapper.ge(BigStorageCageOutTask::getCreateTime, startTime);
+ }
+ if (endTime != null && !endTime.isEmpty()) {
+ wrapper.le(BigStorageCageOutTask::getCreateTime, endTime);
+ }
+ wrapper.orderByDesc(BigStorageCageOutTask::getId);
+ wrapper.and(item -> item.eq(BigStorageCageOutTask::getDeleted, 0)
+ .or()
+ .eq(BigStorageCageOutTask::getDeleted, 1));
+ wrapper.between(BigStorageCageOutTask::getCreateTime, startTime, endTime);
+ return baseMapper.selectList(wrapper);
+ }
+
+ @Override
+ public String temperingOut(BigStorageCageOutTask bigStorageCageOutTask) {
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = this.list(
+ new LambdaQueryWrapper<BigStorageCageOutTask>()
+ .lt(BigStorageCageOutTask::getTaskState, 3)
+ );
+ if (CollectionUtils.isEmpty(bigStorageCageOutTaskList)) {
+ bigStorageCageOutTask.setTrainNumber(1);
+ bigStorageCageOutTask.setSerialNumber(1);
+ bigStorageCageOutTask.setTaskState(1);
+ this.save(bigStorageCageOutTask);
+ bigStorageCageDetailsService.update(
+ new LambdaUpdateWrapper<BigStorageCageDetails>()
+ .eq(BigStorageCageDetails::getGlassId, bigStorageCageOutTask.getGlassId())
+ .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING)
+ .orderByDesc(BigStorageCageDetails::getId)
+ .last("limit 1")
+ );
+ return "浠诲姟娣诲姞鎴愬姛";
+ } else {
+ return "浠诲姟娣诲姞澶辫触锛屽綋鍓嶆湁鏈畬鎴愮殑浠诲姟";
+ }
+ }
}
--
Gitblit v1.8.0