From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 78 ++++++++++++++++++++++----------------
1 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index e404fc4..b512b3a 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -33,26 +33,31 @@
@RequestMapping(value = "/trayCode/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 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 Map<String, Object> param) {
EntityWrapper<TrayCode> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+// wrapper.orderBy("id", false);
+ }
return R.ok(trayCodeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ private void convert(Map<String, Object> map, EntityWrapper 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 {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -64,10 +69,10 @@
return R.ok();
}
- @RequestMapping(value = "/trayCode/update/auth")
- @ManagerAuth
- public R update(TrayCode trayCode){
- if (Cools.isEmpty(trayCode) || null==trayCode.getId()){
+ @RequestMapping(value = "/trayCode/update/auth")
+ @ManagerAuth
+ public R update(TrayCode trayCode) {
+ if (Cools.isEmpty(trayCode) || null == trayCode.getId()) {
return R.error();
}
trayCodeService.updateById(trayCode);
@@ -76,12 +81,12 @@
@RequestMapping(value = "/trayCode/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<TrayCode> list = JSONArray.parseArray(param, TrayCode.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (TrayCode entity : list){
+ for (TrayCode entity : list) {
trayCodeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -89,7 +94,7 @@
@RequestMapping(value = "/trayCode/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TrayCode> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("trayCode"));
@@ -105,7 +110,7 @@
wrapper.like("id", condition);
Page<TrayCode> page = trayCodeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TrayCode trayCode : page.getRecords()){
+ for (TrayCode trayCode : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", trayCode.getId());
map.put("value", trayCode.getId());
@@ -118,23 +123,30 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TrayCode> wrapper = new EntityWrapper<TrayCode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != trayCodeService.selectOne(wrapper)){
+ if (null != trayCodeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TrayCode.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
+ @RequestMapping(value = "/trayCode/latest")
+ @ManagerAuth
+ public R trayCodeLatest() {
+ List<TrayCode> latest = trayCodeService.selectList(new EntityWrapper<TrayCode>().orderBy("id", false));
+ return R.ok().add(latest.isEmpty() ? "10000001" : Integer.parseInt(latest.get(0).getTrayNo()) + 1);
+ }
+
@RequestMapping(value = "/trayCode/print/preview")
@ManagerAuth
public R printPreview(@RequestParam String startNo,
- @RequestParam Integer count,
- @RequestParam Integer type) {
+ @RequestParam Integer count,
+ @RequestParam Integer type) {
if (count <= 0) {
return R.error("鏁伴噺蹇呴』澶т簬闆�");
}
List<Map<String, Object>> res = new ArrayList<>();
- for (int i = 0; i<count; i++) {
- res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i)));
+ for (int i = 0; i < count; i++) {
+ res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo) + i)));
}
return R.ok().add(res);
}
@@ -142,16 +154,16 @@
@RequestMapping(value = "/trayCode/print/auth")
@ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
public R print(@RequestParam String startNo,
- @RequestParam Integer count,
- @RequestParam Integer type){
+ @RequestParam Integer count,
+ @RequestParam Integer type) {
if (count <= 0) {
return R.error("鏁伴噺蹇呴』澶т簬闆�");
}
- for (int i = 0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
TrayCode trayCode = new TrayCode(
- String.valueOf(Integer.parseInt(startNo)+i), // 搴忓垪鍙穂闈炵┖]
- i==0?"Y":"N", // 璧峰
- i==count-1?"Y":"N", // 缁堟
+ String.valueOf(Integer.parseInt(startNo) + i), // 搴忓垪鍙穂闈炵┖]
+ i == 0 ? "Y" : "N", // 璧峰
+ i == count - 1 ? "Y" : "N", // 缁堟
null, // 澶囨敞
new Date(), // 淇敼鏃堕棿
getUserId(), // 淇敼浜哄憳
--
Gitblit v1.9.1