From c808221f6a427014d8c112d172f5a1e58abab197 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 26 五月 2025 18:37:12 +0800
Subject: [PATCH] 环境文件备份，数据库备份
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 113 ++++++--------------------------------------------------
1 files changed, 13 insertions(+), 100 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 6d22e0a..f4e6b38 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -7,33 +7,26 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.domain.enums.CrnStatusType;
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.WrkMast;
-import com.zy.asrs.mapper.BasCrnErrorMapper;
-import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
-import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.Slave;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.RgvSlave;
-import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.StaProtocol;
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.*;
@@ -55,19 +48,15 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
- @Autowired
- private LocMastMapper locMastMapper;
- @Autowired
- private BasCrnErrorMapper basCrnErrorMapper;
@PostMapping("/system/running/status")
- @ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
+// @ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
public R systemRunningStatus(){
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@PostMapping("/system/switch")
- @ManagerAuth(memo = "绯荤粺杩愯寮�鍏虫搷浣�")
+// @ManagerAuth(memo = "绯荤粺杩愯寮�鍏虫搷浣�")
public R systemSwitch(SystemSwitchParam param) throws InterruptedException {
if (Cools.isEmpty(param.getOperatorType())){
return R.error();
@@ -81,7 +70,16 @@
}
}
Thread.sleep(200L);
- SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
+ //楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
+ try{
+ if (new LicenseVerify().verify()){
+ SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
+ return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
+ }
+ } catch (Exception e){
+ log.error("璁稿彲璇侀獙璇佸け璐ワ紒锛佸紓甯革細{}",e.getMessage());
+ }
+ SystemProperties.WCS_RUNNING_STATUS.set(Boolean.FALSE);
return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
}
@@ -124,50 +122,6 @@
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta()); //RGV浣嶇疆
vos.add(vo);
- }
- return R.ok().add(vos);
- }
-
- @PostMapping("/latest/data/crn")
- @ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
- public R crnLatestData(){
- List<CrnLatestDataVo> vos = new ArrayList<>();
- for (CrnSlave crn : slaveProperties.getCrn()) {
- // 鑾峰彇鍫嗗灈鏈轰俊鎭�
- CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
- if (crnThread == null) {
- continue;
- }
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- if (crnProtocol == null) {
- continue;
- }
- CrnLatestDataVo vo = new CrnLatestDataVo();
- vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
-
-// Short totalBay = locMastMapper.selectTotalBay();
-
- vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
- vo.setBay((short) (crnProtocol.getBay() - crn.getOffset())); // 褰撳墠鍒�
- /**
- * 鍫嗗灈鏈虹姸鎬佸垽鏂�
- */
- if (crnProtocol.getAlarm() > 0) {
- vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
- } else {
- if (crnProtocol.getTaskNo()>0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
- } else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
- }
- } else {
- vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
- }
- }
- vos.add(vo);
-
}
return R.ok().add(vos);
}
@@ -236,8 +190,6 @@
vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
vo.setSourceStaNo(wrkMast.getSourceStaNo$());
vo.setStaNo(wrkMast.getStaNo$());
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
}
}
@@ -253,45 +205,6 @@
}
return R.error();
- }
-
- @PostMapping("/crn/detail")
- @ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam Integer crnNo){
- if (Cools.isEmpty(crnNo)){
- return R.parse(CodeRes.EMPTY);
- }
- CrnDetailVo vo = new CrnDetailVo();
- for (CrnSlave crnSlave : slaveProperties.getCrn()) {
- if (crnSlave.getId().equals(crnNo)) {
- SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
- CrnProtocol crnProtocol = crnThread.getCrnProtocol();
- vo.setCrnNo(crnNo);
- vo.setWorkNo(crnProtocol.getTaskNo());
- vo.setCrnStatus(crnProtocol.getStatusType().desc);
-
- if (crnProtocol.getAlarm() > 0) {
- BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
- vo.setError(crnError == null ? "鏈煡寮傚父" : crnError.getErrName());
- }
-
- if (crnProtocol.getTaskNo() > 0) {
- WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
- if (wrkMast != null) {
- vo.setSourceStaNo(wrkMast.getSourceStaNo$());
- vo.setStaNo(wrkMast.getStaNo$());
- vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
- vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
- vo.setSourceLocNo(wrkMast.getSourceLocNo$());
- vo.setLocNo(wrkMast.getLocNo$());
- vo.setCrnStatus(crnProtocol.getStatusType().desc);
- vo.setError(""); // todo
- }
- }
- return R.ok().add(vo);
- }
- }
- return R.error();
}
@Deprecated
--
Gitblit v1.9.1