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/client/controller/ConsoleController.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 107 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java
index 720d7c6..bc6601a 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/client/controller/ConsoleController.java
@@ -1,17 +1,22 @@
package com.zy.client.controller;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
-import com.zy.client.domain.vo.CrnLatestDataVo;
-import com.zy.client.domain.vo.SiteLatestDataVo;
+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.*;
+import com.zy.common.CodeRes;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* 涓绘帶鍥炬帴鍙�
@@ -20,6 +25,93 @@
@RestController
@RequestMapping("/console")
public class ConsoleController {
+
+ public static AtomicInteger integer = new AtomicInteger();
+
+ @PostMapping("/system/running/status")
+ @ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
+ public R systemRunningStatus(){
+ return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
+ }
+
+ @PostMapping("/system/switch")
+ @ManagerAuth(memo = "绯荤粺杩愯寮�鍏虫搷浣�")
+ public R systemSwitch(SystemSwitchParam param) throws InterruptedException {
+ if (Cools.isEmpty(param.getOperatorType())){
+ return R.error();
+ }
+ if (param.getOperatorType() == 0) {
+ if (Cools.isEmpty(param.getPassword())){
+ return R.error("璇疯緭鍏ュ彛浠�");
+ }
+ if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){
+ return R.error("鍙ｄ护閿欒");
+ }
+ }
+ Thread.sleep(2000L);
+ 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")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
+ public R siteDetail(@RequestParam String siteId){
+ if (Cools.isEmpty(siteId)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ SiteDetailVo vo = new SiteDetailVo();
+ vo.setDevpNo(siteId);
+ vo.setWorkNo("9998");
+ vo.setWorkStatus("2.璁惧涓婄Щ鍔�");
+ vo.setAutoing("Y");
+ vo.setLoading("Y");
+ vo.setCanining("N");
+ vo.setCanouting("Y");
+ vo.setIoType("1.鍏ュ簱");
+ vo.setSourceStaNo("2303");
+ vo.setStaNo("2410");
+ vo.setSourceStock("");
+ vo.setStock("");
+ return R.ok().add(vo);
+ }
+
+ @PostMapping("/crn/detail")
+ @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
+ public R crnDetail(@RequestParam String crnNo){
+ if (Cools.isEmpty(crnNo)){
+ return R.parse(CodeRes.EMPTY);
+ }
+ CrnDetailVo vo = new CrnDetailVo();
+ vo.setCrnNo(crnNo);
+ vo.setWorkNo("3387");
+ vo.setSourceStaNo("2303");
+ vo.setStaNo("2410");
+ vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
+ vo.setIoType("1.鍏ュ簱");
+ vo.setSourceStock("");
+ vo.setStock("05050040");
+ vo.setCrnStatus("鍙栬揣涓�");
+ vo.setError("0");
+ return R.ok().add(vo);
+ }
+
+ @Deprecated
+ @PostMapping("/site/update")
+ @ManagerAuth(memo = "杈撻�佽澶囨暟鎹慨鏀�")
+ public R updateSite(){
+ return R.ok();
+ }
+
+ @Deprecated
+ @PostMapping("/crn/update")
+ @ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹慨鏀�")
+ public R updateCrn(){
+ return R.ok();
+ }
+
+ /****************************************************************/
+ /************************** 瀹炴椂鏁版嵁 ******************************/
+ /****************************************************************/
@PostMapping("/latest/data/site")
@ManagerAuth(memo = "绔欑偣瀹炴椂鏁版嵁")
@@ -52,8 +144,19 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
-
- return R.ok();
+ integer.getAndIncrement();
+ List<BarcodeDataVo> list = new ArrayList<>();
+ for (int i=1;i<=1;i++){
+ BarcodeDataVo vo = new BarcodeDataVo();
+ vo.setBarcodeId("1");
+ if (integer.get()%5 != 0) {
+ vo.setCodeValue("0");
+ } else {
+ vo.setCodeValue(String.valueOf(new Random().nextInt(5000)));
+ }
+ list.add(vo);
+ }
+ return R.ok().add(list);
}
}
--
Gitblit v1.9.1