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 |   73 ++++++++++++++++++++++++++++++------
 1 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/client/controller/ConsoleController.java b/src/main/java/com/zy/client/controller/ConsoleController.java
index 7cce864..bc6601a 100644
--- a/src/main/java/com/zy/client/controller/ConsoleController.java
+++ b/src/main/java/com/zy/client/controller/ConsoleController.java
@@ -3,18 +3,20 @@
 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.CrnLatestDataVo;
-import com.zy.client.domain.vo.SiteLatestDataVo;
+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;
 
 /**
  * 涓绘帶鍥炬帴鍙�
@@ -24,10 +26,12 @@
 @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", WcsSystemPropety.WCS_RUNNING_STATUS.get()));
+        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
     }
 
     @PostMapping("/system/switch")
@@ -40,33 +44,65 @@
             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")
     @ManagerAuth(memo = "杈撻�佽澶囨暟鎹鎯�")
-    public R siteDetail(){
-        return R.ok();
+    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(){
-        return R.ok();
+    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(){
@@ -108,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