From 2aaf47ead1a69ccbaf6a0167ae161aafd3622114 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 27 十一月 2025 08:14:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index 4f87fdd..d805c8b 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -1,7 +1,5 @@
package com.zy.core.thread.impl;
-import HslCommunication.Profinet.Siemens.SiemensPLCS;
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.DateUtils;
@@ -10,13 +8,13 @@
import com.zy.asrs.entity.DeviceConfig;
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.DeviceDataLogService;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.RedisKeyType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CommandResponse;
import com.zy.core.model.Task;
@@ -34,7 +32,6 @@
/**
* 鍫嗗灈鏈虹嚎绋�
- * Created by vincent on 2020/8/4
*/
@Data
@Slf4j
@@ -110,8 +107,7 @@
@Override
public boolean connect() {
- SiemensS7Net siemensS7Net = new SiemensS7Net(SiemensPLCS.S1200, deviceConfig.getIp());
- zyCrnConnectDriver = new ZyCrnConnectDriver(siemensS7Net, deviceConfig);
+ zyCrnConnectDriver = new ZyCrnConnectDriver(deviceConfig);
new Thread(zyCrnConnectDriver).start();
DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), zyCrnConnectDriver);
return true;
@@ -174,18 +170,16 @@
crnProtocol.setLastCommandTime(System.currentTimeMillis());
}
- if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 1000 * 1) {
- //閲囬泦鏃堕棿瓒呰繃1s锛屼繚瀛樹竴娆℃暟鎹褰�
+ if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 200) {
//淇濆瓨鏁版嵁璁板綍
- DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
DeviceDataLog deviceDataLog = new DeviceDataLog();
deviceDataLog.setOriginData(JSON.toJSONString(crnStatus));
deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
deviceDataLog.setType(String.valueOf(SlaveType.Crn));
deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
deviceDataLog.setCreateTime(new Date());
- deviceDataLogService.insert(deviceDataLog);
+ redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
//鏇存柊閲囬泦鏃堕棿
crnProtocol.setDeviceDataLog(System.currentTimeMillis());
}
@@ -197,6 +191,8 @@
basCrnp = new BasCrnp();
basCrnp.setCrnNo(deviceConfig.getDeviceNo());
basCrnp.setStatus(1);
+ basCrnp.setInEnable("N");
+ basCrnp.setOutEnable("N");
basCrnp.setCreateTime(new Date());
basCrnpService.insert(basCrnp);
}
--
Gitblit v1.9.1