From b4ff04d7dd22f0e48bf386cd422e885aef08fed7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 五月 2025 15:03:10 +0800
Subject: [PATCH] OPC通讯修改为S7通讯
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 450 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 320 insertions(+), 130 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 332b090..68d4036 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
@@ -5,9 +5,11 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.common.config.Const;
+import com.mes.common.config.ConstSysConfig;
import com.mes.damage.service.DamageService;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
@@ -21,15 +23,20 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
import com.mes.opctask.service.EdgStorageDeviceTaskService;
+import com.mes.s7.entity.S7DataMB;
+import com.mes.s7.entity.S7DataWL;
+import com.mes.s7.entity.S7DataWLExtra;
+import com.mes.sysconfig.service.SysConfigService;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -63,66 +70,106 @@
EdgStorageDeviceTaskHistoryService edgStorageDeviceTaskHistoryService;
@Resource
DamageService damageService;
+ @Resource
+ SysConfigService sysConfigService;
- @Value("${mes.glassGap}")
- private int glassGap;
- @Value("${mes.threshold}")
+ @Autowired
+ @Qualifier("s7SerializerWLOne")
+ private S7Serializer s7SerializerWLOne;
+
+ @Autowired
+ @Qualifier("s7SerializerWLTwo")
+ private S7Serializer s7SerializerWLTwo;
+
+ @Autowired
+ @Qualifier("s7SerializerMBOne")
+ private S7Serializer s7SerializerMBOne;
+
+ @Autowired
+ @Qualifier("s7SerializerMBTwo")
+ private S7Serializer s7SerializerMBTwo;
+
+ // @Value("${mes.threshold}")
private int threshold;
- @Value("${mes.cellLength}")
+ // @Value("${mes.cellLength}")
private int cellLength;
- @Value("${mes.ratio}")
+ // @Value("${mes.ratio}")
private int ratio;
- @Value("${mes.min.one.firstLength}")
+ // @Value("${mes.min.one.firstLength}")
private int minOneFirstLength;
-
- @Value("${mes.min.one.secondLength}")
+ //
+// @Value("${mes.min.one.secondLength}")
private int minOneSecondLength;
-
- @Value("${mes.min.two.firstLength}")
+ //
+// @Value("${mes.min.two.firstLength}")
private int minTwoFirstLength;
-
- @Value("${mes.min.two.secondLength}")
+ //
+// @Value("${mes.min.two.secondLength}")
private int minTwoSecondLength;
-
- @Value("${mes.max.firstLength}")
+ //
+// @Value("${mes.max.firstLength}")
private int maxTwoFirstLength;
-
- @Value("${mes.max.secondLength}")
+ //
+// @Value("${mes.max.secondLength}")
private int maxTwoSecondLength;
+ //
+// @Value("${mes.maxThickness}")
+ private int maxThickness;
private String glassInIdOne = "";
private String glassInIdTwo = "";
private String glassIdOne = "";
private String glassIdTwo = "";
- // @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void startOneOpcTask() throws Exception {
+ S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
+ S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
+ log.info("浜岀嚎鍗х悊: {}", s7DataWLTwo);
//鑾峰彇绗簩鏉＄嚎璺殑鍗у紡鐞嗙墖绗肩姸鎬�
- ReadWriteEntity twoInkageEntity = miloService.readFromOpcUa("ZKQ2.ZKQ2.isInkage");
+// ReadWriteEntity twoInkageEntity = miloService.readFromOpcUa("WL2.WL2.deviceState");
+ Boolean twoInkageEntity = s7DataWLTwo.getDeviceState();
//榛樿鍙窇涓�鍙板崸寮忕悊鐗�,涓ゆ潯绾胯矾閮藉彲浠ヨ蛋
- int cellFlag = 2;
+ int cellFlag = 1;
//濡傛灉涓ゆ潯绾块兘鍚姩鍒欏彧鑳借窇涓�鏉＄嚎
- if (twoInkageEntity != null && "1".equals(twoInkageEntity.getValue() + "")) {
- cellFlag = 1;
+// if (twoInkageEntity != null && !Boolean.parseBoolean(twoInkageEntity.getValue() + "")) {
+ if (twoInkageEntity != null && !twoInkageEntity) {
+ cellFlag = 2;
}
- startOneOpcTaskChild(EDG_STORAGE_DEVICE_ONE_TASK, 1, cellFlag);
+ startOneOpcTaskChild(s7DataWLOne, 1, cellFlag);
}
- // @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void startTwoOpcTask() throws Exception {
- ReadWriteEntity oneInkageEntity = miloService.readFromOpcUa("ZKQ1.ZKQ1.isInkage");
- int cellFlag = 2;
- if (oneInkageEntity != null && "1".equals(oneInkageEntity.getValue() + "")) {
- cellFlag = 1;
+ S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
+ S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
+ log.info("涓�绾垮崸鐞�: {}", s7DataWLOne);
+// ReadWriteEntity oneInkageEntity = miloService.readFromOpcUa("WL1.WL1.deviceState");
+ Boolean oneInkageEntity = s7DataWLOne.getDeviceState();
+ int cellFlag = 1;
+// if (oneInkageEntity != null && !Boolean.parseBoolean(oneInkageEntity.getValue() + "")) {
+ if (oneInkageEntity != null && !oneInkageEntity) {
+ cellFlag = 2;
}
- startOneOpcTaskChild(EDG_STORAGE_DEVICE_TWO_TASK, 2, cellFlag);
+ startOneOpcTaskChild(s7DataWLTwo, 2, cellFlag);
}
- private void startOneOpcTaskChild(String tableName, int device, int cellFlag) throws Exception {
- edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
- .eq(EdgStorageDeviceTaskHistory::getDeviceId, device));
- EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName);
+ // private void startOneOpcTaskChild(String tableName, int device, int cellFlag) throws Exception {
+ private void startOneOpcTaskChild(S7DataWL task, int device, int cellFlag) throws Exception {
+ threshold = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_THRESHOLD);
+ cellLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_CELL_LENGTH);
+ ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
+ minOneFirstLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_ONE_FIRST_LENGTH);
+ minOneSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_ONE_SECOND_LENGTH);
+ minTwoFirstLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_TWO_FIRST_LENGTH);
+ minTwoSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MIN_TWO_SECOND_LENGTH);
+ maxTwoFirstLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_FIRST_LENGTH);
+ maxTwoSecondLength = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_SECOND_LENGTH);
+ maxThickness = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_MAX_THICKNESS);
+
+// EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(tableName);
+
if (task == null) {
log.info("浠诲姟琛ㄥ熀纭�鏁版嵁褰曞叆澶辫触锛岃妫�鏌ユ暟鎹槸鍚﹀綍鍏ユ垚鍔�");
return;
@@ -141,41 +188,52 @@
//杩涚墖浠诲姟
log.info("璁惧锛歿}鐘舵�侊細{}", device, request);
log.info("杩涚墖浠诲姟锛氳繘鐗囩幓鐠僫d涓猴細{}", task.getGlassIdIn());
- intoTask(task, tableName, device);
+ intoTask(task, "", device);
} else if (request == 2 && taskRunning == 0) {
//鍑虹墖浠诲姟
- outTask(task, tableName, device, cellFlag);
+ outTask(task, "", device, cellFlag);
} else if (request == 3 && taskRunning == 0) {
//鐩撮�氫换鍔�
log.info("璁惧锛歿}鐘舵�侊細{}", device, request);
- if (!outTask(task, tableName, device, cellFlag)) {
- intoTask(task, tableName, device);
+ if (!outTask(task, "", device, cellFlag)) {
+ intoTask(task, "", device);
}
} else if (request == 4) {
log.info("璁惧锛歿}鐘舵�侊細{}", device, request);
log.info("灏嗗惎鍔ㄥ瓙鏀逛负4");
- task.setTaskRunning(Const.GLASS_CACHE_TYPE_RUNNING);
- edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+// task.setTaskRunning(Const.GLASS_CACHE_TYPE_RUNNING);
+// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+ if (device == 2) {
+ s7SerializerWLTwo.write(S7DataWL.builder().taskRunning(Const.GLASS_CACHE_TYPE_RUNNING.shortValue()).build());
+ } else {
+ s7SerializerWLOne.write(S7DataWL.builder().taskRunning(Const.GLASS_CACHE_TYPE_RUNNING.shortValue()).build());
+ }
+
} else if (request == 5) {
log.info("璁惧锛歿}鐘舵�侊細{}", device, request);
- finishTask(task, tableName, device);
+ finishTask(task, "", device);
} else {
log.info("鐜荤拑寮傚父澶勭悊");
- damageTask(task, tableName, device);
+ damageTask(task, "", device);
}
-// } catch (Exception e) {
-// log.info("鎵ц浠诲姟杩囩▼涓彂鐢熷紓甯革紝浠诲姟瀛梴}锛寋}", task.getTaskState(), e.getMessage());
-// log.info("灏嗗惎鍔ㄥ瓧鏀逛负0");
-// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
-// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
-// }
+// } catch(Exception e)
+//
+// {
+// log.info("鎵ц浠诲姟杩囩▼涓彂鐢熷紓甯革紝浠诲姟瀛梴}锛寋}", task.getTaskState(), e.getMessage());
+// log.info("灏嗗惎鍔ㄥ瓧鏀逛负0");
+// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+// }
+
}
- // @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void edgOneOpcTask() throws Exception {
- EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_ONE_TASK);
- String glassId = task.getGlassId();
+// EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_ONE_TASK);
+// String glassId = task.getGlassId();
+ S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
+ String glassId = s7DataWLOne.getGlassId();
if (StringUtils.isBlank(glassId) || glassId.equals(glassIdOne)) {
log.info("{}鍙风嚎纾ㄨ竟鍓嶇幓鐠冩湭灏变綅锛岀粨鏉熸湰娆′换鍔�", 1);
return;
@@ -183,10 +241,12 @@
edgTaskChild(glassId, 1);
}
- // @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void edgTwoOpcTask() throws Exception {
- EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_TWO_TASK);
- String glassId = task.getGlassId();
+// EdgStorageDeviceTask task = edgStorageDeviceTaskService.queryTaskMessage(EDG_STORAGE_DEVICE_TWO_TASK);
+// String glassId = task.getGlassId();
+ S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
+ String glassId = s7DataWLTwo.getGlassId();
if (StringUtils.isBlank(glassId) || glassId.equals(glassIdTwo)) {
log.info("{}鍙风嚎纾ㄨ竟鍓嶇幓鐠冩湭灏变綅锛岀粨鏉熸湰娆′换鍔�", 2);
return;
@@ -195,21 +255,36 @@
}
private void edgTaskChild(String glassId, int cell) throws Exception {
+ ratio = sysConfigService.queryConfigValue(ConstSysConfig.CACHE_RATIO);
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId).last("limit 1"));
if (glassInfo == null) {
log.info("瀵瑰垪琛ㄤ腑鐨勭幓鐠僫d閿欒锛岃妫�鏌ユ暟鎹紝鐜荤拑id锛歿}", glassId);
return;
}
String toEndingId = glassInfo.getTemperingLayoutId() + "" + glassInfo.getTemperingFeedSequence();
- List<ReadWriteEntity> list = new ArrayList<>();
-// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".mesControl", true));
- list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".glassId", Integer.parseInt(toEndingId)));
- list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".toEdingId", Integer.parseInt(toEndingId)));
- list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".width", (int) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
- list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".height", (int) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
+// List<ReadWriteEntity> list = new ArrayList<>();
+//// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".mesControl", true));
+// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".glassId", Integer.parseInt(toEndingId)));
+// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".toEdingId", Integer.parseInt(toEndingId)));
+// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".width", (int) Math.max(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
+// list.add(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".height", (int) Math.min(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio)));
+//
+// miloService.writeToOpcUa(list);
+// miloService.writeToOpcWord(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".thickness", (int) glassInfo.getThickness() * ratio));
+ S7DataMB s7DataMB = new S7DataMB();
+ s7DataMB.setToEdingId(Integer.parseInt(toEndingId));
+ s7DataMB.setGlassId(Integer.parseInt(toEndingId));
+ s7DataMB.setWidth((int) Math.max(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio));
+ s7DataMB.setHeight((int) Math.min(glassInfo.getWidth() * ratio, glassInfo.getHeight() * ratio));
+ s7SerializerMBOne.write(s7DataMB);
- miloService.writeToOpcUa(list);
- miloService.writeToOpcWord(generateReadWriteEntity("MB" + cell + ".MB" + cell + ".thickness", (int) glassInfo.getThickness() * 10));
+ s7DataMB = new S7DataMB();
+ s7DataMB.setThickness((short) (glassInfo.getThickness() * ratio));
+ if (cell == 1) {
+ s7SerializerMBOne.write(s7DataMB);
+ } else {
+ s7SerializerMBTwo.write(s7DataMB);
+ }
//淇敼纾ㄨ竟瀵瑰垪涓殑纾ㄨ竟绾胯矾鍙婄姸鎬�
edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
.set(EdgGlassTaskInfo::getLine, cell)
@@ -222,10 +297,9 @@
} else {
glassIdTwo = glassId;
}
-
}
- private boolean intoTask(EdgStorageDeviceTask task, String tableName, int deviceId) {
+ private boolean intoTask(S7DataWL task, String tableName, int deviceId) {
Date startDate = new Date();
log.info("寮�濮嬫墽琛岃繘鐗囦换鍔★紝浠诲姟淇℃伅涓猴細{},琛ㄥ悕涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{}", task, tableName, deviceId, startDate);
//鑾峰彇鐜荤拑鐨勫熀鏈俊鎭�
@@ -244,17 +318,21 @@
}
int firstLength = minTwoFirstLength;
int secondLength = minTwoSecondLength;
+ int fecondMaxLength = 2300;
if (deviceId == 1) {
firstLength = minOneFirstLength;
secondLength = minOneSecondLength;
+ fecondMaxLength = 2500;
}
- if (Math.max(glassInfo.getWidth(), glassInfo.getHeight()) < firstLength || Math.min(glassInfo.getWidth(), glassInfo.getHeight()) < secondLength) {
+ if (Math.max(glassInfo.getWidth(), glassInfo.getHeight()) < firstLength || Math.min(glassInfo.getWidth(), glassInfo.getHeight()) < secondLength
+ || Math.max(glassInfo.getWidth(), glassInfo.getHeight()) > fecondMaxLength) {
log.info("杩涚墖鐜荤拑灏哄灏忎簬{}*{}锛岀姝㈣繘绗肩幓鐠僫d:{}锛屽昂瀵镐负{}銆亄}", firstLength, secondLength, task.getGlassIdIn(), glassInfo.getWidth(), glassInfo.getHeight());
Date endDate = new Date();
log.info("缁撴潫杩涚墖浠诲姟璁惧涓簕}锛岀粨鏉熸椂闂翠负锛歿}锛屽叡鑰楁椂锛歿}ms", deviceId, endDate, endDate.getTime() - startDate.getTime());
return Boolean.FALSE;
}
- EdgStorageCage edgStorageCage = edgStorageCageService.selectNearestEmpty(task.getCurrentCell(), Boolean.FALSE);
+// EdgStorageCage edgStorageCage = edgStorageCageService.selectNearestEmpty(task.getCurrentCell(), deviceId, Boolean.FALSE);
+ EdgStorageCage edgStorageCage = edgStorageCageService.selectNearestEmpty(Integer.parseInt(task.getCurrentCell().toString()), deviceId, Boolean.FALSE);
Assert.isTrue(null != edgStorageCage, "鏍煎瓙宸叉弧");
log.info("4銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
EdgStorageCageDetails details = new EdgStorageCageDetails();
@@ -265,9 +343,22 @@
edgStorageCageDetailsService.save(details);
//鏇存柊浠诲姟淇℃伅
- task.setStartCell(edgStorageCage.getSlot());
- task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN);
- edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+// task.setStartCell(edgStorageCage.getSlot());
+// task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN);
+// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+ task.setStartCell(edgStorageCage.getSlot().shortValue());
+ task.setTaskRunning(Const.GLASS_CACHE_TYPE_IN.shortValue());
+ if (deviceId == 1) {
+ s7SerializerWLOne.write(
+ S7DataWL.builder().startCell(edgStorageCage.getSlot().shortValue())
+ .taskRunning(Const.GLASS_CACHE_TYPE_IN.shortValue()).build()
+ );
+ } else {
+ s7SerializerWLTwo.write(
+ S7DataWL.builder().startCell(edgStorageCage.getSlot().shortValue())
+ .taskRunning(Const.GLASS_CACHE_TYPE_IN.shortValue()).build()
+ );
+ }
saveHistoryTask(task, deviceId);
//璁板綍杩涚墖浠诲姟鐨勭幓鐠僫d鐢ㄤ簬涓嬫浠诲姟鐨勬瘮杈冿紝闃叉鍚屼竴鍧楃幓鐠冮噸澶嶆墽琛�
if (deviceId == 1) {
@@ -280,38 +371,93 @@
return Boolean.TRUE;
}
- private boolean outTask(EdgStorageDeviceTask task, String tableName, int deviceId, int cellFlag) throws Exception {
+ private boolean outTask(S7DataWL task, String tableName, int deviceId, int cellFlag) throws Exception {
Date startDate = new Date();
//鑾峰彇瀵瑰簲鐨勮澶囩姸鎬佷俊鎭�
- ReadWriteEntity oneOutStateEntity = miloService.readFromOpcUa("WL1.WL1.OUTSTATE");
- ReadWriteEntity twoOutStateEntity = miloService.readFromOpcUa("WL2.WL2.OUTSTATE");
+// ReadWriteEntity oneOutStateEntity = miloService.readFromOpcUa("WL1.WL1.slotState");
+// ReadWriteEntity twoOutStateEntity = miloService.readFromOpcUa("WL2.WL2.slotState");
+// ReadWriteEntity d06OutStateEntity = miloService.readFromOpcUa("WL2.WL2.d06SlotState");
+ S7DataWL s7DataWLOne = s7SerializerWLOne.read(S7DataWL.class);
+ S7DataWL s7DataWLTwo = s7SerializerWLTwo.read(S7DataWL.class);
+ S7DataWLExtra s7DataWLExtraTwo = s7SerializerWLTwo.read(S7DataWLExtra.class);
+ Short oneOutStateEntity = s7DataWLOne.getSlotState();
+ Short twoOutStateEntity = s7DataWLTwo.getSlotState();
+ Short d06OutStateEntity = s7DataWLExtraTwo.getD06SlotState();
//鐘舵�佹湁3涓儏鍐碉細0绌洪棽 1蹇欑 2绂佺敤
- String oneOutState = "0";
- String twoOutState = "0";
- if (null != oneOutStateEntity && null != oneOutStateEntity.getValue()) {
- oneOutState = oneOutStateEntity.getValue().toString();
+ String oneOutState = Const.OUT_DISABLE;
+ String twoOutState = Const.OUT_DISABLE;
+ String d06OutState = Const.OUT_DISABLE;
+// if (null != oneOutStateEntity && null != oneOutStateEntity.getValue()) {
+// oneOutState = oneOutStateEntity.getValue().toString();
+// }
+ if (null != oneOutStateEntity) {
+ oneOutState = oneOutStateEntity.toString();
}
- if (null != twoOutStateEntity && null != twoOutStateEntity.getValue()) {
- twoOutState = twoOutStateEntity.getValue().toString();
+// if (null != twoOutStateEntity && null != twoOutStateEntity.getValue()) {
+// twoOutState = twoOutStateEntity.getValue().toString();
+// }
+ if (null != twoOutStateEntity) {
+ twoOutState = twoOutStateEntity.toString();
}
- if (Const.OUT_DISABLE_ALL.contains(oneOutState) && Const.OUT_DISABLE_ALL.contains(twoOutState)) {
+ //涓ゆ潯绾块兘涓虹鐢ㄥ垯涓嶅嚭鐜荤拑
+ if (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState)) {
log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
return Boolean.FALSE;
}
+// if (null != d06OutStateEntity && null != d06OutStateEntity.getValue()) {
+// d06OutState = d06OutStateEntity.getValue().toString();
+// }
+ if (null != d06OutStateEntity) {
+ d06OutState = d06OutStateEntity.toString();
+ }
+ //鑾峰彇d06鐗囧彴鐘舵��
+ // 1:涓�瀵逛竴鐨勬儏鍐典笅涓嶉渶瑕佸垽鏂璬06鐘舵��
+ // 2:涓�鍙风嚎涓�瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦簩鍙风嚎纾ㄨ竟鍓嶇墖鍙癉07鐨勭姸鎬侊紝D07闈炵鐢ㄦ椂锛屼簩鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
+ // 3:浜屽彿绾夸竴瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦竴鍙风嚎纾ㄨ竟鍓嶇墖鍙癈08鐨勭姸鎬侊紝C08闈炵鐢ㄦ椂锛屼竴鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
+ if (cellFlag == 2) {
+ if (deviceId == 1) {
+ twoOutState = Const.OUT_DISABLE.equals(twoOutState) ? Const.OUT_DISABLE : d06OutState;
+ } else {
+ oneOutState = Const.OUT_DISABLE.equals(oneOutState) ? Const.OUT_DISABLE : d06OutState;
+ }
+ if (Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) {
+ log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
+ return Boolean.FALSE;
+ }
+ }
+
log.info("寮�濮嬫墽琛屽嚭鐗�/鐩撮�氫换鍔★紝浠诲姟淇℃伅涓猴細{},琛ㄥ悕涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{},涓�鍙风嚎鐘舵�侊細{}锛屼簩鍙风嚎鐘舵�侊細{}",
task, tableName, deviceId, startDate, oneOutState, twoOutState);
- EdgStorageCageDetails edgStorageCageDetails = null;
//鑾峰彇褰撳墠闇�瑕佽蛋閭ｆ潯绾�
int cell = 0;
if (cellFlag == 1) {
cell = deviceId;
} else {
- if (Const.OUT_FREE.equals(oneOutState)) {
+ if (Const.OUT_FREE.equals(twoOutState)) {
+ cell = Const.TWO_OUT_TARGET_POSITION;
+ } else if (Const.OUT_FREE.equals(oneOutState)) {
cell = Const.ONE_OUT_TARGET_POSITION;
} else {
- cell = Const.TWO_OUT_TARGET_POSITION;
+ return Boolean.FALSE;
}
}
+ if (Const.OUT_FREE.equals(oneOutState) && Const.OUT_FREE.equals(twoOutState)) {
+ if (cellFlag == 2) {
+ if (!outChildTask(task, tableName, deviceId, cell, startDate)) {
+ cell = cell == Const.ONE_OUT_TARGET_POSITION ? Const.TWO_OUT_TARGET_POSITION : Const.ONE_OUT_TARGET_POSITION;
+ return outChildTask(task, tableName, deviceId, cell, startDate);
+ }
+ } else {
+ return outChildTask(task, tableName, deviceId, cell, startDate);
+ }
+ } else {
+ return outChildTask(task, tableName, deviceId, cell, startDate);
+ }
+ return Boolean.TRUE;
+ }
+
+ private boolean outChildTask(S7DataWL task, String tableName, int deviceId, int cell, Date startDate) {
+ EdgStorageCageDetails edgStorageCageDetails = null;
//绗煎唴鏄増鍥剧浉宸槸鍚﹁秴杩囬槇鍊�
boolean flag = queryMaxMinDiffByDevice(threshold, deviceId);
@@ -327,7 +473,7 @@
double maxLength = Math.max(minEdgDetails.getWidth(), minEdgDetails.getHeight());
double minLength = Math.min(minEdgDetails.getWidth(), minEdgDetails.getHeight());
if ((cell == 1 && maxLength >= minOneFirstLength && minLength >= minOneSecondLength) ||
- (cell == 2 && maxLength <= maxTwoFirstLength && minLength <= maxTwoSecondLength)) {
+ (cell == 2 && maxLength <= maxTwoFirstLength && minLength <= maxTwoSecondLength && minEdgDetails.getThickness() < maxThickness)) {
//鐜荤拑灏忕墖鍚屽昂瀵哥殑绂诲綋鍓嶆牸瀛愭渶杩戠殑鐜荤拑灏忕墖
edgStorageCageDetails = edgStorageCageDetailsService.getOne(new LambdaQueryWrapper<EdgStorageCageDetails>()
.eq(EdgStorageCageDetails::getWidth, minEdgDetails.getWidth())
@@ -347,23 +493,25 @@
if (null != edgeData) {
GlassInfo glassOutInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, edgeData.getGlassIdOut()));
//绗煎唴鐨勭幓鐠冪殑灏哄鏄惁鍜屼笂涓�娆′换鍔′竴鑷�
- edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(deviceId, task.getCurrentCell(), glassOutInfo.getWidth(), glassOutInfo.getHeight());
+ edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsBySize(deviceId, task.getCurrentCell(), glassOutInfo.getWidth(), glassOutInfo.getHeight(), cell, maxThickness);
if (null == edgStorageCageDetails && StringUtils.isNotBlank(task.getGlassIdIn())) {
GlassInfo glassInInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>()
.eq(GlassInfo::getGlassId, task.getGlassIdIn())
.eq(GlassInfo::getWidth, glassOutInfo.getWidth())
.eq(GlassInfo::getHeight, glassOutInfo.getHeight()));
if (null != glassInInfo) {
- edgStorageCageDetails = new EdgStorageCageDetails();
- BeanUtils.copyProperties(glassInInfo, edgStorageCageDetails);
+ if (cell == 2 && glassInInfo.getThickness() < maxThickness) {
+ edgStorageCageDetails = new EdgStorageCageDetails();
+ BeanUtils.copyProperties(glassInInfo, edgStorageCageDetails);
+ }
}
}
}
}
//鍓嶉潰宸茬粡灏哄闂澶勭悊瀹屾瘯锛屽紑濮嬭绠楁棤鐩稿悓灏哄鐨勬柊鐜荤拑灏忕墖
if (null == edgStorageCageDetails) {
- edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsByLimitSize(deviceId, task.getCurrentCell(), 0, 0,
- cell, minOneFirstLength, minOneSecondLength, maxTwoFirstLength, maxTwoSecondLength);
+ edgStorageCageDetails = edgStorageCageDetailsService.queryEdgStorageDetailsByLimitSize(deviceId, Integer.parseInt(task.getCurrentCell().toString()), 0, 0,
+ cell, minOneFirstLength, minOneSecondLength, maxTwoFirstLength, maxTwoSecondLength, maxThickness);
}
if (edgStorageCageDetails == null && StringUtils.isNotBlank(task.getGlassIdIn())) {
//鍜屼笂娆′换鍔′笉瀛樺湪鐩稿悓灏哄
@@ -373,7 +521,7 @@
double minLength = Math.min(glassInInfo.getWidth(), glassInInfo.getHeight());
if ((cell == 1 && maxLength >= minOneFirstLength && minLength >= minOneSecondLength) ||
(cell == 2 && maxLength <= maxTwoFirstLength && minLength <= maxTwoSecondLength
- && maxLength >= minTwoFirstLength && minLength >= minTwoSecondLength)) {
+ && maxLength >= minTwoFirstLength && minLength >= minTwoSecondLength && glassInInfo.getThickness() < maxThickness)) {
//鐜荤拑灏忕墖鍚屽昂瀵哥殑绂诲綋鍓嶆牸瀛愭渶杩戠殑鐜荤拑灏忕墖
edgStorageCageDetails = new EdgStorageCageDetails();
BeanUtils.copyProperties(glassInInfo, edgStorageCageDetails);
@@ -442,12 +590,30 @@
log.info("5銆佹洿鏂板嚭鐗囩幓鐠冪殑鐘舵�佷负{}", Const.GLASS_STATE_OUT);
}
//鐢熸垚鍑虹墖浠诲姟
- task.setGlassIdOut(edgStorageCageDetails.getGlassId());
- task.setStartCell(edgStorageCageDetails.getSlot());
- task.setTaskRunning(taskType);
- task.setEndCell(cell);
-
- edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+// task.setGlassIdOut(edgStorageCageDetails.getGlassId());
+// task.setStartCell(edgStorageCageDetails.getSlot());
+// task.setTaskRunning(taskType);
+// task.setEndCell(cell);
+// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+ if (deviceId == 1) {
+ s7SerializerWLOne.write(
+ S7DataWL.builder()
+ .glassIdOut(edgStorageCageDetails.getGlassId())
+ .startCell(edgStorageCageDetails.getSlot().shortValue())
+ .taskRunning((short) taskType)
+ .endCell((short) cell)
+ .build()
+ );
+ } else {
+ s7SerializerWLTwo.write(
+ S7DataWL.builder()
+ .glassIdOut(edgStorageCageDetails.getGlassId())
+ .startCell(edgStorageCageDetails.getSlot().shortValue())
+ .taskRunning((short) taskType)
+ .endCell((short) cell)
+ .build()
+ );
+ }
saveHistoryTask(task, deviceId);
//璁板綍鐩撮�氫换鍔＄殑鐜荤拑id鐢ㄤ簬涓嬫浠诲姟鐨勬瘮杈冿紝闃叉鍚屼竴鍧楃幓鐠冮噸澶嶆墽琛�
if (3 == task.getTaskState()) {
@@ -468,17 +634,17 @@
return Boolean.TRUE;
}
- private boolean finishTask(EdgStorageDeviceTask task, String tableName, int device) {
+ private boolean finishTask(S7DataWL task, String tableName, int device) {
if (task.getTaskState() <= 4) {
log.info("鏈夋鍦ㄦ墽琛岀殑浠诲姟鎴栬繖浠诲姟宸叉墽琛屼换鍔＄姸鎬亄}锛屼换鍔″惎鍔ㄦ儏鍐祘}锛岀粨鏉�", task.getTaskState(), task.getTaskRunning());
return Boolean.FALSE;
}
Date startDate = new Date();
log.info("寮�濮嬫墽琛屽畬鎴愪换鍔″悗娓呴櫎鍔ㄤ綔锛屼换鍔′俊鎭负锛歿},琛ㄥ悕涓猴細{},寮�濮嬫椂闂达細{}", task, tableName, startDate);
- task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
- task.setGlassIdOut("");
- task.setStartCell(0);
- task.setEndCell(0);
+// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+// task.setGlassIdOut("");
+// task.setStartCell(0);
+// task.setEndCell(0);
EdgStorageDeviceTaskHistory taskHistory = edgStorageDeviceTaskHistoryService.getOne(new LambdaQueryWrapper<EdgStorageDeviceTaskHistory>()
.eq(EdgStorageDeviceTaskHistory::getTaskState, Const.RAW_GLASS_TASK_NEW)
.eq(EdgStorageDeviceTaskHistory::getDeviceId, device)
@@ -496,13 +662,37 @@
);
}
//鏈�鍚庢洿鏂颁换鍔★紝淇濊瘉浠诲姟鍓嶇殑鍔ㄤ綔閮藉仛瀹�
- edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+
+// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+// task.setGlassIdOut("");
+// task.setStartCell(0);
+// task.setEndCell(0);
+// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+ if (device == 1) {
+ s7SerializerWLOne.write(
+ S7DataWL.builder()
+ .taskRunning(Const.GLASS_CACHE_TYPE_EMPTY.shortValue())
+ .glassIdOut("")
+ .startCell((short) 0)
+ .endCell((short) 0)
+ .build()
+ );
+ } else {
+ s7SerializerWLTwo.write(
+ S7DataWL.builder()
+ .taskRunning(Const.GLASS_CACHE_TYPE_EMPTY.shortValue())
+ .glassIdOut("")
+ .startCell((short) 0)
+ .endCell((short) 0)
+ .build()
+ );
+ }
Date endDate = new Date();
log.info("缁撴潫瀹屾垚浠诲姟鍚庢竻闄ゅ姩浣滐紝琛ㄥ悕涓猴細{},缁撴潫鏃堕棿涓猴細{}锛屽叡鑰楁椂锛歿}ms", tableName, endDate, endDate.getTime() - startDate.getTime());
return Boolean.TRUE;
}
- private boolean damageTask(EdgStorageDeviceTask task, String tableName, int device) {
+ private boolean damageTask(S7DataWL task, String tableName, int device) {
if (task.getTaskState() <= 5) {
log.info("浠诲姟鏈彂鐢熷紓甯告竻绌猴紝浠诲姟缁撴潫锛岀數姘旂姸鎬亄},mes鐘舵�亄}", task.getTaskState(), task.getTaskRunning());
return Boolean.FALSE;
@@ -538,11 +728,30 @@
);
}
//鏈�鍚庢洿鏂颁换鍔★紝淇濊瘉浠诲姟鍓嶇殑鍔ㄤ綔閮藉仛瀹�
- task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
- task.setGlassIdOut("");
- task.setStartCell(0);
- task.setEndCell(0);
- edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+// task.setTaskRunning(Const.GLASS_CACHE_TYPE_EMPTY);
+// task.setGlassIdOut("");
+// task.setStartCell(0);
+// task.setEndCell(0);
+// edgStorageDeviceTaskService.updateTaskMessage(tableName, task);
+ if (device == 1) {
+ s7SerializerWLOne.write(
+ S7DataWL.builder()
+ .taskRunning(Const.GLASS_CACHE_TYPE_EMPTY.shortValue())
+ .glassIdOut("")
+ .startCell((short) 0)
+ .endCell((short) 0)
+ .build()
+ );
+ } else {
+ s7SerializerWLTwo.write(
+ S7DataWL.builder()
+ .taskRunning(Const.GLASS_CACHE_TYPE_EMPTY.shortValue())
+ .glassIdOut("")
+ .startCell((short) 0)
+ .endCell((short) 0)
+ .build()
+ );
+ }
Date endDate = new Date();
log.info("瀹屾垚鎵ц寮傚父澶勭悊浠诲姟鍚庢竻闄ゅ姩浣滐紝琛ㄥ悕涓猴細{},缁撴潫鏃堕棿涓猴細{}锛屽叡鑰楁椂锛歿}ms", tableName, endDate, endDate.getTime() - startDate.getTime());
return Boolean.TRUE;
@@ -682,35 +891,16 @@
}
}
- public boolean saveHistoryTask(EdgStorageDeviceTask task, int deviceId) {
+ // public boolean saveHistoryTask(EdgStorageDeviceTask task, int deviceId) {
+ public boolean saveHistoryTask(S7DataWL task, int deviceId) {
EdgStorageDeviceTaskHistory taskHistory = new EdgStorageDeviceTaskHistory();
BeanUtils.copyProperties(task, taskHistory);
- taskHistory.setTaskType(task.getTaskRunning());
+// taskHistory.setTaskType(task.getTaskRunning());
+ taskHistory.setTaskType(Integer.parseInt(task.getTaskRunning().toString()));
taskHistory.setCreateTime(new Date());
taskHistory.setTaskState(Const.RAW_GLASS_TASK_NEW);
taskHistory.setDeviceId(deviceId);
edgStorageDeviceTaskHistoryService.save(taskHistory);
- return Boolean.TRUE;
- }
-
- public boolean updateCellRemainWidth(int slot, int device, EdgStorageDeviceTaskHistory taskHistory) {
- List<EdgStorageCageDetails> list = edgStorageCageDetailsService.list(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getSlot, slot)
- .eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
- int remainWidth = cellLength;
- if (CollectionUtil.isNotEmpty(list)) {
- if (2 == taskHistory.getTaskType()) {
- remainWidth = 0;
- } else {
- for (EdgStorageCageDetails item : list) {
- remainWidth = remainWidth - glassGap - (int) Math.max(item.getWidth(), item.getHeight());
- }
- if (remainWidth <= 0) {
- remainWidth = 0;
- }
- }
- }
- edgStorageCageService.update(new LambdaUpdateWrapper<EdgStorageCage>().
- set(EdgStorageCage::getRemainWidth, remainWidth).eq(EdgStorageCage::getSlot, slot).eq(EdgStorageCage::getDeviceId, device));
return Boolean.TRUE;
}
--
Gitblit v1.8.0