From bc48a855d98e360042a7e2fff5594a91a82578c6 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期四, 24 七月 2025 16:16:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6a5eb26..40b4242 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ReportQueryMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.DeviceErrorService;
import com.zy.asrs.service.WrkMastService;
@@ -37,6 +38,8 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -67,6 +70,10 @@
private ReportQueryMapper reportQueryMapper;
@Autowired
private DeviceErrorService deviceErrorService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private ConfigService configService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -91,6 +98,48 @@
Thread.sleep(200L);
SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
+ }
+
+ @GetMapping("/switchDemo")
+ public R switchDemo() {
+ //鍒囨崲婕旂ず妯″紡
+ Config demoEnableConfig = configService.selectByCode("demoEnable");
+ if(demoEnableConfig == null){
+ return R.error("婕旂ず妯″紡鍙傛暟涓嶅瓨鍦�");
+ }
+
+ HashMap<String, Object> map = new HashMap<>();
+ if (demoEnableConfig.getValue().equals("true")) {
+ //寮�鍚姸鎬侊紝鍙樻洿鍏抽棴
+ demoEnableConfig.setValue("false");
+ configService.updateById(demoEnableConfig);
+
+ map.put("status", false);
+ }else {
+ //鍏抽棴鐘舵�侊紝鍙樻洿寮�鍚�
+ demoEnableConfig.setValue("true");
+ configService.updateById(demoEnableConfig);
+
+ map.put("status", true);
+ }
+ return R.ok().add(map);
+ }
+
+ @GetMapping("/getDemoStatus")
+ public R getDemoStatus() {
+ //鍒囨崲婕旂ず妯″紡
+ Config demoEnableConfig = configService.selectByCode("demoEnable");
+ if(demoEnableConfig == null){
+ return R.error("婕旂ず妯″紡鍙傛暟涓嶅瓨鍦�");
+ }
+
+ HashMap<String, Object> map = new HashMap<>();
+ boolean status = false;
+ if(demoEnableConfig.getValue().equals("true")){
+ status = true;
+ }
+ map.put("status", status);
+ return R.ok().add(map);
}
/****************************************************************/
@@ -310,6 +359,11 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
+ BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+ if (basCrnp == null) {
+ return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
+ }
+
SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
@@ -334,6 +388,8 @@
vo.setError(""); // todo
}
}
+ vo.setInEnable(basCrnp.getInEnable());//鍙叆
+ vo.setOutEnable(basCrnp.getOutEnable());//鍙嚭
return R.ok().add(vo);
}
}
--
Gitblit v1.9.1