From aa221b6b6c3939130c78e4219207d14ce877ff30 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 15:57:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 149 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 98 insertions(+), 51 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index b72a706..637505b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -17,7 +18,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.*;
@RestController
@@ -37,36 +37,83 @@
@RequestMapping(value = "/wrkMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
- convert(param, wrapper);
+ convert2(param, wrapper);
allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("io_time", false);
}
+ Page<AgvWrkMast> agvWrkMastPage = agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(agvWrkMastPage);
+ }
+
+ @RequestMapping(value = "/wrkMast/list/auth/dbList")
+ @ManagerAuth
+ public R dbList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
+ excludeTrash(param);
+ EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
+ convert2(param, wrapper);
+ allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
+ }
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("io_time", false);
+ }
+ wrapper.in("io_type", 108, 111, 112);
return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+
+ private <T> void convert2(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ String key = entry.getKey();
+ if (key.startsWith("%") && key.endsWith("%")) {
+ wrapper.like(entry.getKey().replaceAll("%", ""), val);
+ } else if (key.startsWith("%")) {
+ wrapper.like(entry.getKey().replace("%", ""), val, SqlLike.LEFT);
+ } else if (key.endsWith("%")) {
+ wrapper.like(entry.getKey().replace("%", ""), val, SqlLike.RIGHT);
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
}
}
}
@@ -84,12 +131,12 @@
@RequestMapping(value = "/wrkMast/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<AgvWrkMast> list = JSONArray.parseArray(param, AgvWrkMast.class);
- if (Cools.isEmpty(list)){
- return R.error();
+ if (Cools.isEmpty(list)) {
+ return R.error("宸ヤ綔妗ｅ弬鏁扮己澶�");
}
- for (AgvWrkMast entity : list){
+ for (AgvWrkMast entity : list) {
agvWrkMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -97,11 +144,11 @@
@RequestMapping(value = "/wrkMast/export/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
- convert(map, wrapper);
+ convert2(map, wrapper);
List<AgvWrkMast> list = agvWrkMastService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@@ -113,7 +160,7 @@
wrapper.like("wrk_no", condition);
Page<AgvWrkMast> page = agvWrkMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (AgvWrkMast wrkMast : page.getRecords()){
+ for (AgvWrkMast wrkMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMast.getWrkNo());
map.put("value", wrkMast.getWrkNo());
@@ -126,7 +173,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AgvWrkMast> wrapper = new EntityWrapper<AgvWrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != agvWrkMastService.selectOne(wrapper)){
+ if (null != agvWrkMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(AgvWrkMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -138,7 +185,7 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (AgvWrkMast entity : list){
+ for (AgvWrkMast entity : list) {
entity.setIoPri(entity.getIoPri() + 1);
}
agvWrkMastService.updateBatchById(list);
@@ -151,37 +198,37 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (AgvWrkMast entity : list){
+ for (AgvWrkMast entity : list) {
entity.setIoPri(entity.getIoPri() - 1);
}
agvWrkMastService.updateBatchById(list);
return R.ok();
}
- @RequestMapping(value = "/wrkMast/startWrk/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｅ紑濮嬩换鍔�")
- public R startWrk(@RequestParam String param) throws IOException {
- List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class);
- if (Cools.isEmpty(agvWrkMastList)){
- return R.error();
- }
- int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
-
- int code = agvWrkMastService.containerMove(agvWrkMastList);
-
- if(code == 0){
- agvWrkMastList.forEach(agvWrkMast -> {
- //202.RCS鍙栬揣涓�
- agvWrkMast.setWrkSts((long)202);
- //淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
- agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
- });
- agvWrkMastService.updateBatchById(agvWrkMastList);
-
- return R.ok("浠诲姟鍚姩鎴愬姛");
- }
-
- return R.error("浠诲姟鍚姩澶辫触");
-
- }
+// @RequestMapping(value = "/wrkMast/startWrk/auth")
+// @ManagerAuth(memo = "宸ヤ綔妗ｅ紑濮嬩换鍔�")
+// public R startWrk(@RequestParam String param) throws IOException {
+// List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class);
+// if (Cools.isEmpty(agvWrkMastList)){
+// return R.error();
+// }
+// int startWrkCode = agvWrkMastService.startWrk(agvWrkMastList,"putaway");
+//
+// int code = agvWrkMastService.containerMoveIn(agvWrkMastList);
+//
+// if(code == 0){
+// agvWrkMastList.forEach(agvWrkMast -> {
+// //202.RCS鍙栬揣涓�
+// agvWrkMast.setWrkSts((long)202);
+// //淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y
+// agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
+// });
+// agvWrkMastService.updateBatchById(agvWrkMastList);
+//
+// return R.ok("浠诲姟鍚姩鎴愬姛");
+// }
+//
+// return R.error("浠诲姟鍚姩澶辫触");
+//
+// }
}
--
Gitblit v1.9.1