From d766cbaa2d4e92db03bd213093fb817ce3400ba3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 06 八月 2020 09:34:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 61 ++++++++++++++++++++++++++++++
src/main/java/com/zy/core/properties/SystemProperties.java | 4 +-
src/main/java/com/zy/client/controller/ConsoleController.java | 10 ++--
src/main/java/com/zy/core/ServerBootstrap.java | 4 ++
4 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java
index 773b36d..bc6601a 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/client/controller/ConsoleController.java
@@ -3,7 +3,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.client.constant.WcsSystemPropety;
+import com.zy.core.properties.SystemProperties;
import com.zy.client.domain.enums.SiteStatusType;
import com.zy.client.domain.param.SystemSwitchParam;
import com.zy.client.domain.vo.*;
@@ -31,7 +31,7 @@
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
public R systemRunningStatus(){
- return R.ok().add(Cools.add("status", WcsSystemPropety.WCS_RUNNING_STATUS.get()));
+ return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@PostMapping("/system/switch")
@@ -44,13 +44,13 @@
if (Cools.isEmpty(param.getPassword())){
return R.error("璇疯緭鍏ュ彛浠�");
}
- if (!param.getPassword().equals(WcsSystemPropety.WCS_PASSWORD)){
+ if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){
return R.error("鍙ｄ护閿欒");
}
}
Thread.sleep(2000L);
- WcsSystemPropety.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
- return R.ok().add(Cools.add("status", WcsSystemPropety.WCS_RUNNING_STATUS.get()));
+ SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
+ return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@PostMapping("/site/detail")
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
new file mode 100644
index 0000000..3dbda62
--- /dev/null
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -0,0 +1,61 @@
+package com.zy.core;
+
+import com.zy.core.properties.SystemProperties;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PreDestroy;
+
+/**
+ * WCS涓绘祦绋�
+ * Created by vincent on 2020/8/6
+ */
+@Data
+@Slf4j
+@Component
+public class MainProcess {
+
+ // 鎵�灞炵嚎绋�
+ private Thread thread;
+
+ /**
+ * =====>> 寮�濮嬪伐浣�
+ */
+ public void start(){
+ thread = new Thread(() -> {
+ while (!Thread.currentThread().isInterrupted()) {
+ try {
+ // 绯荤粺杩愯鐘舵�佸垽鏂�
+ if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+ continue;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+ // 闂撮殧
+ Thread.sleep(1500);
+ log.info("WCS 宸ヤ綔涓� .....................");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ thread.start();
+ }
+
+ @PreDestroy
+ public void shutDown(){
+ if (thread != null) thread.interrupt();
+ }
+
+}
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 084a51b..5b33f28 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -23,6 +23,8 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private MainProcess mainProcess;
@PostConstruct
@@ -31,6 +33,8 @@
initMq();
// 鍒濆鍖栦笅浣嶆満绾跨▼
initThread();
+ // 寮�濮嬩富娴佺▼杩涚▼
+ mainProcess.start();
}
private void initMq(){
diff --git a/src/main/java/com/zy/client/constant/WcsSystemPropety.java b/src/main/java/com/zy/core/properties/SystemProperties.java
similarity index 80%
rename from src/main/java/com/zy/client/constant/WcsSystemPropety.java
rename to src/main/java/com/zy/core/properties/SystemProperties.java
index 36e5f69..e7a8f1b 100644
--- a/src/main/java/com/zy/client/constant/WcsSystemPropety.java
+++ b/src/main/java/com/zy/core/properties/SystemProperties.java
@@ -1,11 +1,11 @@
-package com.zy.client.constant;
+package com.zy.core.properties;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* Created by vincent on 2020-06-03
*/
-public class WcsSystemPropety {
+public class SystemProperties {
public static final String WCS_PASSWORD = "root";
--
Gitblit v1.9.1