From f14df7c0b6aea2dbe393f9ada08b23be3f476e5a Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 11 Oct 2024 16:59:02 +0800
Subject: [PATCH] 网格系统账号体系对接接口调整
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/sy/controller/client/SyTimeLimitClientController.java | 52 +++++++---------------------------------------------
1 files changed, 7 insertions(+), 45 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..83b47f7 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;
@@ -192,59 +192,21 @@
/**
* 获取时限
- * @url {ctx}/api/web/syTimeLimit/getTimeLimit
- * @param limitTable 时限对应表
- * @param limitType 时限类型
- * @return Object
- */
- @GetMapping("/getTimeLimit")
- public Object getTimeLimit(@RequestParam(value = "limitTable") int limitTable, @RequestParam(value = "limitType") String limitType) {
- try {
- QueryWrapper<SyTimeLimit> syTimeLimitQueryWrapper = new QueryWrapper<>();
- syTimeLimitQueryWrapper.eq("limit_table", limitTable).eq("limit_type", limitType);
- SyTimeLimit syTimeLimit = service.getOne(syTimeLimitQueryWrapper);
- int timeTerm = 0;
- if (ObjectUtils.isNotEmpty(syTimeLimit)){
- timeTerm = syTimeLimit.getTimeTerm();
- }
- return ReturnSucUtils.getRepInfo(timeTerm);
- } catch (Exception e) {
- return ReturnFailUtils.getRepInfo();
- }
- }
-
- /**
- * 获取时限
* @url {ctx}/api/web/syTimeLimit/getExpireTime
- * @param computeTime 计算时间
* @param limitType 时限类型
* @return Object
*/
@GetMapping("/getExpireTime")
- public Object getExpireTime(@RequestParam(value = "computeTime") Date computeTime, @RequestParam(value = "limitType") String limitType) {
+ public Object getExpireTime(@RequestParam(value = "limitType") String limitType) {
try {
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