From 62dfd24e93e0eba9b5bf73ed0518f9777b7ad03b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 11 十月 2025 12:38:15 +0800
Subject: [PATCH] 1、中空界面调用推送数据接口 2、中空流程卡缺片信息统计sql优化 3、修改缺片查询接口注释，避免接口错误调用
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java
index 3695de9..4f297c2 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java
@@ -9,11 +9,15 @@
import com.mes.hollowtask.entity.request.HollowBigStorageCageHistoryRequest;
import com.mes.hollowtask.mapper.HollowBigStorageCageHistoryTaskMapper;
import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
+import com.mes.job.PushMessageToIndex;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.tools.DateUtil;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.text.SimpleDateFormat;
+import java.util.List;
/**
* (HollowBigStorageCageHistoryTask)琛ㄦ湇鍔″疄鐜扮被
@@ -24,6 +28,9 @@
@Service
public class HollowBigStorageCageHistoryTaskServiceImpl extends ServiceImpl<HollowBigStorageCageHistoryTaskMapper, HollowBigStorageCageHistoryTask> implements HollowBigStorageCageHistoryTaskService {
+ @Resource
+ PushMessageToIndex pushMessageToIndex;
+
@Override
public Page<HollowBigStorageCageHistoryTask> queryHollowBigStorageCageHistoryTask(HollowBigStorageCageHistoryRequest request) {
Page<HollowBigStorageCageHistoryTask> page = new Page<>(request.getPageNo(), request.getPageSize());
@@ -32,13 +39,13 @@
request.setEndDate(DateUtil.getEndDate());
}
LambdaQueryWrapper<HollowBigStorageCageHistoryTask> wrapper = new LambdaQueryWrapper<HollowBigStorageCageHistoryTask>()
- .like(StringUtils.isBlank(request.getGlassId()), HollowBigStorageCageHistoryTask::getGlassId, request.getGlassId())
+ .like(StringUtils.isNotBlank(request.getGlassId()), HollowBigStorageCageHistoryTask::getGlassId, request.getGlassId())
.eq(request.getStartSlot() != 0, HollowBigStorageCageHistoryTask::getStartSlot, request.getStartSlot())
.eq(request.getTargetSlot() != 0, HollowBigStorageCageHistoryTask::getTargetSlot, request.getTargetSlot())
.in(CollectionUtil.isNotEmpty(request.getTaskStateList()), HollowBigStorageCageHistoryTask::getTaskState, request.getTaskStateList())
.in(CollectionUtil.isNotEmpty(request.getTaskTypeList()), HollowBigStorageCageHistoryTask::getTaskType, request.getTaskTypeList())
.between(HollowBigStorageCageHistoryTask::getCreateTime, request.getBeginDate(), request.getEndDate())
- .orderByDesc(HollowBigStorageCageHistoryTask::getCreateTime);
+ .orderByAsc(HollowBigStorageCageHistoryTask::getId);
return this.page(page, wrapper);
}
@@ -53,5 +60,16 @@
}
return baseMapper.queryHollowDailyProduction(beginDate, endDate);
}
+
+ @Override
+ public List<RunTime> queryRunTimes(String days) {
+ return baseMapper.queryRunTimes(days);
+ }
+
+ @Override
+ public String queryAllMessage() {
+ pushMessageToIndex.hollowGlassMessage();
+ return "success";
+ }
}
--
Gitblit v1.8.0