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/PackController.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 542d0a8..31a70a6 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -40,24 +40,26 @@
@RequestMapping(value = "/pack/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<Pack> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
return R.ok(packService.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]));
@@ -95,10 +97,10 @@
return R.ok();
}
- @RequestMapping(value = "/pack/update/auth")
- @ManagerAuth
- public R update(Pack pack){
- if (Cools.isEmpty(pack) || null==pack.getId()){
+ @RequestMapping(value = "/pack/update/auth")
+ @ManagerAuth
+ public R update(Pack pack) {
+ if (Cools.isEmpty(pack) || null == pack.getId()) {
return R.error();
}
pack.setUpdateBy(getUserId());
@@ -109,8 +111,8 @@
@RequestMapping(value = "/pack/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
packService.deleteById(id);
}
return R.ok();
@@ -118,7 +120,7 @@
@RequestMapping(value = "/pack/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Pack> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("pack"));
@@ -134,7 +136,7 @@
wrapper.like("id", condition);
Page<Pack> page = packService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Pack pack : page.getRecords()){
+ for (Pack pack : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", pack.getId());
map.put("value", pack.getId());
@@ -147,7 +149,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Pack> wrapper = new EntityWrapper<Pack>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != packService.selectOne(wrapper)){
+ if (null != packService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Pack.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1