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/RowLastnoController.java | 46 ++++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/RowLastnoController.java b/src/main/java/com/zy/asrs/controller/RowLastnoController.java index b3b2bdb..f2e0f9b 100644 --- a/src/main/java/com/zy/asrs/controller/RowLastnoController.java +++ b/src/main/java/com/zy/asrs/controller/RowLastnoController.java @@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.zy.asrs.entity.RowLastno; -import com.zy.asrs.service.RowLastnoService; -import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.RowLastno; +import com.zy.asrs.service.RowLastnoService; +import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,22 +32,24 @@ @RequestMapping(value = "/rowLastno/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) { excludeTrash(param); EntityWrapper<RowLastno> wrapper = new EntityWrapper<>(); 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)); + } return R.ok(rowLastnoService.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])); @@ -68,10 +70,10 @@ return R.ok(); } - @RequestMapping(value = "/rowLastno/update/auth") - @ManagerAuth - public R update(RowLastno rowLastno){ - if (Cools.isEmpty(rowLastno) || null==rowLastno.getWhsType()){ + @RequestMapping(value = "/rowLastno/update/auth") + @ManagerAuth + public R update(RowLastno rowLastno) { + if (Cools.isEmpty(rowLastno) || null == rowLastno.getWhsType()) { return R.error(); } rowLastno.setModiUser(getUserId()); @@ -82,12 +84,12 @@ @RequestMapping(value = "/rowLastno/delete/auth") @ManagerAuth - public R delete(@RequestParam String param){ + public R delete(@RequestParam String param) { List<RowLastno> list = JSONArray.parseArray(param, RowLastno.class); - if (Cools.isEmpty(list)){ + if (Cools.isEmpty(list)) { return R.error(); } - for (RowLastno entity : list){ + for (RowLastno entity : list) { rowLastnoService.delete(new EntityWrapper<>(entity)); } return R.ok(); @@ -95,7 +97,7 @@ @RequestMapping(value = "/rowLastno/export/auth") @ManagerAuth - public R export(@RequestBody JSONObject param){ + public R export(@RequestBody JSONObject param) { List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); EntityWrapper<RowLastno> wrapper = new EntityWrapper<>(); Map<String, Object> map = excludeTrash(param.getJSONObject("rowLastno")); @@ -111,7 +113,7 @@ wrapper.like("whs_type", condition); Page<RowLastno> page = rowLastnoService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); - for (RowLastno rowLastno : page.getRecords()){ + for (RowLastno rowLastno : page.getRecords()) { Map<String, Object> map = new HashMap<>(); map.put("id", rowLastno.getWhsType()); map.put("value", rowLastno.getWhsType()); @@ -124,7 +126,7 @@ @ManagerAuth public R query(@RequestBody JSONObject param) { Wrapper<RowLastno> wrapper = new EntityWrapper<RowLastno>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); - if (null != rowLastnoService.selectOne(wrapper)){ + if (null != rowLastnoService.selectOne(wrapper)) { return R.parse(BaseRes.REPEAT).add(getComment(RowLastno.class, String.valueOf(param.get("key")))); } return R.ok(); -- Gitblit v1.9.1