From 392715402ca41012b7ae020f2ae8fbab2cb4abab Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 8 Mar 2023 11:21:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xkrs/common/StaticScheduleTask.java | 4 ++-- .../com/xkrs/service/impl/FirePointServiceImpl.java | 6 +++--- .../straw/controller/DispatchFirePointController.java | 2 +- .../com/xkrs/straw/controller/FirePointController.java | 2 +- .../com/xkrs/straw/controller/SysUserController.java | 3 +-- .../{utilsnew => managers}/FirePointPushManager.java | 5 +++-- .../{utilsnew => managers}/FirePointQueryManager.java | 6 ++++-- .../FirePointSubscribeManager.java | 8 +++++--- .../service/impl/DispatchFirePointServiceImpl.java | 6 +++--- .../com/xkrs/straw/service/impl/NoticeServiceImpl.java | 2 +- .../xkrs/{utils => straw/utilsnew}/DateTimeUtils.java | 2 +- .../xkrs/straw/utilsnew/FirePointDispatchUtils.java | 2 -- .../com/xkrs/{utils => straw/utilsnew}/ListUtils.java | 10 +--------- .../com/xkrs/{utils => straw/utilsnew}/SMSUtils.java | 2 +- .../com/xkrs/{utils => straw/utilsnew}/TokenUtil.java | 2 +- .../com/xkrs/straw/utilsnew/VipTimeRangeUtils.java | 1 - 16 files changed, 28 insertions(+), 35 deletions(-) rename src/main/java/com/xkrs/straw/{utilsnew => managers}/FirePointPushManager.java (97%) rename src/main/java/com/xkrs/straw/{utilsnew => managers}/FirePointQueryManager.java (99%) rename src/main/java/com/xkrs/straw/{utilsnew => managers}/FirePointSubscribeManager.java (97%) rename src/main/java/com/xkrs/{utils => straw/utilsnew}/DateTimeUtils.java (96%) rename src/main/java/com/xkrs/{utils => straw/utilsnew}/ListUtils.java (84%) rename src/main/java/com/xkrs/{utils => straw/utilsnew}/SMSUtils.java (99%) rename src/main/java/com/xkrs/{utils => straw/utilsnew}/TokenUtil.java (97%) diff --git a/src/main/java/com/xkrs/common/StaticScheduleTask.java b/src/main/java/com/xkrs/common/StaticScheduleTask.java index f3644ba..82a485c 100644 --- a/src/main/java/com/xkrs/common/StaticScheduleTask.java +++ b/src/main/java/com/xkrs/common/StaticScheduleTask.java @@ -1,7 +1,7 @@ package com.xkrs.common; -import com.xkrs.straw.utilsnew.FirePointSubscribeManager; -import com.xkrs.utils.DateTimeUtils; +import com.xkrs.straw.managers.FirePointSubscribeManager; +import com.xkrs.straw.utilsnew.DateTimeUtils; import com.xkrs.utils.WDWxSendMsgUtil; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index 219d94d..8e87e55 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -13,9 +13,9 @@ import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.helper.PushHelper; import com.xkrs.straw.model.vo.AllFirePointVo; import com.xkrs.straw.utilsnew.FirePointConvertUtils; -import com.xkrs.straw.utilsnew.FirePointQueryManager; -import com.xkrs.utils.DateTimeUtils; -import com.xkrs.utils.TokenUtil; +import com.xkrs.straw.managers.FirePointQueryManager; +import com.xkrs.straw.utilsnew.DateTimeUtils; +import com.xkrs.straw.utilsnew.TokenUtil; import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java b/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java index b1afad3..0b7f4ce 100644 --- a/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java +++ b/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java @@ -4,7 +4,7 @@ import com.xkrs.service.impl.FirePointServiceImpl; import com.xkrs.straw.dao.SysUserDao; import com.xkrs.straw.model.qo.AllFirePointQo; import com.xkrs.straw.service.DispatchFirePointService; -import com.xkrs.straw.utilsnew.FirePointSubscribeManager; +import com.xkrs.straw.managers.FirePointSubscribeManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/xkrs/straw/controller/FirePointController.java b/src/main/java/com/xkrs/straw/controller/FirePointController.java index 708447b..03a54e8 100644 --- a/src/main/java/com/xkrs/straw/controller/FirePointController.java +++ b/src/main/java/com/xkrs/straw/controller/FirePointController.java @@ -5,7 +5,7 @@ import com.xkrs.service.FirePointService; import com.xkrs.service.StreetService; import com.xkrs.service.impl.FirePointServiceImpl; import com.xkrs.straw.dao.SysUserDao; -import com.xkrs.straw.utilsnew.FirePointQueryManager; +import com.xkrs.straw.managers.FirePointQueryManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/src/main/java/com/xkrs/straw/controller/SysUserController.java b/src/main/java/com/xkrs/straw/controller/SysUserController.java index b0bc988..b5b8b99 100644 --- a/src/main/java/com/xkrs/straw/controller/SysUserController.java +++ b/src/main/java/com/xkrs/straw/controller/SysUserController.java @@ -13,8 +13,7 @@ import com.xkrs.straw.model.qo.SysUserRemarkQo; import com.xkrs.straw.model.qo.SysUserVipLevelQo; import com.xkrs.straw.model.vo.SysUserVo; import com.xkrs.straw.service.SysUserService; -import com.xkrs.straw.utilsnew.SysUserConvertUtils; -import com.xkrs.straw.utilsnew.VipTimeRangeUtils; +import com.xkrs.straw.utilsnew.*; import com.xkrs.utils.*; import org.apache.hc.core5.util.TextUtils; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointPushManager.java b/src/main/java/com/xkrs/straw/managers/FirePointPushManager.java similarity index 97% rename from src/main/java/com/xkrs/straw/utilsnew/FirePointPushManager.java rename to src/main/java/com/xkrs/straw/managers/FirePointPushManager.java index a6086f4..2155398 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointPushManager.java +++ b/src/main/java/com/xkrs/straw/managers/FirePointPushManager.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.straw.managers; import com.xkrs.straw.dao.CountyCodeWeiXinDao; import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity; @@ -8,8 +8,9 @@ import com.xkrs.straw.model.entity.FirePointPreciseEntity; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.helper.PushHelper; import com.xkrs.straw.model.vo.AllFirePointVo; +import com.xkrs.straw.utilsnew.FirePointConvertUtils; import com.xkrs.utils.FirePointCodeUtils; -import com.xkrs.utils.SMSUtils; +import com.xkrs.straw.utilsnew.SMSUtils; import com.xkrs.utils.WDWxSendMsgUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointQueryManager.java b/src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java similarity index 99% rename from src/main/java/com/xkrs/straw/utilsnew/FirePointQueryManager.java rename to src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java index 6fafa22..63101f6 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointQueryManager.java +++ b/src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.straw.managers; import com.xkrs.straw.dao.FirePointOrdinaryDao; import com.xkrs.straw.dao.FirePointPreciseDao; @@ -8,8 +8,10 @@ import com.xkrs.straw.model.entity.FirePointOrdinaryEntity; import com.xkrs.straw.model.entity.FirePointPreciseEntity; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.vo.AllFirePointVo; +import com.xkrs.straw.utilsnew.FirePointConvertUtils; +import com.xkrs.straw.utilsnew.JsonUtils; import com.xkrs.utils.DateTimeUtil; -import com.xkrs.utils.DateTimeUtils; +import com.xkrs.straw.utilsnew.DateTimeUtils; import com.xkrs.utils.FirePointCodeUtils; import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointSubscribeManager.java b/src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java similarity index 97% rename from src/main/java/com/xkrs/straw/utilsnew/FirePointSubscribeManager.java rename to src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java index 4167659..96106f6 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointSubscribeManager.java +++ b/src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.straw.managers; import com.fasterxml.jackson.databind.ObjectMapper; import com.xkrs.straw.dao.FirePointChannelConfigDao; @@ -8,9 +8,11 @@ import com.xkrs.straw.model.bean.FirePointChannelConfigBean; import com.xkrs.straw.model.bean.LocalDateTimeRange; import com.xkrs.straw.model.entity.FirePointChannelConfigEntity; import com.xkrs.straw.model.entity.SysUserEntity; -import com.xkrs.utils.DateTimeUtils; +import com.xkrs.straw.utilsnew.JsonUtils; +import com.xkrs.straw.utilsnew.VipTimeRangeUtils; +import com.xkrs.straw.utilsnew.DateTimeUtils; import com.xkrs.utils.FirePointCodeUtils; -import com.xkrs.utils.ListUtils; +import com.xkrs.straw.utilsnew.ListUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java index b96a6e4..be42ecc 100644 --- a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java @@ -17,9 +17,9 @@ import com.xkrs.straw.model.qo.AllFirePointQo; import com.xkrs.straw.service.DispatchFirePointService; import com.xkrs.straw.utilsnew.FirePointDispatchUtils; import com.xkrs.straw.utilsnew.FirePointFilterUtils; -import com.xkrs.straw.utilsnew.FirePointPushManager; -import com.xkrs.straw.utilsnew.FirePointQueryManager; -import com.xkrs.utils.DateTimeUtils; +import com.xkrs.straw.managers.FirePointPushManager; +import com.xkrs.straw.managers.FirePointQueryManager; +import com.xkrs.straw.utilsnew.DateTimeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java index fa0cfd7..757022c 100644 --- a/src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java @@ -8,7 +8,7 @@ import com.xkrs.straw.model.entity.NoticeEntity; import com.xkrs.straw.model.entity.NoticeRelaEntity; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.service.NoticeService; -import com.xkrs.utils.TokenUtil; +import com.xkrs.straw.utilsnew.TokenUtil; import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/utils/DateTimeUtils.java b/src/main/java/com/xkrs/straw/utilsnew/DateTimeUtils.java similarity index 96% rename from src/main/java/com/xkrs/utils/DateTimeUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/DateTimeUtils.java index 6dcae15..d95649f 100644 --- a/src/main/java/com/xkrs/utils/DateTimeUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/DateTimeUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsnew; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java b/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java index ea4cbbd..53d1f66 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java @@ -3,8 +3,6 @@ package com.xkrs.straw.utilsnew; import com.xkrs.straw.model.bean.FirePointChannelConfigBean; import com.xkrs.straw.model.entity.FirePointChannelConfigEntity; import com.xkrs.straw.service.impl.DispatchFirePointServiceImpl; -import com.xkrs.utils.DateTimeUtils; -import com.xkrs.utils.SMSUtils; import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/utils/ListUtils.java b/src/main/java/com/xkrs/straw/utilsnew/ListUtils.java similarity index 84% rename from src/main/java/com/xkrs/utils/ListUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/ListUtils.java index 1fbf517..3e31b1a 100644 --- a/src/main/java/com/xkrs/utils/ListUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/ListUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsnew; import org.apache.hc.core5.util.TextUtils; @@ -58,12 +58,4 @@ public class ListUtils { return builder.toString(); } - public static List stringListToLongList(List stringList) { - List longList = new ArrayList<>(); - for (String string:stringList) { - longList.add(Long.parseLong(string)); - } - return longList; - - } } diff --git a/src/main/java/com/xkrs/utils/SMSUtils.java b/src/main/java/com/xkrs/straw/utilsnew/SMSUtils.java similarity index 99% rename from src/main/java/com/xkrs/utils/SMSUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/SMSUtils.java index 446cda9..6d5bf94 100644 --- a/src/main/java/com/xkrs/utils/SMSUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/SMSUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsnew; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; diff --git a/src/main/java/com/xkrs/utils/TokenUtil.java b/src/main/java/com/xkrs/straw/utilsnew/TokenUtil.java similarity index 97% rename from src/main/java/com/xkrs/utils/TokenUtil.java rename to src/main/java/com/xkrs/straw/utilsnew/TokenUtil.java index b778b6b..875c7f8 100644 --- a/src/main/java/com/xkrs/utils/TokenUtil.java +++ b/src/main/java/com/xkrs/straw/utilsnew/TokenUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.utils; +package com.xkrs.straw.utilsnew; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java b/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java index e7bbbbe..a239d9d 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java @@ -2,7 +2,6 @@ package com.xkrs.straw.utilsnew; import com.xkrs.straw.model.bean.VipLocalDateTimeRangePair; import com.xkrs.straw.model.bean.VipTimeRangeBean; -import com.xkrs.utils.DateTimeUtils; import org.apache.hc.core5.util.TextUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory;