From d5449236ef0b3adafb3e4cc872f50479efa0ce7b Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期二, 11 三月 2025 16:10:29 +0800 Subject: [PATCH] 配置信息 --- src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 40 +++++++++++++++++++++------------------- 1 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java index c9eec6d..991e6fc 100644 --- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java +++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java @@ -32,24 +32,26 @@ @RequestMapping(value = "/basCrnStatus/list/auth") @ManagerAuth - public R list(@RequestParam(defaultValue = "1")Integer curr, - @RequestParam(defaultValue = "10")Integer limit, - @RequestParam(required = false, defaultValue = "stsNo")String orderByField, - @RequestParam(required = false, defaultValue = "asc")String orderByType, - @RequestParam Map<String, Object> param){ + public R list(@RequestParam(defaultValue = "1") Integer curr, + @RequestParam(defaultValue = "10") Integer limit, + @RequestParam(required = false, defaultValue = "stsNo") String orderByField, + @RequestParam(required = false, defaultValue = "asc") String orderByType, + @RequestParam Map<String, Object> param) { excludeTrash(param); EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>(); 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("sts_no", true); } return R.ok(basCrnStatusService.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])); @@ -70,10 +72,10 @@ return R.ok(); } - @RequestMapping(value = "/basCrnStatus/update/auth") - @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�") - public R update(BasCrnStatus basCrnStatus){ - if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){ + @RequestMapping(value = "/basCrnStatus/update/auth") + @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�") + public R update(BasCrnStatus basCrnStatus) { + if (Cools.isEmpty(basCrnStatus) || null == basCrnStatus.getStsNo()) { return R.error(); } basCrnStatus.setModiUser(getUserId()); @@ -84,12 +86,12 @@ @RequestMapping(value = "/basCrnStatus/delete/auth") @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�") - public R delete(@RequestParam String param){ + public R delete(@RequestParam String param) { List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class); - if (Cools.isEmpty(list)){ + if (Cools.isEmpty(list)) { return R.error(); } - for (BasCrnStatus entity : list){ + for (BasCrnStatus entity : list) { basCrnStatusService.delete(new EntityWrapper<>(entity)); } return R.ok(); @@ -97,7 +99,7 @@ @RequestMapping(value = "/basCrnStatus/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<BasCrnStatus> wrapper = new EntityWrapper<>(); Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnStatus")); @@ -113,7 +115,7 @@ wrapper.like("sts_desc", condition); Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); - for (BasCrnStatus basCrnStatus : page.getRecords()){ + for (BasCrnStatus basCrnStatus : page.getRecords()) { Map<String, Object> map = new HashMap<>(); map.put("id", basCrnStatus.getStsNo()); map.put("value", basCrnStatus.getStsDesc()); @@ -126,7 +128,7 @@ @ManagerAuth public R query(@RequestBody JSONObject param) { Wrapper<BasCrnStatus> wrapper = new EntityWrapper<BasCrnStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); - if (null != basCrnStatusService.selectOne(wrapper)){ + if (null != basCrnStatusService.selectOne(wrapper)) { return R.parse(BaseRes.REPEAT).add(getComment(BasCrnStatus.class, String.valueOf(param.get("key")))); } return R.ok(); -- Gitblit v1.9.1