From 0ac76f7d8101903e1d050116f7d3835ce1303dfa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 一月 2025 17:00:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/SiteController.java | 49 -------------------------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 6410628..2f5acc9 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -2,33 +2,20 @@
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.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.*;
@@ -37,7 +24,6 @@
/**
* 杈撻�佽澶囨帴鍙�
- * Created by vincent on 2020-06-01
*/
@Slf4j
@RestController
@@ -48,32 +34,6 @@
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 = "绔欑偣淇℃伅琛�")
@@ -136,14 +96,6 @@
for(Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
StaProtocol staProtocol = entry.getValue();
-// if (staProtocol) {
-// PlcErrorTableVo vo = new PlcErrorTableVo();
-// vo.setNo(entry.getKey()); // 搴忓彿
-//
-// vo.setPlcDesc(""); // todo:luxiaotao plc閿欒鎻忚堪
-// vo.setError(""); // todo:luxiaotao 寮傚父淇℃伅
-// list.add(vo);
-// }
}
}
@@ -156,7 +108,6 @@
}else{
return -1;
}
-
});
return R.ok().add(list);
}
--
Gitblit v1.9.1