From bf2652a293a744a365c3c966cd1e1c621254f08e Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期四, 30 十二月 2021 15:17:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmwcs' into xgmwcs
---
/dev/null | 227 --------------------
src/main/java/com/zy/core/thread/CrnThread.java | 415 +++++++++++++++++++++++++++++++++++++
2 files changed, 415 insertions(+), 227 deletions(-)
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 73f69e0..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 11ca1b5..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="FrameworkDetectionExcludesConfiguration">
- <file type="web" url="file://$PROJECT_DIR$" />
- </component>
- <component name="JavaScriptSettings">
- <option name="languageLevel" value="ES6" />
- </component>
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index f9a71f2..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/zy-wcs.iml" filepath="$PROJECT_DIR$/.idea/zy-wcs.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/zy-wcs.iml b/.idea/zy-wcs.iml
deleted file mode 100644
index 66c2283..0000000
--- a/.idea/zy-wcs.iml
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots>
- <root url="file://$MODULE_DIR$/src/main/resources/lib" relative="WEB-INF/lib/" />
- <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
- </webroots>
- </configuration>
- </facet>
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
- <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16" level="project" />
- <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final" level="project" />
- <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.4.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.33.Final" level="project" />
- <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
- <orderEntry type="library" name="Maven: cn.cool:framework:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.47" level="project" />
- <orderEntry type="library" name="Maven: com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-support:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
- <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generate:2.3.2" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.3.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.58" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
- <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.10" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
- <orderEntry type="library" name="Maven: org.javassist:javassist:3.21.0-GA" level="project" />
- <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
- <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.xiaoymin:swagger-bootstrap-ui:1.8.9" level="project" />
- <orderEntry type="library" name="Maven: com.google.zxing:core:3.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.0.5" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
- <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
- <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
- <orderEntry type="library" name="Maven: com.github.dathlin:HslCommunication:2.0.0" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.10.0" level="project" />
- <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.14.0" level="project" />
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:5m3:0.5.0">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/bx05-0.5.0-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:5m3message:0.5.0">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/bx05.message-0.5.0-SNAPSHOT.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:5m3doc:0.5.0">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/bx05-0.5.0-SNAPSHOT-javadoc.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:rxtx:2.1.7">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/rxtx-2.1.7.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:simple-xml:2.7.1">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/simple-xml-2.7.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:stax:1.2.0">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/stax-1.2.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:stax-api:1.0.1">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/stax-api-1.0.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:uia-comm:0.5.1">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/uia-comm-0.5.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:uia-message:0.6.0">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/uia-message-0.6.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:uia-utils:0.2.0">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/uia-utils-0.2.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library name="Maven: com.wcs.led:xpp3:1.1.3.3">
- <CLASSES>
- <root url="jar://$MODULE_DIR$/src/main/resources/lib/xpp3-1.1.3.3.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- </component>
-</module>
\ No newline at end of file
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
new file mode 100644
index 0000000..868a52f
--- /dev/null
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -0,0 +1,415 @@
+package com.zy.core.thread;
+
+import HslCommunication.Core.Types.OperateResult;
+import HslCommunication.Core.Types.OperateResultExOne;
+import HslCommunication.Profinet.Melsec.MelsecMcNet;
+import com.alibaba.fastjson.JSON;
+import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.BasCrnOpt;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.service.BasCrnOptService;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.core.ThreadHandler;
+import com.zy.core.cache.MessageQueue;
+import com.zy.core.cache.OutputQueue;
+import com.zy.core.enums.CrnStatusType;
+import com.zy.core.enums.CrnTaskModeType;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.Task;
+import com.zy.core.model.command.CrnCommand;
+import com.zy.core.model.protocol.CrnProtocol;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+/**
+ * 鍫嗗灈鏈虹嚎绋�
+ * Created by vincent on 2020/8/4
+ */
+@Data
+@Slf4j
+public class CrnThread implements Runnable, ThreadHandler {
+
+ private MelsecMcNet melsecMcNet;
+ private CrnSlave slave;
+ private CrnProtocol crnProtocol;
+ private boolean resetFlag = false;
+
+ public CrnThread(CrnSlave slave) {
+ this.slave = slave;
+ }
+
+ @Override
+ @SuppressWarnings("InfiniteLoopStatement")
+ public void run() {
+ this.connect();
+ while (true) {
+ try {
+ int step = 1;
+ Task task = MessageQueue.poll(SlaveType.Crn, slave.getId());
+ if (task != null) {
+ step = task.getStep();
+ }
+ switch (step) {
+ // 璇绘暟鎹�
+ case 1:
+ readStatus();
+ break;
+ // 鍐欏叆鏁版嵁
+ case 2:
+ write((CrnCommand) task.getData());
+ break;
+ // 澶嶄綅
+ case 3:
+ CrnCommand command = (CrnCommand) task.getData();
+ if (null == command) {
+ command = new CrnCommand();
+ }
+ command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+ command.setSourcePosX((short)0); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short)0); // 婧愬簱浣嶅眰
+ command.setDestinationPosX((short)0); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
+ write(command);
+ break;
+ default:
+ break;
+ }
+ Thread.sleep(500);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+
+ @Override
+ public boolean connect() {
+ boolean result = false;
+ melsecMcNet = new MelsecMcNet(slave.getIp(), slave.getPort());
+ OperateResult connect = melsecMcNet.ConnectServer();
+ if(connect.IsSuccess){
+ result = true;
+ OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
+ melsecMcNet.ConnectClose();
+ return result;
+ }
+
+ /**
+ * 璇诲彇鐘舵��
+ */
+ private void readStatus(){
+ try {
+
+ /* 鏂规硶1 */
+ OperateResultExOne<byte[]> result = melsecMcNet.Read("D2231", (short) 70);
+ if (result.IsSuccess) {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
+ }
+ crnProtocol.setMode(melsecMcNet.getByteTransform().TransInt16(result.Content, 0));
+ crnProtocol.setTaskNo(melsecMcNet.getByteTransform().TransInt16(result.Content, 4));
+ crnProtocol.setStatus(melsecMcNet.getByteTransform().TransInt16(result.Content, 6));
+ crnProtocol.setBay(melsecMcNet.getByteTransform().TransInt16(result.Content, 8));
+ crnProtocol.setLevel(melsecMcNet.getByteTransform().TransInt16(result.Content, 10));
+ crnProtocol.setForkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 12));
+ crnProtocol.setLiftPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 14));
+ crnProtocol.setWalkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 16));
+// crnProtocol.setTaskFinish(melsecMcNet.getByteTransform().TransInt16(result.Content, 18));
+ crnProtocol.setLoaded(melsecMcNet.getByteTransform().TransInt16(result.Content, 20));
+ crnProtocol.setAlarm(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
+ crnProtocol.setError1(melsecMcNet.getByteTransform().TransBool(result.Content, 24, 2));
+ crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransBool(result.Content, 26, 2));
+ crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
+ crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 30));
+ crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
+ crnProtocol.setXSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 34));
+ crnProtocol.setYSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 38));
+ crnProtocol.setZSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 42));
+ crnProtocol.setXDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 46));
+ crnProtocol.setYDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 50));
+ crnProtocol.setXDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 54));
+ crnProtocol.setYDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 62));
+
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+ // 澶嶄綅淇″彿
+ if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+ log.error("-------------------------------------------绗竴姝ャ�乕鍫嗗灈鏈哄彿锛歿}][宸ヤ綔鍙凤細{}]==>> 鐘舵�佷负90锛岀瓑寰呯‘璁わ紒锛�",slave.getId(),crnProtocol.getTaskNo());
+ if (resetFlag) {
+ if (melsecMcNet.Write("D2218", (short) 1).IsSuccess) {
+ resetFlag = false;
+ }
+ }
+ }
+
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnErr(crnProtocol.getAlarm()==null?0:crnProtocol.getAlarm().longValue());
+ basCrnp.setCrnNo(slave.getId());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
+
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆憑1}鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�",DateUtils.convert(new Date()), slave.getId()));
+ throw new CoolException(MessageFormat.format( "鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
+ }
+ /* 鏂规硶2 */
+// crnProtocol.setMode(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setTaskNo(melsecMcNet.ReadInt16("D2233").Content);
+// crnProtocol.setStatus(melsecMcNet.ReadInt16("D2234").Content);
+// crnProtocol.setBay(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setLevel(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setForkPos(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setLiftPos(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setWalkPos(melsecMcNet.ReadInt16("D2231").Content);
+//// crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+// crnProtocol.setLoaded(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setAlarm(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setError1(melsecMcNet.ReadBool("D2231", (short) 2).Content);
+// crnProtocol.setTemp1(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setTemp2(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setTemp3(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setTemp4(melsecMcNet.ReadInt16("D2231").Content);
+// crnProtocol.setXSpeed(melsecMcNet.ReadFloat("D2231").Content);
+// crnProtocol.setYSpeed(melsecMcNet.ReadFloat("D2231").Content);
+// crnProtocol.setZSpeed(melsecMcNet.ReadFloat("D2231").Content);
+// crnProtocol.setXDistance(melsecMcNet.ReadFloat("D2231").Content);
+// crnProtocol.setYDistance(melsecMcNet.ReadFloat("D2231").Content);
+// crnProtocol.setXDuration(melsecMcNet.ReadFloat("D2231").Content);
+// crnProtocol.setYDuration(melsecMcNet.ReadFloat("D2231").Content);
+ } catch (Exception e) {
+ e.printStackTrace();
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
+
+ }
+
+ /**
+ * 鍐欏叆鏁版嵁
+ */
+ private void write(CrnCommand command){
+ if (null == command) {
+ log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
+ return;
+ }
+ command.setCrnNo(slave.getId());
+ /* 鏂规硶 1 */
+ do {
+ if (command.getDestinationPosZ() != null) {
+ if (!melsecMcNet.Write("D2202", command.getDestinationPosZ()).IsSuccess) { break; }
+ }
+ if (command.getDestinationPosY() != null) {
+ if (!melsecMcNet.Write("D2204", command.getDestinationPosY()).IsSuccess) { break; }
+ }
+ if (command.getDestinationPosX() != null) {
+ if (!melsecMcNet.Write("D2208", command.getDestinationPosX()).IsSuccess) { break; }
+ }
+ if (command.getSourcePosZ() != null) {
+ if (!melsecMcNet.Write("D2210", command.getSourcePosZ()).IsSuccess) { break; }
+ }
+ if (command.getSourcePosY() != null) {
+ if (!melsecMcNet.Write("D2212", command.getSourcePosY()).IsSuccess) { break; }
+ }
+ if (command.getDestinationPosX() != null) {
+ if (!melsecMcNet.Write("D2214", command.getSourcePosX()).IsSuccess) { break; }
+ }
+ if (command.getTaskMode() != null) {
+ if (!melsecMcNet.Write("D2216", command.getTaskMode()).IsSuccess) { break; }
+ }
+ if (command.getTaskNo() != null) {
+ if (!melsecMcNet.Write("D2217", command.getTaskNo()).IsSuccess) { break; }
+ }
+ if (command.getAckFinish() != null) {
+ if (!melsecMcNet.Write("D2218", command.getAckFinish()).IsSuccess) { break; }
+ }
+
+ try {
+ // 鏃ュ織璁板綍
+ BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
+ BasCrnOpt basCrnOpt = new BasCrnOpt(
+ command.getTaskNo().intValue(), // 浠诲姟鍙�
+ command.getCrnNo(), // 鍫嗗灈鏈篬闈炵┖]
+ new Date(), // 涓嬪彂鏃堕棿
+ command.getTaskModeType().toString(), // 妯″紡
+ command.getSourcePosX().intValue(), // 婧愭帓
+ command.getSourcePosY().intValue(), // 婧愬垪
+ command.getSourcePosZ().intValue(), // 婧愬眰
+ null, // 婧愮珯
+ command.getDestinationPosX().intValue(), // 鐩爣鎺�
+ command.getDestinationPosY().intValue(), // 鐩爣鍒�
+ command.getDestinationPosZ().intValue(), // 鐩爣灞�
+ null, // 鐩爣绔�
+ null, // 鍝嶅簲缁撴灉
+ null, // 淇敼鏃堕棿
+ null // 淇敼浜哄憳
+ );
+ bean.insert(basCrnOpt);
+ } catch (Exception ignore) {}
+
+ log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
+
+ return;
+ } while (false);
+
+
+ System.out.println(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+
+
+
+ /* 鏂规硶 2 */
+// melsecMcNet.Write("D2218", command.getAckFinish());
+// melsecMcNet.Write("D2217", command.getTaskNo());
+// melsecMcNet.Write("D2216", command.getTaskMode());
+// melsecMcNet.Write("D2214", command.getSourcePosX());
+// melsecMcNet.Write("D2212", command.getSourcePosY());
+// melsecMcNet.Write("D2210", command.getSourcePosZ());
+// melsecMcNet.Write("D2208", command.getDestinationPosX());
+// melsecMcNet.Write("D2204", command.getDestinationPosY());
+// melsecMcNet.Write("D2202", command.getDestinationPosZ());
+
+ }
+
+ @Override
+ public void close() {
+ melsecMcNet.ConnectClose();
+ }
+
+
+ /******************************************************************************************/
+ /**************************************** 娴嬭瘯涓撶敤 *****************************************/
+ /*****************************************************************************************/
+ public static void main(String[] args) throws InterruptedException {
+ CrnSlave slave = new CrnSlave();
+ slave.setId(1);
+ slave.setIp("192.168.3.39");
+ slave.setPort(5015);
+ slave.setRack(0);
+ slave.setSlot(0);
+ CrnThread crnThread = new CrnThread(slave);
+ crnThread.connect();
+ crnThread.readStatus();
+ System.out.println(JSON.toJSONString(crnThread.crnProtocol));
+
+ // 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+// command.setSourcePosX((short) 1); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short) 1); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short) 2); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 3); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
+
+ // 2.鍑哄簱 婧愬拰鐩爣閮藉彂
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
+// command.setSourcePosX((short) 2); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short) 4); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short) 3); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
+
+
+// // 3.搴撲綅绉昏浆 婧愬拰鐩爣閮藉彂 pass
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+// command.setSourcePosX((short)2); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short)2); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short)3); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short)4); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)4); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
+
+ // 4.绔欎綅绉昏浆 婧愬拰鐩爣閮藉彂
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
+// command.setSourcePosX((short)1); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short)0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short)1); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short)2); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short)1); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
+
+// // 5.鍥炲師鐐� 涓嶇敤鍙� pass
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+// command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+// command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+// command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
+// command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+// command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
+// command.setDestinationPosX((short) 0); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 0); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short) 0); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
+
+ // 7.鍧愭爣绉昏 鐩爣鍙� pass
+ CrnCommand command = new CrnCommand();
+ command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+ command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+ command.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
+ command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
+ command.setSourcePosX((short) 0); // 婧愬簱浣嶆帓
+ command.setSourcePosY((short) 0); // 婧愬簱浣嶅垪
+ command.setSourcePosZ((short) 0); // 婧愬簱浣嶅眰
+ command.setDestinationPosX((short) 1); // 鐩爣搴撲綅鎺�
+ command.setDestinationPosY((short) 3); // 鐩爣搴撲綅鍒�
+ command.setDestinationPosZ((short) 3); // 鐩爣搴撲綅灞�
+ crnThread.write(command);
+
+ // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
+// if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr
+// || crnThread.crnProtocol.getCrnError2().rightTakeNoneErr
+// || crnThread.crnProtocol.getCrnError2().leftPutLoadErr
+// || crnThread.crnProtocol.getCrnError2().rightPutLoadErr) {
+// CrnCommand command = new CrnCommand();
+// command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
+// command.setAckFinish((short) 1); // 浠诲姟瀹屾垚纭浣�
+// command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+// Thread.sleep(3000L);
+// crnThread.write(command);
+// }
+
+ }
+
+}
--
Gitblit v1.9.1