From d7765b799489db445388e528044ab3b2bd2e649e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 12 六月 2025 08:22:57 +0800
Subject: [PATCH] 钢化模块modbus和S7改造
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
index 34a06f4..c1a12a5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgglasstask/service/impl/EdgGlassTaskInfoServiceImpl.java
@@ -1,14 +1,26 @@
package com.mes.edgglasstask.service.impl;
+import cn.smallbun.screw.core.util.CollectionUtils;
+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.mes.common.config.ConstSysConfig;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+import com.mes.edgglasstask.entity.request.EdgGlassInfoRequest;
import com.mes.edgglasstask.mapper.EdgGlassTaskInfoMapper;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
+import com.mes.sysconfig.service.SysConfigService;
+import com.mes.tools.DateUtil;
+import com.mes.utils.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author wu
@@ -17,4 +29,64 @@
@Service
public class EdgGlassTaskInfoServiceImpl extends ServiceImpl<EdgGlassTaskInfoMapper, EdgGlassTaskInfo> implements EdgGlassTaskInfoService {
+ @Autowired
+ RedisUtil redisUtil;
+ @Resource
+ SysConfigService sysConfigService;
+
+// @Value("${mes.ratio}")
+// private int ratio;
+
+
+ @Override
+ public List<EdgGlassTaskInfo> selectEdgInfo() {
+ int ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
+ EdgGlassInfoRequest request = redisUtil.getCacheObject("edgGlassRequest");
+
+ if (null == request) {
+ request = new EdgGlassInfoRequest();
+ }
+ if (null == request.getBeginDate()) {
+ request.setBeginDate(DateUtil.getBeginDate());
+ request.setEndDate(DateUtil.getEndDate());
+ }
+ LambdaQueryWrapper<EdgGlassTaskInfo> edgGlassWrapper = new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .in(CollectionUtils.isNotEmpty(request.getCellList()), EdgGlassTaskInfo::getLine, request.getCellList())
+ .in(CollectionUtils.isNotEmpty(request.getStateList()), EdgGlassTaskInfo::getState, request.getStateList())
+ .between(null != request.getBeginDate(), EdgGlassTaskInfo::getCreateTime, request.getBeginDate(), request.getEndDate())
+ .orderByDesc(EdgGlassTaskInfo::getCreateTime);
+ List<EdgGlassTaskInfo> list = this.list(edgGlassWrapper);
+ list.stream().forEach(e -> {
+ e.setWidth(e.getWidth() / ratio);
+ e.setHeight(e.getHeight() / ratio);
+ e.setThickness(e.getThickness() / ratio);
+ });
+ return list;
+ }
+
+ @Override
+ public String setEdgGlassInfoRequest(EdgGlassInfoRequest request) {
+ if (request == null) {
+ redisUtil.deleteObject("edgGlassRequest");
+ } else {
+ redisUtil.setCacheObject("edgGlassRequest", request);
+ }
+ return "success";
+ }
+
+ /**
+ * 鏌ヨ鍒ゆ柇纾ㄨ竟绾挎槸鍚︽湁鐜荤拑杩愯
+ *
+ * @param
+ * @return
+ */
+ @Override
+ public List<EdgGlassTaskInfo> selectTaskCacheIsRun() {
+ QueryWrapper<EdgGlassTaskInfo> wrapper = new QueryWrapper<EdgGlassTaskInfo>()
+ .select("line")
+ .eq("state", 1)
+ .groupBy("line");
+
+ return this.list(wrapper);
+ }
}
--
Gitblit v1.8.0