From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java
index 7a39f7e..f9b4213 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java
@@ -1,16 +1,16 @@
package cn.huge.module.sy.controller.client;
-import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.sy.consts.TimeUnitConsts;
import cn.huge.module.sy.domain.po.SyTimeLimit;
import cn.huge.module.sy.service.SyTimeLimitService;
+import cn.huge.module.sys.dto.SyTimeLimitDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -198,7 +198,7 @@
* @return Object
*/
@GetMapping("/getTimeLimit")
- public Object getTimeLimit(@RequestParam(value = "limitTable") int limitTable, @RequestParam(value = "limitType") String limitType) {
+ public Object getTimeLimit(@RequestParam(value = "limitTable") String limitTable, @RequestParam(value = "limitType") String limitType) {
try {
QueryWrapper<SyTimeLimit> syTimeLimitQueryWrapper = new QueryWrapper<>();
syTimeLimitQueryWrapper.eq("limit_table", limitTable).eq("limit_type", limitType);
@@ -226,25 +226,11 @@
QueryWrapper<SyTimeLimit> syTimeLimitQueryWrapper = new QueryWrapper<>();
syTimeLimitQueryWrapper.eq("limit_type", limitType);
SyTimeLimit syTimeLimit = service.getOne(syTimeLimitQueryWrapper);
- Date expireTime = null;
- if (ObjectUtils.isNotEmpty(syTimeLimit)){
- if (TimeUnitConsts.TIME_UNIT_1.equals(syTimeLimit.getTermUnit())){
- expireTime = DateUtils.addYear(computeTime, syTimeLimit.getTimeTerm());
- }
- if (TimeUnitConsts.TIME_UNIT_2.equals(syTimeLimit.getTermUnit())){
- expireTime = DateUtils.addMonth(computeTime, syTimeLimit.getTimeTerm());
- }
- if (TimeUnitConsts.TIME_UNIT_3.equals(syTimeLimit.getTermUnit())){
- expireTime = DateUtils.addDay(computeTime, syTimeLimit.getTimeTerm());
- }
- if (TimeUnitConsts.TIME_UNIT_4.equals(syTimeLimit.getTermUnit())){
- expireTime = DateUtils.addHour(computeTime, syTimeLimit.getTimeTerm());
- }
- if (TimeUnitConsts.TIME_UNIT_5.equals(syTimeLimit.getTermUnit())){
- expireTime = DateUtils.addMonth(computeTime, syTimeLimit.getTimeTerm());
- }
+ SyTimeLimitDTO syTimeLimitDTO = new SyTimeLimitDTO();
+ if (ObjectUtils.isNotEmpty(syTimeLimit)) {
+ BeanUtils.copyProperties(syTimeLimit, syTimeLimitDTO);
}
- return ReturnSucUtils.getRepInfo(expireTime);
+ return ReturnSucUtils.getRepInfo(syTimeLimitDTO);
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
}
--
Gitblit v1.8.0