From 83b8b7cecfe8266a44bfce696d857b3be7149e3f Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 31 十二月 2024 10:52:28 +0800
Subject: [PATCH] 优化MES调拨信息上报及库位查询逻辑
---
src/main/java/com/zy/system/controller/ResourceController.java | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 400708f..b7d3d41 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -3,20 +3,20 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.system.entity.Resource;
-import com.zy.system.service.ResourceService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.core.controller.AbstractBaseController;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.Resource;
+import com.zy.system.service.ResourceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@RestController
-public class ResourceController extends AbstractBaseController {
+public class ResourceController extends BaseController {
@Autowired
private ResourceService resourceService;
@@ -41,20 +41,38 @@
return R.ok(resourceService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ @RequestMapping(value = "/resource/tree/auth")
+ @ManagerAuth
+ public R tree(@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<Resource> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("sort");
+ }
+ return R.parse("0-鎿嶄綔鎴愬姛").add(resourceService.selectList(wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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())));
+ 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.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/resource/edit/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟缂栬緫")
public R edit(Resource resource) {
if (Cools.isEmpty(resource)){
return R.error();
@@ -71,14 +89,14 @@
}
@RequestMapping(value = "/resource/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟娣诲姞")
public R add(Resource resource) {
resourceService.insert(resource);
return R.ok();
}
- @RequestMapping(value = "/resource/update/auth")
- @ManagerAuth
+ @RequestMapping(value = "/resource/update/auth")
+ @ManagerAuth(memo = "鑿滃崟淇敼")
public R update(Resource resource){
if (Cools.isEmpty(resource) || null==resource.getId()){
return R.error();
@@ -87,18 +105,27 @@
return R.ok();
}
+// @RequestMapping(value = "/resource/delete/auth")
+// @ManagerAuth(memo = "鑿滃崟鍒犻櫎")
+// public R delete(Integer[] ids){
+// if (Cools.isEmpty(ids)){
+// return R.error();
+// }
+// resourceService.deleteBatchIds(Arrays.asList(ids));
+// return R.ok();
+// }
+
@RequestMapping(value = "/resource/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
- return R.error();
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ resourceService.deleteById(id);
}
- resourceService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
}
@RequestMapping(value = "/resource/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鑿滃崟瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1