From 8e90f3b72be3aa9d63e3dd5f5d743692aba30d9d Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期日, 29 三月 2026 22:54:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 41b3835..d7ccf1b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-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;
@@ -26,8 +26,8 @@
import org.springframework.web.multipart.MultipartFile;
import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
@@ -156,15 +156,15 @@
public R getLedInfos(HttpServletRequest request) {
HashMap<String, Object> map = new HashMap<>();
String remoteAddr = request.getRemoteAddr();
- TvDevice tvDevice = tvDeviceService.selectOne(
- new EntityWrapper<TvDevice>().eq("ip", remoteAddr));
+ TvDevice tvDevice = tvDeviceService.getOne(
+ new QueryWrapper<TvDevice>().eq("ip", remoteAddr));
if (tvDevice == null) {
return R.error("鏈壘鍒癐P瀵瑰簲鐨勭數瑙嗘満璁惧: " + remoteAddr);
}
map.put("deviceName", tvDevice.getName());
List<BasStationTv> relations = basStationTvService
- .selectList(new EntityWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
+ .list(new QueryWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
if (relations == null || relations.isEmpty()) {
map.put("data", new ArrayList<>());
return R.ok().add(map);
@@ -189,6 +189,10 @@
continue;
}
+ if(Cools.isEmpty(wcsStationDto.getTaskNo())||wcsStationDto.getTaskNo().equals("0")) {
+ continue;
+ }
+
String errorMsg = "";
if (!Cools.isEmpty(wcsStationDto.getErrorMsg())) {
errorMsg += wcsStationDto.getErrorMsg();
@@ -210,6 +214,7 @@
tvDataDto.setBarcode(wcsStationDto.getBarcode());
tvDataDto.setErrorMsg(errorMsg);
tvDataDto.setIoType(wcsStationDto.getIoType());
+ tvDataDto.setOrderNo(wcsStationDto.getOrderNo());
tvDataDto.setWrkDetls(wcsStationDto.getWrkDetls());
if (Cools.isEmpty(errorMsg)) {
@@ -223,6 +228,7 @@
map.put("data", list);
+ System.out.println(map);
return R.ok().add(map);
}
@@ -236,11 +242,11 @@
}
String remoteAddr = request.getRemoteAddr();
- TvDevice tvDevice = tvDeviceService.selectOne(
- new EntityWrapper<TvDevice>().eq("ip", remoteAddr));
+ TvDevice tvDevice = tvDeviceService.getOne(
+ new QueryWrapper<TvDevice>().eq("ip", remoteAddr));
if (tvDevice != null) {
List<BasStationTv> relations = basStationTvService
- .selectList(new EntityWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
+ .list(new QueryWrapper<BasStationTv>().eq("tv_id", tvDevice.getId()));
if (relations != null && !relations.isEmpty()) {
for (BasStationTv relation : relations) {
WcsStationDto wcsStationDto = stationUtils.stationMap.get(relation.getStationId());
@@ -297,11 +303,11 @@
@GetMapping("/announcement")
public R top5(){
- EntityWrapper<Announcement> wrapper = new EntityWrapper<>();
+ QueryWrapper<Announcement> wrapper = new QueryWrapper<>();
wrapper.eq("status", 1);
- wrapper.orderBy("create_time", false);
+ wrapper.orderBy(true, false, "create_time");
wrapper.last("limit 5");
- return R.ok(announcementService.selectList(wrapper));
+ return R.ok(announcementService.list(wrapper));
}
/**
@@ -347,7 +353,6 @@
if(o == null){
return R.error();
}
-
return R.ok().add(JSON.parseObject(o.toString()));
}
--
Gitblit v1.9.1