From a4f07b2a0ddb6c210e05afbbb491feeb466203e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:15:50 +0800
Subject: [PATCH] #V3重大更新,升级JDK17,升级SpirngBoot3.5.1
---
src/main/java/com/zy/core/utils/WmsOperateUtils.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/WmsOperateUtils.java b/src/main/java/com/zy/core/utils/WmsOperateUtils.java
index 27b19bd..eb1703d 100644
--- a/src/main/java/com/zy/core/utils/WmsOperateUtils.java
+++ b/src/main/java/com/zy/core/utils/WmsOperateUtils.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.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
@@ -80,7 +80,7 @@
int result = 0;
try {
BasStation basStation = basStationService
- .selectOne(new EntityWrapper<BasStation>().eq("station_id", sourceStaNo));
+ .getOne(new QueryWrapper<BasStation>().eq("station_id", sourceStaNo));
if (basStation == null) {
News.error("绔欑偣{}涓嶅瓨鍦�", sourceStaNo);
return null;
@@ -127,7 +127,7 @@
httpRequestLog.setResponse(response);
httpRequestLog.setCreateTime(new Date());
httpRequestLog.setResult(result);
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
}
return response;
}
@@ -209,7 +209,7 @@
// 鐢宠浠诲姟閲嶆柊鍒嗛厤搴撲綅
public synchronized String applyReassignTaskLocNo(Integer taskNo, Integer stationId) {
String wmsUrl = null;
- Config wmsSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemUri"));
+ Config wmsSystemUriConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "wmsSystemUri"));
if (wmsSystemUriConfig != null) {
wmsUrl = wmsSystemUriConfig.getValue();
}
@@ -221,7 +221,7 @@
String wmsSystemReassignInTaskUrl = null;
Config wmsSystemReassignInTaskUrlConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemReassignInTaskUrl"));
+ .getOne(new QueryWrapper<Config>().eq("code", "wmsSystemReassignInTaskUrl"));
if (wmsSystemReassignInTaskUrlConfig != null) {
wmsSystemReassignInTaskUrl = wmsSystemReassignInTaskUrlConfig.getValue();
}
@@ -260,7 +260,7 @@
.setTimeout(30, TimeUnit.SECONDS)
.build()
.doPost();
- if (response != null) {
+ if (!Cools.isEmpty(response)) {
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code") == 200) {
result = 1;
@@ -284,7 +284,7 @@
httpRequestLog.setResponse(response);
httpRequestLog.setCreateTime(new Date());
httpRequestLog.setResult(result);
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
}
return response;
}
@@ -292,7 +292,7 @@
// 鐢宠鍦ㄥ簱搴撲綅鏇存崲搴撲綅
public synchronized String applyChangeLocNo(String locNo) {
String wmsUrl = null;
- Config wmsSystemUriConfig = configService.selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemUri"));
+ Config wmsSystemUriConfig = configService.getOne(new QueryWrapper<Config>().eq("code", "wmsSystemUri"));
if (wmsSystemUriConfig != null) {
wmsUrl = wmsSystemUriConfig.getValue();
}
@@ -304,7 +304,7 @@
String wmsSystemChangeLocNoUrl = null;
Config wmsSystemChangeLocNoUrlConfig = configService
- .selectOne(new EntityWrapper<Config>().eq("code", "wmsSystemChangeLocNoUrl"));
+ .getOne(new QueryWrapper<Config>().eq("code", "wmsSystemChangeLocNoUrl"));
if (wmsSystemChangeLocNoUrlConfig != null) {
wmsSystemChangeLocNoUrl = wmsSystemChangeLocNoUrlConfig.getValue();
}
@@ -322,7 +322,7 @@
List<Integer> crnRows = new ArrayList<>();
if (findCrnNoResult.getCrnType().equals(SlaveType.Crn)) {
- BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", crnNo));
if (basCrnp == null) {
return null;
}
@@ -332,7 +332,7 @@
}
} else if (findCrnNoResult.getCrnType().equals(SlaveType.DualCrn)) {
BasDualCrnp basDualCrnp = basDualCrnpService
- .selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", crnNo));
+ .getOne(new QueryWrapper<BasDualCrnp>().eq("crn_no", crnNo));
if (basDualCrnp == null) {
return null;
}
@@ -359,7 +359,7 @@
.build()
.doPost();
- if (response != null) {
+ if (!Cools.isEmpty(response)) {
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code") == 200) {
result = 1;
@@ -383,7 +383,7 @@
httpRequestLog.setResponse(response);
httpRequestLog.setCreateTime(new Date());
httpRequestLog.setResult(result);
- httpRequestLogService.insert(httpRequestLog);
+ httpRequestLogService.save(httpRequestLog);
}
return response;
}
--
Gitblit v1.9.1