From 55868ae6d0fab571f62354a6fe50cbc5e64c5b7a Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期一, 21 十月 2024 13:27:06 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/task/escalationParam/RgvTaskReportingParam.java |    6 ++
 src/main/java/com/zy/core/thread/RgvThread.java                           |   60 +++++++++++++++++++++++++++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java               |    1 
 src/main/java/com/zy/asrs/task/handler/RgvTaskReportingHandler.java       |    4 +-
 src/main/resources/application.yml                                        |    4 +-
 5 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 6867935..16d8fa9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -157,6 +157,7 @@
                         && rgvProtocol.getAlarm() == 0){
                     RgvCommand rgvCommand = new RgvCommand();
                     rgvCommand.setRgvNo(rgvProtocol.getRgvNo());
+                    rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue());
                     rgvCommand.setAckFinish1((short) 0);  // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
                     rgvCommand.setTaskNo1(wrkMast.getWrkNo().shortValue());
                     rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡:  鍙栨斁璐�
diff --git a/src/main/java/com/zy/asrs/task/escalationParam/RgvTaskReportingParam.java b/src/main/java/com/zy/asrs/task/escalationParam/RgvTaskReportingParam.java
index 966e130..b65dad7 100644
--- a/src/main/java/com/zy/asrs/task/escalationParam/RgvTaskReportingParam.java
+++ b/src/main/java/com/zy/asrs/task/escalationParam/RgvTaskReportingParam.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.task.escalationParam;
 
+import com.core.common.Cools;
 import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.utils.TimeCalculatorUtils;
 import lombok.Data;
@@ -34,6 +35,9 @@
         this.endSta = wrkMast.getStaNo().toString();
         this.during = TimeCalculatorUtils.differenceInMilliseconds(wrkMast.getModiTime(),wrkMast.getAppeTime());
         this.status = wrkMast.getWrkSts().intValue();
-        this.error.add(wrkMast.getErrorMemo());
+        if (!Cools.isEmpty(wrkMast.getErrorMemo())){
+            this.error.add(wrkMast.getErrorMemo());
+        }
+
     }
 }
diff --git a/src/main/java/com/zy/asrs/task/handler/RgvTaskReportingHandler.java b/src/main/java/com/zy/asrs/task/handler/RgvTaskReportingHandler.java
index 597bfa5..c351c45 100644
--- a/src/main/java/com/zy/asrs/task/handler/RgvTaskReportingHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/RgvTaskReportingHandler.java
@@ -32,9 +32,9 @@
     private ApiLogService apiLogService;
 
 //    @Value("${srHangJia.url}")
-    private String erpUrl = "192.168.18.229:16126";
+    private String erpUrl = "172.17.196.199:8084";
 //    @Value("${srHangJia.reportOutPath}")
-    private String reportOutPath = "open/rcs/task/cs/up/default/v1";
+    private String reportOutPath = "open/rcs/task/cs/up/UploadTask";
 
     public ReturnT<String> start(WrkMast wrkMast) {
         try {
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index c4edc97..f384975 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -85,7 +85,7 @@
                         command.setTaskMode1(RgvTaskModeType.NONE); // 浠诲姟妯″紡
                         command.setSourceStaNo1((short)0);     // 婧愮珯
                         command.setDestinationStaNo1((short)0);     // 鐩爣绔�
-                        write(command);
+                        write3(command);
                         break;
                     default:
                         break;
@@ -251,6 +251,64 @@
             return false;
         }
     }
+    private boolean write3(RgvCommand command) throws InterruptedException {
+        if (null == command) {
+            log.error("RGV鍐欏叆鍛戒护涓虹┖");
+            return false;
+        }
+
+        siemensNet.Write("DB24.10.0", false);
+        siemensNet.Write("DB24.10.1", false);
+
+        command.setRgvNo(slave.getId());
+        short[] array = new short[5];
+        array[0] = command.getRgvNo().shortValue();
+        array[1] = command.getSourceStaNo1();
+        array[2] = command.getDestinationStaNo1();
+        array[3] = command.getTaskMode1();//浠诲姟妯″紡
+        array[4] = command.getTaskNo1();
+
+//        OperateResult result = siemensNet.Write("DB24.0", array);
+        OperateResult result = null;
+        if (command.getAckFinish1().equals((short)0)) {
+            Thread.sleep(100L);
+            result = siemensNet.Write("DB24.10.0", true);
+        } else {
+            siemensNet.Write("DB24.10.1", true);
+        }
+
+        try {
+            // 鏃ュ織璁板綍
+            BasRgvOptService bean = SpringUtils.getBean(BasRgvOptService.class);
+            BasRgvOpt basRgvOpt = new BasRgvOpt(
+                    command.getTaskNo1().intValue(),
+                    command.getTaskNo2().intValue(),
+                    command.getRgvNo(),
+                    new Date(),
+                    command.getTaskModeType1().toString(),
+                    command.getSourceStaNo1().intValue(),
+                    command.getDestinationStaNo1().intValue(),
+                    command.getSourceStaNo2().intValue(),
+                    command.getDestinationStaNo2().intValue(),
+                    null,
+                    new Date(),
+                    null
+            );
+            bean.insert(basRgvOpt);
+        } catch (Exception ignore) {}
+
+        if (result != null && result.IsSuccess) {
+            Thread.sleep(200);
+            this.readStatus();
+            log.info("RGV 宸ヤ綅1鍛戒护涓嬪彂[id:{}] >>>>> {}", slave.getId(), JSON.toJSONString(command));
+            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 宸ヤ綅1鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSONString(command)));
+            return true;
+        } else {
+            OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆戝啓鍏GV plc宸ヤ綅1鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
+            log.error("鍐欏叆RGV plc宸ヤ綅1鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+            return false;
+        }
+    }
 
     @Override
     public void close() {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a99ba33..69d3de6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://127.0.0.1:50751;databasename=gdhmasrs
-    url: jdbc:sqlserver://127.0.0.1:50948;databasename=gdhmasrs
+    url: jdbc:sqlserver://127.0.0.1:50751;databasename=gdhmasrs
+#    url: jdbc:sqlserver://127.0.0.1:50948;databasename=gdhmasrs
     username: sa
     password: sa@123
   mvc:

--
Gitblit v1.9.1