From f0cbc07048011f4c47aa7e26119af1b975d3b536 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期六, 03 十二月 2022 12:45:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/LedThread.java | 6 +-
src/main/webapp/views/console.html | 2
src/main/webapp/views/rgv.html | 113 ++++++++++++++++++-------------------
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/resources/application.yml | 8 +-
src/main/java/com/zy/asrs/entity/BasRgvErr.java | 18 ------
src/main/java/com/zy/core/ServerBootstrap.java | 6 +-
8 files changed, 69 insertions(+), 88 deletions(-)
diff --git a/pom.xml b/pom.xml
index d3ade80..aff72e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>stwcs</finalName>
+ <finalName>hswcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvErr.java b/src/main/java/com/zy/asrs/entity/BasRgvErr.java
index d9558ea..07d2282 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvErr.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvErr.java
@@ -91,29 +91,11 @@
// null // 娣诲姞鏃堕棿
// );
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
}
public String getAppeTime$(){
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index b3e60b4..dfca756 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -89,9 +89,9 @@
// 鍒濆鍖栫┛姊溅绾跨▼
log.info("鍒濆鍖朢GV绾跨▼...................................................");
for (RgvSlave rgv : slaveProperties.getRgv()) {
-// RgvThread rgvThread = new RgvThread(rgv);
-// new Thread((Runnable) rgvThread).start();
-// SlaveConnection.put(SlaveType.Rgv, rgv.getId(), crnThread);
+ RgvThread rgvThread = new RgvThread(rgv);
+ new Thread((Runnable) rgvThread).start();
+ SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
}
// 鍒濆鍖栬緭閫佺嚎绾跨▼
log.info("鍒濆鍖栬緭閫佺嚎绾跨▼...................................................");
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index b263a9e..46dc9d6 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -52,8 +52,8 @@
public LedThread(Slave slave) {
this.slave = slave;
try {
- Bx5GEnv.initial(3000);
- screen = new Bx5GScreenClient("my");
+// Bx5GEnv.initial(3000);
+// screen = new Bx5GScreenClient("my");
} catch (Exception e) {
e.printStackTrace();
log.info("led杩炴帴鏋勯�犲櫒閿欒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
@@ -258,7 +258,7 @@
@Override
public void close() {
- screen.disconnect();
+// screen.disconnect();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 06a977f..8a64d97 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,10 +21,10 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
- global-config:
- field-strategy: 0
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# global-config:
+# field-strategy: 0
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/@pom.build.finalName@/logs
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 86a6776..6423c75 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/stwcs";
+var baseUrl = "/hswcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 1e78cad..7b3b178 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -515,8 +515,8 @@
} else if (res.code === 403) {
parent.location.href = baseUrl + "/login";
} else {
+ alert(res.msg);
console.log(res.msg);
-
}
}
});
diff --git a/src/main/webapp/views/rgv.html b/src/main/webapp/views/rgv.html
index f5e66e6..55039cf 100644
--- a/src/main/webapp/views/rgv.html
+++ b/src/main/webapp/views/rgv.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <title>鍫嗗灈鏈虹洃鎺х鐞�</title>
+ <title>RGV鐩戞帶绠＄悊</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -52,52 +52,54 @@
<!-- 鎵ц鍛戒护 -->
<div class="command-log">
- <h3>鎵ц涓殑鍛戒护</h3>
- <div class="crn-command-item">
- <label>1#</label>
- <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn1" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>2#</label>
- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn2" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>3#</label>
- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn3" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>4#</label>
- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn4" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>5#</label>
- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
- <!-- <span> </span>-->
- <input id="crn5" disabled="disabled">
- </div>
+<!-- <h3>鎵ц涓殑鍛戒护</h3>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>1#</label>-->
+<!-- <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn1" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>2#</label>-->
+<!-- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn2" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>3#</label>-->
+<!-- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn3" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>4#</label>-->
+<!-- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn4" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>5#</label>-->
+<!-- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn5" disabled="disabled">-->
+<!-- </div>-->
</div>
- <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
+ <!-- RGV鐘舵�佷綅淇℃伅 -->
<div class="crn-state">
- <table id="crn-state-table">
+ <table id="rgv-state-table">
<thead>
<tr>
- <th>鍫嗗灈鏈�</th>
+ <th>RGV</th>
<th>妯″紡</th>
<th>鐘舵��</th>
- <th>鏈夌墿</th>
- <th>鍒�</th>
- <th>灞�</th>
- <th>璐у弶瀹氫綅</th>
- <th>杞借揣鍙板畾浣�</th>
- <th>璧拌鍦ㄥ畾浣�</th>
+ <th>浠诲姟鍙�1</th>
+ <th>鐘舵��1</th>
+ <th>鏈夌墿1</th>
+ <th>RGV浣嶇疆</th>
+ <th>璧拌瀹氫綅</th>
+ <th>浠诲姟鍙�2</th>
+ <th>鐘舵��2</th>
+ <th>鏈夌墿2</th>
<th>鏁呴殰浠ｇ爜</th>
<th>鏁呴殰鎻忚堪</th>
</tr>
@@ -107,12 +109,12 @@
</table>
</div>
</div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
+ <!-- RGV鐘舵�� -->
<div class="crn-msg">
- <table id="crn-msg-table">
+ <table id="rgv-msg-table">
<thead>
<tr>
- <th>鍫嗗灈鏈�</th>
+ <th>RGV</th>
<th>宸ヤ綔鍙�</th>
<th>鐘舵��</th>
<th>婧愮珯</th>
@@ -146,13 +148,10 @@
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
<div id="crn-select" class="operator-item" style="width: 55%">
- <span class="select-title">鍫嗗灈鏈哄彿</span>
+ <span class="select-title">RGV鍙�</span>
<div class="select-container" style="padding: 20px 0;">
- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="1" checked> 1鍙稲GV</label>
+ <label><input type="radio" name="crnSelect" value="2"> 2鍙稲GV</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -209,7 +208,7 @@
<button class="item" onclick="put()">鍏ュ簱</button>
<button class="item" onclick="take()">鍑哄簱</button>
<button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
- <button class="item" onclick="siteMove()">绔欏埌绔�</button>
+<!-- <button class="item" onclick="siteMove()">绔欏埌绔�</button>-->
<!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
@@ -295,7 +294,7 @@
// 鍫嗗灈鏈轰俊鎭〃鑾峰彇 ---- 琛ㄤ竴
function getCrnStateInfo() {
- var tableEl = $('#crn-state-table');
+ var tableEl = $('#rgv-state-table');
$.ajax({
url: baseUrl+ "/crn/table/crn/state",
headers: {'token': localStorage.getItem('token')},
@@ -332,7 +331,7 @@
// 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ---- 琛ㄤ簩
function getCrnMsgInfo() {
- var tableEl = $('#crn-msg-table');
+ var tableEl = $('#rgv-msg-table');
$.ajax({
url: baseUrl+ "/crn/table/crn/msg",
headers: {'token': localStorage.getItem('token')},
@@ -504,7 +503,7 @@
function initCrnStateTable(row) {
var line;
if (row === undefined){
- var one = $('#crn-state-table thead').height();
+ var one = $('#rgv-state-table thead').height();
var total = $('.crn-state').height();
var count = total / one;
count = parseInt(count) - 1;
@@ -529,14 +528,14 @@
" <td></td>\n" +
" </tr>\n";
}
- $('#crn-state-table tbody').after(html);
+ $('#rgv-state-table tbody').after(html);
}
// 鍫嗗灈鏈烘暟鎹〃鑾峰彇 ----- 琛ㄤ簩
function initCrnMsgTable(row) {
var line;
if (row === undefined){
- var one = $('#crn-msg-table thead').height();
+ var one = $('#rgv-msg-table thead').height();
var total = $('.crn-msg').height();
var count = total / one;
count = parseInt(count) - 1;
@@ -564,7 +563,7 @@
" <td></td>\n" +
" </tr>\n";
}
- $('#crn-msg-table tbody').after(html);
+ $('#rgv-msg-table tbody').after(html);
}
// 鏃ュ織杈撳嚭妗�
--
Gitblit v1.9.1