From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/controller/DataResourceController.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DataResourceController.java b/src/main/java/com/zy/asrs/controller/DataResourceController.java
index a7f01d0..2da542e 100644
--- a/src/main/java/com/zy/asrs/controller/DataResourceController.java
+++ b/src/main/java/com/zy/asrs/controller/DataResourceController.java
@@ -4,19 +4,22 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.DataResource;
-import com.zy.asrs.service.DataResourceService;
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.DataResource;
+import com.zy.asrs.service.DataResourceService;
import com.zy.common.utils.YamlUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class DataResourceController extends BaseController {
@@ -34,28 +37,30 @@
@RequestMapping(value = "/dataResource/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<DataResource> wrapper = new EntityWrapper<>();
excludeTrash(param);
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(dataResourceService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/dataResource/tree/auth")
@ManagerAuth
- public R tree(){
+ public R tree() {
return R.parse("0-鎿嶄綔鎴愬姛").add(dataResourceService.selectAll());
}
- 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]));
@@ -72,10 +77,10 @@
return R.ok();
}
- @RequestMapping(value = "/dataResource/update/auth")
- @ManagerAuth
- public R update(DataResource dataResource){
- if (Cools.isEmpty(dataResource) || null==dataResource.getId()){
+ @RequestMapping(value = "/dataResource/update/auth")
+ @ManagerAuth
+ public R update(DataResource dataResource) {
+ if (Cools.isEmpty(dataResource) || null == dataResource.getId()) {
return R.error();
}
dataResourceService.updateById(dataResource);
@@ -84,8 +89,8 @@
@RequestMapping(value = "/dataResource/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Integer[] ids){
- for (Integer id : ids){
+ public R delete(@RequestParam(value = "ids[]") Integer[] ids) {
+ for (Integer id : ids) {
dataResourceService.deleteById(id);
}
return R.ok();
@@ -93,7 +98,7 @@
@RequestMapping(value = "/dataResource/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<DataResource> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("dataResource"));
@@ -109,7 +114,7 @@
wrapper.like("id", condition);
Page<DataResource> page = dataResourceService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (DataResource dataResource : page.getRecords()){
+ for (DataResource dataResource : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", dataResource.getId());
map.put("value", dataResource.getId());
@@ -122,7 +127,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<DataResource> wrapper = new EntityWrapper<DataResource>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != dataResourceService.selectOne(wrapper)){
+ if (null != dataResourceService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(DataResource.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1