From 18e03c72291dfcb9cebc3a21ab276bec4a0b262e Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 22 四月 2026 16:25:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/SiteController.java | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index efb6049..5ab1284 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -1,6 +1,6 @@
package com.zy.asrs.controller;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -45,21 +45,6 @@
@Autowired
private BasDevpService basDevpService;
- @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> map2 = new HashMap<>();
- map2.put("floor", 2);
- map2.put("modeVal", devpThread.ioModeOf2F.id);
- map2.put("modeDesc", devpThread.ioModeOf2F.desc);
- res.add(map2);
- }
- return R.ok().add(res);
- }
-
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
public R siteTable(){
@@ -71,7 +56,7 @@
station.putAll(devpThread.getStation());
}
// 鎸佷箙鏁版嵁
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<BasDevp>().orderBy("dev_no"));
+ List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<BasDevp>().orderByAsc("dev_no"));
for (BasDevp devp : basDevps) {
SiteTableVo vo = new SiteTableVo();
vo.setDevNo(devp.getDevNo()); // 绔欑偣缂栧彿
@@ -173,7 +158,7 @@
@PostMapping("/detl/update")
@ManagerAuth(memo = "淇敼绔欑偣鏁版嵁")
public R siteDetlUpdate(@RequestParam Integer siteId,
- @RequestParam Integer workNo,
+ @RequestParam Long workNo,
@RequestParam Integer staNo,
@RequestParam String pakMk){
for (DevpSlave devp : slaveProperties.getDevp()) {
@@ -214,7 +199,7 @@
for (SteSlave ste : slaveProperties.getSte()) {
if (steNo.equals(ste.getId())) {
vo.setSteNo(ste.getId());
- BasSte basSte = basSteService.selectById(ste.getId());
+ BasSte basSte = basSteService.getById(ste.getId());
if (!Cools.isEmpty(basSte)) {
vo.setRow(basSte.getRow());
vo.setBay(basSte.getBay());
--
Gitblit v1.9.1