From 74e0eb7a7e84b5006903e79554c007d9d5fbbcbc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 05 十月 2023 17:04:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 9f78842..a9e5cee 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -2,32 +2,44 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.domain.vo.PlcErrorTableVo;
import com.zy.asrs.domain.vo.SiteTableVo;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.entity.WrkCharge;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasSteService;
+import com.zy.asrs.service.WrkChargeService;
+import com.zy.common.model.enums.WrkChargeType;
+import com.zy.common.service.CommonService;
+import com.zy.core.DevpThread;
+import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.enums.SteChargeType;
+import com.zy.core.enums.SteStatusType;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.Task;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.core.model.protocol.SteProtocol;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.DevpThread;
+import com.zy.core.thread.SiemensDevpThread;
+import com.zy.core.thread.SteThread;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 杈撻�佽澶囨帴鍙�
* Created by vincent on 2020-06-01
*/
+@Slf4j
@RestController
@RequestMapping("/site")
public class SiteController {
@@ -36,6 +48,32 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private WrkChargeService wrkChargeService;
+ @Autowired
+ private BasSteService basSteService;
+ @Autowired
+ private CommonService commonService;
+
+ @GetMapping("/io/mode/info/site")
+ @ManagerAuth(memo = "鍏呯數妯″紡")
+ public R ioMode(){
+ List<Map<String, Object>> res = new ArrayList<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("floor", 1);
+ map1.put("modeVal", !devpThread.charge0);
+ map1.put("modeDesc", !devpThread.charge0?"鍏呯數涓�":"鍏抽棴");
+ res.add(map1);
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("floor", 2);
+ map2.put("modeVal", devpThread.charge1);
+ map2.put("modeDesc", devpThread.charge1?"鍏呯數涓�":"鍏抽棴");
+ res.add(map2);
+ }
+ return R.ok().add(res);
+ }
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
@@ -60,9 +98,12 @@
vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
vo.setInEnable(staProtocol.isInEnable()?"Y":"N"); // 鍙叆
vo.setOutEnable(staProtocol.isOutEnable()?"Y":"N"); // 鍙嚭
+ vo.setLiftArrival(staProtocol.isLiftArrival()?"Y":"N"); // 鎻愬崌鏈哄埌浣嶄俊鍙�
+ vo.setShuttleTakeEnable(staProtocol.isShuttleTakeEnable()?"Y":"N"); // 绌挎杞﹀彲鍙栦俊鍙�
vo.setPakMk(staProtocol.isPakMk()?"Y":"N"); // 鍏ュ簱鏍囪
vo.setEmptyMk(staProtocol.isEmptyMk()?"Y":"N"); // 绌烘澘淇″彿
vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔�
+ vo.setLocType1(staProtocol.getLocType1()==null?"-":staProtocol.getLocType1().toString()); // 楂樹綆淇″彿
}
return R.ok().add(list);
}
--
Gitblit v1.9.1