From eae026a90011e77c1a3947021c87a2eea786d1b1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 十月 2025 13:57:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 9859704..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,8 +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)琛ㄦ湇鍔″疄鐜扮被
@@ -21,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());
@@ -30,13 +40,36 @@
}
LambdaQueryWrapper<HollowBigStorageCageHistoryTask> wrapper = new LambdaQueryWrapper<HollowBigStorageCageHistoryTask>()
.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())
+ .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);
- return this.page(page,wrapper);
+ .orderByAsc(HollowBigStorageCageHistoryTask::getId);
+ return this.page(page, wrapper);
+ }
+
+ @Override
+ public DailyProductionVO queryHollowDailyProduction(HollowBigStorageCageHistoryRequest request) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String beginDate = null;
+ String endDate = null;
+ if (com.baomidou.mybatisplus.core.toolkit.StringUtils.checkValNotNull(request.getBeginDate())) {
+ beginDate = sdf.format(request.getBeginDate());
+ endDate = sdf.format(request.getEndDate());
+ }
+ 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