From aa5d2f68e1d97f7a1b20fa15e1bde9195544bb3e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 11 十一月 2025 15:15:06 +0800
Subject: [PATCH] 1、钢化查询添加显示工程名称 2、中空任务界面缺片详情修改
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index 94ca28e..5d0aad2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -8,6 +8,8 @@
import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
+import com.mes.alarm.entity.ProductAlarmInfo;
+import com.mes.alarm.service.ProductAlarmInfoService;
import com.mes.common.config.Const;
import com.mes.common.config.ConstSysConfig;
import com.mes.damage.service.DamageService;
@@ -113,8 +115,25 @@
private String glassIdOne = "";
private String glassIdTwo = "";
+ @Resource
+ private ProductAlarmInfoService productAlarmInfoService;
+
+ private static final String ALARM_MODULE = "纾ㄨ竟";
+ private static final String ALARM_TYPE1 = "涓�绾垮崸寮忕悊鐗囩";
+ private static final String ALARM_TYPE2 = "浜岀嚎鍗у紡鐞嗙墖绗�";
+ private static final String ALARM_CODE_NOGLASS = "noGlass";
+ private static final String ALARM_CODE_ID = "idSame";
+
@Scheduled(fixedDelay = 1000)
public void startOneOpcTask() throws Exception {
+ List<ProductAlarmInfo> alarmInfos = productAlarmInfoService.list(new LambdaQueryWrapper<ProductAlarmInfo>()
+ .eq(ProductAlarmInfo::getState, Const.LOAD_RAW_GLASS_NEW)
+ .eq(ProductAlarmInfo::getAlarmModule, ALARM_MODULE)
+ .eq(ProductAlarmInfo::getAlarmType, ALARM_TYPE1));
+ if (CollectionUtil.isNotEmpty(alarmInfos)) {
+ log.info("鐣岄潰鎶ヨ锛岀瓑寰呬汉宸ュ共棰勫鐞�");
+ return;
+ }
S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
@@ -132,6 +151,14 @@
@Scheduled(fixedDelay = 1000)
public void startTwoOpcTask() throws Exception {
+ List<ProductAlarmInfo> alarmInfos = productAlarmInfoService.list(new LambdaQueryWrapper<ProductAlarmInfo>()
+ .eq(ProductAlarmInfo::getState, Const.LOAD_RAW_GLASS_NEW)
+ .eq(ProductAlarmInfo::getAlarmModule, ALARM_MODULE)
+ .eq(ProductAlarmInfo::getAlarmType, ALARM_TYPE2));
+ if (CollectionUtil.isNotEmpty(alarmInfos)) {
+ log.info("鐣岄潰鎶ヨ锛岀瓑寰呬汉宸ュ共棰勫鐞�");
+ return;
+ }
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
@@ -278,14 +305,36 @@
log.info("寮�濮嬫墽琛岃繘鐗囦换鍔★紝浠诲姟淇℃伅涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{}", task, deviceId, startDate);
//鑾峰彇鐜荤拑鐨勫熀鏈俊鎭�
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
- if (null == glassInfo) {
+ if (null == glassInfo && StringUtils.isNotBlank(task.getGlassIdIn())) {
log.info("杩涚墖鐜荤拑淇℃伅涓嶅瓨鍦紝鐜荤拑id:{}", task.getGlassIdIn());
+ ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+ alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+ alarmInfo.setAlarmModule(ALARM_MODULE);
+ if (deviceId == 1) {
+ alarmInfo.setAlarmType(ALARM_TYPE1);
+ } else {
+ alarmInfo.setAlarmType(ALARM_TYPE2);
+ }
+ alarmInfo.setAlarmCode(ALARM_CODE_NOGLASS);
+ alarmInfo.setAlarmMessage(task.getGlassIdIn());
+ productAlarmInfoService.save(alarmInfo);
Date endDate = new Date();
log.info("缁撴潫杩涚墖浠诲姟璁惧涓簕}锛岀粨鏉熸椂闂翠负锛歿}锛屽叡鑰楁椂锛歿}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
return Boolean.FALSE;
}
if (glassInIdOne.equals(task.getGlassIdIn()) || glassInIdTwo.equals(task.getGlassIdIn())) {
log.info("鐜荤拑id涓庝笂娆＄浉鍚岋紝绂佹杩涚墖");
+ ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+ alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+ alarmInfo.setAlarmModule(ALARM_MODULE);
+ if (deviceId == 1) {
+ alarmInfo.setAlarmType(ALARM_TYPE1);
+ } else {
+ alarmInfo.setAlarmType(ALARM_TYPE2);
+ }
+ alarmInfo.setAlarmCode(ALARM_CODE_ID);
+ alarmInfo.setAlarmMessage(task.getGlassIdIn());
+ productAlarmInfoService.save(alarmInfo);
Date endDate = new Date();
log.info("缁撴潫杩涚墖浠诲姟璁惧涓簕}锛岀粨鏉熸椂闂翠负锛歿}锛屽叡鑰楁椂锛歿}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
return Boolean.FALSE;
@@ -343,6 +392,24 @@
private boolean outTask(S7DataWL task, int deviceId, int cellFlag) {
Date startDate = new Date();
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, task.getGlassIdIn()));
+ if (null == glassInfo && StringUtils.isNotBlank(task.getGlassIdIn())) {
+ log.info("鐩撮�氱幓鐠冧俊鎭笉瀛樺湪锛岀幓鐠僫d:{}", task.getGlassIdIn());
+ ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
+ alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
+ alarmInfo.setAlarmModule(ALARM_MODULE);
+ if (deviceId == 1) {
+ alarmInfo.setAlarmType(ALARM_TYPE1);
+ } else {
+ alarmInfo.setAlarmType(ALARM_TYPE2);
+ }
+ alarmInfo.setAlarmCode(ALARM_CODE_NOGLASS);
+ alarmInfo.setAlarmMessage(task.getGlassIdIn());
+ productAlarmInfoService.save(alarmInfo);
+ Date endDate = new Date();
+ log.info("缁撴潫杩涚墖浠诲姟璁惧涓簕}锛岀粨鏉熸椂闂翠负锛歿}锛屽叡鑰楁椂锛歿}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
+ return Boolean.FALSE;
+ }
//鑾峰彇瀵瑰簲鐨勮澶囩姸鎬佷俊鎭�
S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
@@ -382,9 +449,9 @@
cell = Const.ONE_OUT_TARGET_POSITION;
} else if (Const.OUT_BUSY.equals(twoOutState)) {
cell = Const.TWO_OUT_TARGET_POSITION;
- }else if(Const.OUT_BUSY.equals(oneOutState)){
+ } else if (Const.OUT_BUSY.equals(oneOutState)) {
cell = Const.ONE_OUT_TARGET_POSITION;
- }else{
+ } else {
return Boolean.FALSE;
}
}
--
Gitblit v1.8.0