From 7d61aba7b69fe1462efa6fb2bc7a8012f35c2838 Mon Sep 17 00:00:00 2001 From: wangwh <2397901735@qq.com> Date: Wed, 11 Sep 2024 14:00:07 +0800 Subject: [PATCH] update --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java index 459cb2b..08dbeb3 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java @@ -2,17 +2,16 @@ import cn.huge.base.common.bo.ReturnBO; import cn.huge.base.common.constant.ReturnConsts; -import cn.huge.base.common.exception.ClientException; -import cn.huge.base.common.exception.ServiceException; +import cn.huge.base.common.utils.DateUtils; import cn.huge.base.common.utils.ObjectUtils; import cn.huge.module.client.api.SysClient; +import cn.huge.module.sys.constant.TimeUnitConsts; import cn.huge.module.sys.dto.*; import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestBody; import java.util.*; @@ -122,7 +121,26 @@ ReturnBO returnBo = sysClient.getExpireTime(computeTime, limitType); if (ReturnConsts.OK == returnBo.getCode()){ if (ObjectUtils.isNotEmpty(returnBo.getData())){ - expireTime = (Date) returnBo.getData(); + SyTimeLimitDTO syTimeLimitDTO = objectMapper.convertValue(returnBo.getData(), SyTimeLimitDTO.class); + if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){ + if (ObjectUtils.isNotEmpty(syTimeLimitDTO)){ + if (TimeUnitConsts.TIME_UNIT_1.equals(syTimeLimitDTO.getTermUnit())){ + expireTime = DateUtils.addYear(computeTime, syTimeLimitDTO.getTimeTerm()); + } + if (TimeUnitConsts.TIME_UNIT_2.equals(syTimeLimitDTO.getTermUnit())){ + expireTime = DateUtils.addMonth(computeTime, syTimeLimitDTO.getTimeTerm()); + } + if (TimeUnitConsts.TIME_UNIT_3.equals(syTimeLimitDTO.getTermUnit())){ + expireTime = DateUtils.addDay(computeTime, syTimeLimitDTO.getTimeTerm()); + } + if (TimeUnitConsts.TIME_UNIT_4.equals(syTimeLimitDTO.getTermUnit())){ + expireTime = DateUtils.addHour(computeTime, syTimeLimitDTO.getTimeTerm()); + } + if (TimeUnitConsts.TIME_UNIT_5.equals(syTimeLimitDTO.getTermUnit())){ + expireTime = DateUtils.addMonth(computeTime, syTimeLimitDTO.getTimeTerm()); + } + } + } } } }catch (Exception e){ @@ -146,4 +164,26 @@ log.error("service方法[SysClientImpl.removeFileRelate]请求异常:"+e, e); } } + + /** + * 根据百度地图经纬度获取街道 + * @url {ctx}/api/client/syRegion/getTownByBaiduiLngLat + * @param lng 经度 + * @param lat 维度 + * @return + */ + public QueAddrBaseDTO getQueAddrByBaiduiLngLat(String lng, String lat){ + QueAddrBaseDTO queAddrBaseDTO = new QueAddrBaseDTO(); + try{ + ReturnBO returnBo = sysClient.getQueAddrByBaiduiLngLat(lng, lat); + if (ReturnConsts.OK == returnBo.getCode()){ + if (ObjectUtils.isNotEmpty(returnBo.getData())){ + queAddrBaseDTO = objectMapper.convertValue(returnBo.getData(), QueAddrBaseDTO.class); + } + } + }catch (Exception e){ + log.error("service方法[SysClientImpl.getQueAddrByBaiduiLngLat]调用异常:"+e, e); + } + return queAddrBaseDTO; + } } -- Gitblit v1.8.0