From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java | 146 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 107 insertions(+), 39 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
index 7def8da..3be1f62 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/service/impl/TaskCacheServiceImpl.java
@@ -1,8 +1,15 @@
package com.mes.taskcache.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.common.config.Const;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
+import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
import com.mes.edgstoragecage.mapper.EdgStorageCageDetailsMapper;
import com.mes.glassinfo.entity.GlassInfo;
@@ -10,72 +17,90 @@
import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.mapper.TaskCacheMapper;
import com.mes.taskcache.service.TaskCacheService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.Resource;
+import java.util.*;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
* @since 2024-04-07
*/
+@Slf4j
@Service
-public class TaskCacheServiceImpl extends ServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
+public class TaskCacheServiceImpl extends MPJBaseServiceImpl<TaskCacheMapper, TaskCache> implements TaskCacheService {
- @Autowired
+ @Resource
EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;
- @Autowired
+ @Resource
GlassInfoMapper glassInfoMapper;
+ @Resource
+ private TaskCacheMapper taskCacheMapper;
+
+
/**
* 娣诲姞鐞嗙墖绗间换鍔�
+ *
* @param taskCache
* @return
*/
@Override
- public boolean insertTaskCache(TaskCache taskCache){
+ public boolean insertTaskCache(TaskCache taskCache) {
baseMapper.insert(taskCache);
return true;
}
/**
* 鏌ヨ纾ㄨ竟浠诲姟
+ *
* @param line
* @return
*/
@Override
- public List<Map<String,Object>> selectEdgInfo(String line) {
- List<TaskCache> taskCache=baseMapper.selectList(new MPJLambdaWrapper<TaskCache>()
+ public List<Map<String, Object>> selectEdgInfo(String line) {
+ List<TaskCache> taskCache = baseMapper.selectList(new MPJLambdaWrapper<TaskCache>()
.selectAll(TaskCache.class)
.eq(TaskCache::getEndCell, line)
- .eq(TaskCache::getTaskStatus,1)
+ .eq(TaskCache::getTaskStatus, 1)
.orderByAsc(TaskCache::getCreateTime));
- List<Map<String,Object>> result=new ArrayList<>();
- int serialNumber=1;
- for(TaskCache taskCache1:taskCache){
- Map<String,Object> map=new HashMap<>();
- GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
+ List<Map<String, Object>> result = new ArrayList<>();
+ int serialNumber = 1;
+ for (TaskCache taskCache1 : taskCache) {
+ Map<String, Object> map = new HashMap<>();
+// GlassInfo glassInfo=glassInfoMapper.selectOne(new MPJLambdaWrapper<GlassInfo>()
+// .selectAll(GlassInfo.class)
+// .eq(GlassInfo::getGlassId,taskCache1.getGlassId()));
+ List<GlassInfo> glassInfos = glassInfoMapper.selectJoinList(GlassInfo.class, new MPJLambdaWrapper<GlassInfo>()
.selectAll(GlassInfo.class)
- .eq(GlassInfo::getGlassId,taskCache1.getGlassId()));
- if(glassInfo!=null){
- map.put("Line",line);//绾胯矾 2001 1绾匡紝 2002 2绾�
- map.put("Width",glassInfo.getWidth());//瀹�
- map.put("Height",glassInfo.getHeight());//楂�
- map.put("Thickness",glassInfo.getThickness());//鍘�
- map.put("GlassId",glassInfo.getGlassId());//鐜荤拑ID
- map.put("FlowCardId",glassInfo.getFlowCardId());//娴佺▼鍗″彿
- map.put("TemperingLayoutId",glassInfo.getTemperingLayoutId());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID
- map.put("TemperingFeedSequence",glassInfo.getTemperingFeedSequence());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID鍐呯殑搴忓彿
- map.put("FilmsId",glassInfo.getFilmsid());//鑶滅郴
- map.put("SerialNumber",serialNumber);//鍑虹墖椤哄簭
+ .innerJoin(EdgStorageCageDetails.class, on -> on
+ .eq(EdgStorageCageDetails::getGlassId, GlassInfo::getGlassId)
+ .eq(EdgStorageCageDetails::getEngineerId, GlassInfo::getEngineerId))
+ .eq(GlassInfo::getGlassId, taskCache1.getGlassId())
+ .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ );
+ if (glassInfos.size() == 1) {
+ GlassInfo glassInfo = glassInfos.get(0);
+ map.put("Line", line);//绾胯矾 2001 1绾匡紝 2002 2绾�
+ map.put("Width", glassInfo.getWidth());//瀹�
+ map.put("Height", glassInfo.getHeight());//楂�
+ map.put("Thickness", glassInfo.getThickness());//鍘�
+ map.put("GlassId", glassInfo.getGlassId());//鐜荤拑ID
+ map.put("FlowCardId", glassInfo.getFlowCardId());//娴佺▼鍗″彿
+ map.put("TemperingLayoutId", glassInfo.getTemperingLayoutId());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID
+ map.put("TemperingFeedSequence", glassInfo.getTemperingFeedSequence());// 鏆備笉鏄剧ず 閽㈠寲鐗堝浘ID鍐呯殑搴忓彿
+ map.put("FilmsId", glassInfo.getFilmsid());//鑶滅郴
+ map.put("SerialNumber", serialNumber);//鍑虹墖椤哄簭
result.add(map);
+ } else if (glassInfos.size() > 1) {
+ log.info("鏁版嵁涓嶇鍚堥�昏緫--纾ㄨ竟闃熷垪glassId閲嶅:", glassInfos);
+ return new ArrayList<>();
}
serialNumber++;
}
@@ -84,18 +109,25 @@
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line));
}
+ @Override
+ public TaskCache queryGlassByTaskCache(int line, List<Integer> taskTypes) {
+ return baseMapper.queryGlassByTaskCache(line, taskTypes);
+ }
+
/**
* 鏌ヨ寰呯悊鐗囧伐浣滅殑浠诲姟
+ *
* @return
*/
@Override
- public List<TaskCache> selectCacheInfo(){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0));
+ public List<TaskCache> selectCacheInfo() {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0));
}
/**
* 鏌ヨ鍏ㄩ儴浠诲姟
+ *
* @return
*/
@Override
@@ -105,45 +137,81 @@
/**
* 鏌ヨ寰呰繘鐗囦换鍔�
+ *
* @return
*/
@Override
- public List<TaskCache> selectInputTaskCache(){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,1));
+ public List<TaskCache> selectInputTaskCache() {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0).eq(TaskCache::getTaskType, 1));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",1));
}
/**
* 鏌ヨ寰呭嚭鐗囦换鍔�
+ *
* @return
*/
@Override
- public List<TaskCache> selectOutTaskCache(){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus,0).eq(TaskCache::getTaskType,2));
+ public List<TaskCache> selectOutTaskCache() {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getTaskStatus, 0).eq(TaskCache::getTaskType, 2));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("task_status",0).eq("task_type",2));
}
/**
* 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ *
* @param line
* @return
*/
@Override
- public List<TaskCache> selectLastOutCacheInfos(int line){
- return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
+ public List<TaskCache> selectLastOutCacheInfos(int line) {
+ return baseMapper.selectList(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell, line).eq(TaskCache::getTaskStatus, 1).orderByDesc(TaskCache::getCreateTime));
// return baseMapper.selectList(new QueryWrapper<TaskCache>().eq("end_cell",line).eq("task_status",1).orderByDesc("ID"));
}
/**
* 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
+ *
* @param line
* @return
*/
@Override
- public TaskCache selectLastOutCacheInfo(int line){
- return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell,line).eq(TaskCache::getTaskStatus,1).orderByDesc(TaskCache::getCreateTime));
+ public TaskCache selectLastOutCacheInfo(int line) {
+ return baseMapper.selectOne(new MPJLambdaWrapper<TaskCache>().selectAll(TaskCache.class).eq(TaskCache::getEndCell, line).eq(TaskCache::getTaskStatus, 1).orderByDesc(TaskCache::getCreateTime));
}
+ @Override
+ public List<TaskCache> selectTaskCache(TaskCache taskCache, String startTime, String endTime){
+ if (endTime != null && !endTime.isEmpty()) {
+ endTime = endTime + " 23:59:59";
+ }
+ LambdaQueryWrapper<TaskCache> wrapper = new LambdaQueryWrapper<>();
+ if (taskCache.getStartCell() != null) {
+ wrapper.eq(TaskCache::getStartCell, taskCache.getStartCell());
+ }
+ if (taskCache.getEndCell() != 0) {
+ wrapper.eq(TaskCache::getEndCell, taskCache.getEndCell());
+ }
+ if (taskCache.getTaskStatus() != -1) {
+ wrapper.eq(TaskCache::getTaskStatus, taskCache.getTaskStatus());
+ }
+ if (taskCache.getTaskType() != -1) {
+ wrapper.eq(TaskCache::getTaskType, taskCache.getTaskType());
+ }
+ if (startTime != null && !startTime.isEmpty()) {
+ wrapper.ge(TaskCache::getCreateTime, startTime);
+ }
+ if (endTime != null && !endTime.isEmpty()) {
+ wrapper.le(TaskCache::getCreateTime, endTime);
+ }
+ wrapper.orderByDesc(TaskCache::getCreateTime);
+ wrapper.and(item -> item.eq(TaskCache::getDeleted, 0)
+ .or()
+ .eq(TaskCache::getDeleted, 1));
+ wrapper.between(TaskCache::getCreateTime, startTime, endTime);
+ return baseMapper.selectList(wrapper);
+ }
+
}
--
Gitblit v1.8.0