From 6299fb7b7732947e9f997c92599b1772b8884962 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期日, 14 十二月 2025 19:37:02 +0800
Subject: [PATCH] #26-03-10-00
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 208b218..9eb20b9 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -12,13 +12,11 @@
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
-import com.zy.asrs.entity.BasCrnError;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.BasRgv;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvMapService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
@@ -39,6 +37,7 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
import com.zy.core.thread.*;
+import com.zy.system.entity.license.LicenseVerify;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -66,6 +65,8 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private BasRgvService basRgvService;
+ @Autowired
+ private BasRgvMapService basRgvMapService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -88,7 +89,23 @@
}
}
Thread.sleep(200L);
- SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
+
+ //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
+ try{
+ boolean systemSign = SystemProperties.WCS_RUNNING_STATUS.get();
+ if (!systemSign){
+ if (new LicenseVerify().verify()){
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.TRUE);
+// SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
+ return R.ok();
+ }
+ return R.error("璁稿彲璇侀獙璇佸け璐ワ紒").add("璁稿彲璇侀獙璇佸け璐ワ紒");
+ }
+ } catch (Exception e){
+ log.error("璁稿彲璇侀獙璇佸け璐ワ紒锛佸紓甯革細{}",e.getMessage());
+ return R.error();
+ }
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@@ -113,8 +130,31 @@
StaProtocol staProtocol = entry.getValue();
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
for (BasRgv basRgv: basRgvs){
- if (basRgv.getRgvNo().equals(entry.getKey()) ){
- staProtocol.setWorkNo(basRgv.getWrkNo1());
+ BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo(basRgv.getRgvNo());
+ if(basRgv.getRgvNo() == 1 ){
+ if(entry.getKey() == 1){
+ staProtocol.setWorkNo(basRgv.getWrkNo1());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }else if(entry.getKey() == 2){
+ staProtocol.setWorkNo(basRgv.getWrkNo2());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }
+ }else if(basRgv.getRgvNo() == 2){
+ if(entry.getKey() == 3){
+ staProtocol.setWorkNo(basRgv.getWrkNo1());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }else if(entry.getKey() == 4){
+ staProtocol.setWorkNo(basRgv.getWrkNo2());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }
}
}
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
@@ -203,7 +243,14 @@
return R.ok().add(list);
}
- /****************************************************************/
+// @PostMapping("/latest/data/rgv")
+// @ManagerAuth(memo = "RGV瀹炴椂鏁版嵁")
+// public R rgvLatestData(){
+// return R.ok().add(list);
+// }
+
+
+ /****************************************************************/
/************************** 璇︽儏鎿嶄綔 ******************************/
/****************************************************************/
--
Gitblit v1.9.1