From ee81afd33e786beb38c9074113ccafa997c8c1d0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:20 +0800
Subject: [PATCH] #指令日志更新
---
src/main/java/com/zy/asrs/entity/CommandInfoLog.java | 25 +++++++++++++++++++++++++
src/main/resources/application-prod.yml | 4 ++--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 19 +++++++++++++++++--
src/main/resources/application.yml | 2 +-
4 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
index 142f7da..7576aef 100644
--- a/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
+++ b/src/main/java/com/zy/asrs/entity/CommandInfoLog.java
@@ -187,5 +187,30 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.completeTime);
}
+ /**
+ * 鑾峰彇鎸佺画鏃堕棿
+ */
+ public String getDurationTime() {
+ if (Cools.isEmpty(this.startTime)) {
+ return "";
+ }
+
+ Date endDate = new Date();
+ if (!Cools.isEmpty(this.completeTime)) {
+ endDate = this.completeTime;
+ }
+
+ //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+ long l = this.startTime.getTime() - endDate.getTime();
+
+ //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+ long day = l / (24 * 60 * 60 * 1000);
+ long hour = (l / (60 * 60 * 1000) - day * 24);
+ long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+ long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+ return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 32873e4..82f75cd 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -9,6 +9,7 @@
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.CommandInfoLog;
@@ -319,8 +320,22 @@
CommandInfoLogService commandInfoLogService = SpringUtils.getBean(CommandInfoLogService.class);
CommandInfoService commandInfoService = SpringUtils.getBean(CommandInfoService.class);
CommandInfo commandInfo = commandInfoService.selectById(staProtocol.getCommandId());
- CommandInfoLog commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
- commandInfoLog.setId(null);
+ CommandInfoLog commandInfoLog = new CommandInfoLog();
+ if (commandInfo != null) {
+ commandInfoLog = JSON.parseObject(JSON.toJSONString(commandInfo), CommandInfoLog.class);
+ commandInfoLog.setId(null);
+ }else {
+ Date now = new Date();
+ commandInfoLog.setCommand(JSON.toJSONString(staProtocol));
+ commandInfoLog.setCommandStatus(3);
+ commandInfoLog.setStartTime(now);
+ commandInfoLog.setExecuteTime(now);
+ commandInfoLog.setCompleteTime(now);
+ commandInfoLog.setDevice(SlaveType.Devp.toString());
+ commandInfoLog.setWrkNo(9999);
+ commandInfoLog.setTaskNo("9999");
+ commandInfoLog.setCommandDesc("鎵嬪姩鍛戒护");
+ }
OperateResult writeResult;
//浠诲姟涓嬪彂娆℃暟
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 55000c9..5532b4e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -196,7 +196,7 @@
devpPlcId: ${wcs-slave.devp[0].id}
devp[0]: #杈撻�佺嚎
id: 1
- ip: 192.168.4.250
+ ip: 172.17.91.36
rack: 0
port: 102
slot: 0
@@ -252,7 +252,7 @@
staNo: 122
devp[1]: #杈撻�佺嚎
id: 2
- ip: 10.10.10.30
+ ip: 172.17.91.45
rack: 0
port: 102
slot: 0
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b5d9f90..d3476ca 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=ghtzasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=ghtzasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1