From 58b8ab921ba5b855807872c849705d3f176dffb5 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 二月 2025 11:38:59 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 4c20032..dfb8f03 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -44,21 +44,30 @@
return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ 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]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@RequestMapping(value = "/staDesc/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞娣诲姞")
public R add(StaDesc staDesc) {
+ int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
+ .eq("type_no", staDesc.getTypeNo())
+ .eq("stn_no", staDesc.getStnNo())
+ .eq("crn_no", staDesc.getCrnNo())
+ .eq("crn_stn", staDesc.getCrnStn()));
+ if (sameRes > 0) {
+ return R.error("璺緞宸插瓨鍦�");
+ }
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
staDesc.setAppeUser(getUserId());
@@ -68,10 +77,10 @@
}
@RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞淇敼")
public R update(StaDesc staDesc){
- if (Cools.isEmpty(staDesc) || null==staDesc.getCrnNo()){
- return R.error();
+ if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
+ return R.error("鍙傛暟缂哄け");
}
staDesc.setModiUser(getUserId());
staDesc.setModiTime(new Date());
@@ -80,11 +89,11 @@
}
@RequestMapping(value = "/staDesc/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
public R delete(@RequestParam String param){
List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
if (Cools.isEmpty(list)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
for (StaDesc entity : list){
staDescService.delete(new EntityWrapper<>(entity));
@@ -93,7 +102,7 @@
}
@RequestMapping(value = "/staDesc/export/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
--
Gitblit v1.9.1