From d799fbde44cc568a3e15d78dc6e582ff244ffa89 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 三月 2025 16:05:44 +0800
Subject: [PATCH] 1、卧式理片重置任务调整，避免无任务情况下无法将任务交互表的数据清掉 2、中空领取任务界面新增产品名称，便于识别产品 3、调整部分定时任务间隔时间 4、定时任务分隔开，按照两个/多个界面的websocket由一个分为多个 5、取消钢化功能开发中z
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
index 1b8037d..c7cf26a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
@@ -4,13 +4,14 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.entity.request.TaskHistoryRequest;
import com.mes.opctask.mapper.EdgStorageDeviceTaskHistoryMapper;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import org.springframework.stereotype.Service;
-import java.util.List;
+import java.text.SimpleDateFormat;
/**
* (EdgStorageDeviceTaskHistory)琛ㄦ湇鍔″疄鐜扮被
@@ -36,5 +37,17 @@
}
return this.page(page, wrapper);
}
+
+ @Override
+ public DailyProductionVO queryEdgDailyProduction(TaskHistoryRequest request) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String beginDate = null;
+ String endDate = null;
+ if (StringUtils.checkValNotNull(request.getStartTime())) {
+ beginDate = sdf.format(request.getStartTime());
+ endDate = sdf.format(request.getEndTime());
+ }
+ return baseMapper.queryEdgDailyProduction(beginDate, endDate, request.getDeviceId());
+ }
}
--
Gitblit v1.8.0