From 10d7b3239e4baec952b9ee8a3e948399916d336c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:23:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/controller/BasCrnOptController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnOptController.java b/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
index dbec856..35e50bd 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
@@ -35,24 +35,26 @@
@RequestMapping(value = "/basCrnOpt/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<BasCrnOpt> 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("send_time", false);
}
return R.ok(basCrnOptService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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)){
+ 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]));
@@ -69,10 +71,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnOpt/update/auth")
- @ManagerAuth
- public R update(BasCrnOpt basCrnOpt){
- if (Cools.isEmpty(basCrnOpt) || null==basCrnOpt.getId()){
+ @RequestMapping(value = "/basCrnOpt/update/auth")
+ @ManagerAuth
+ public R update(BasCrnOpt basCrnOpt) {
+ if (Cools.isEmpty(basCrnOpt) || null == basCrnOpt.getId()) {
return R.error();
}
basCrnOptService.updateById(basCrnOpt);
@@ -81,12 +83,12 @@
@RequestMapping(value = "/basCrnOpt/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnOpt> list = JSONArray.parseArray(param, BasCrnOpt.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnOpt entity : list){
+ for (BasCrnOpt entity : list) {
basCrnOptService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -94,7 +96,7 @@
@RequestMapping(value = "/basCrnOpt/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasCrnOpt> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnOpt"));
@@ -110,7 +112,7 @@
wrapper.like("id", condition);
Page<BasCrnOpt> page = basCrnOptService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnOpt basCrnOpt : page.getRecords()){
+ for (BasCrnOpt basCrnOpt : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnOpt.getId());
map.put("value", basCrnOpt.getId());
@@ -123,7 +125,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnOpt> wrapper = new EntityWrapper<BasCrnOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnOptService.selectOne(wrapper)){
+ if (null != basCrnOptService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnOpt.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1