From 4f966da6047cdcd9c53e254c1f1c7bdd70af0b34 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 21 四月 2025 10:08:18 +0800 Subject: [PATCH] 1、卧式理片笼配置参数由配置yml文件改为数据库配置表获取 2、磨边后参数改造,解决plc查询数据异常问题 3、大理片笼配置参数由配置yml文件改为数据库配置表获取 4、钢化配置参数由配置yml文件改为数据库配置表获取 5、配置参数常量类配置修改,提供获取配置参数的方法 --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java index cf02b08..f7c9623 100644 --- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java +++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java @@ -4,12 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.mes.common.config.Const; -import com.mes.damage.entity.Damage; import com.mes.damage.service.DamageService; -import com.mes.engineering.entity.Engineering; import com.mes.largenscreen.entity.PieChartVO; -import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.temperingglass.entity.TemperingGlassInfo; +import com.mes.temperingglass.service.TemperingGlassInfoService; import com.mes.tools.WebSocketServer; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +16,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * @author SNG-010 @@ -41,7 +38,7 @@ public void temperingGlassHome() { JSONObject jsonObject = new JSONObject(); //姝e湪绛夊緟杩涚墖鐨勭幓鐠� - List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlass(); + List<TemperingGlassInfo> waitingGlass = temperingAgoService.selectWaitingGlassByOpc(); if (waitingGlass != null) { jsonObject.append("waitingGlass", waitingGlass); } -- Gitblit v1.8.0