From 7c2e048de56976c6ee3757cebf414a0f5c8dcb58 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 22 四月 2024 16:30:09 +0800
Subject: [PATCH] #Ext
---
src/main/java/com/zy/asrs/controller/SiteController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 1768651..e9cb0fb 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -7,18 +7,23 @@
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.BasExt;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasExtService;
import com.zy.asrs.utils.CommandUtils;
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.model.DevpSlave;
+import com.zy.core.model.ExtSlave;
import com.zy.core.model.Task;
+import com.zy.core.model.protocol.ExtProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.DevpThread;
import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.MelsecExtThread;
import com.zy.core.thread.SiemensDevpThread;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,6 +42,8 @@
private SlaveProperties slaveProperties;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private BasExtService basExtService;
@GetMapping("/io/mode/info/site")
@@ -119,6 +126,22 @@
return R.ok().add(list);
}
+ @GetMapping("/list/ext/auth")
+ @ManagerAuth(memo = "鏈烘鑷備俊鎭�")
+ public R extList(){
+ List<SiteTableVo> list = new ArrayList<>();
+ // 鎸佷箙鏁版嵁
+ List<BasExt> basExts = basExtService.selectList(new EntityWrapper<BasExt>().orderBy("ext_no"));
+ for (BasExt ext : basExts) {
+ SiteTableVo vo = new SiteTableVo();
+ vo.setDevNo(ext.getExtNo()); // 绔欑偣缂栧彿
+ vo.setInEnable(ext.getExtTask()); // 鍙叆 鍙彇
+ vo.setOutEnable(ext.getExtPut()); // 鍙嚭 鍙斁
+ list.add(vo);
+ }
+ return R.ok().add(list);
+ }
+
@PostMapping("/table/plc/errors")
@ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
public R plcErrorTable(){
--
Gitblit v1.9.1