From 74f1e87e5654337c908cb317cf96e66e79065a03 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 8 Mar 2023 11:17:16 +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 | 2 +- .../java/com/xkrs/service/impl/FirePointServiceImpl.java | 4 ++-- .../straw/controller/DispatchFirePointController.java | 2 +- .../com/xkrs/straw/controller/FirePointController.java | 2 +- .../java/com/xkrs/straw/controller/SysUserController.java | 4 ++-- .../straw/service/impl/DispatchFirePointServiceImpl.java | 8 ++++---- .../com/xkrs/straw/service/impl/SysUserServiceImpl.java | 2 +- .../straw/{utils => utilsnew}/FirePointConvertUtils.java | 2 +- .../straw/{utils => utilsnew}/FirePointDispatchUtils.java | 2 +- .../straw/{utils => utilsnew}/FirePointFilterUtils.java | 2 +- .../straw/{utils => utilsnew}/FirePointPushManager.java | 2 +- .../straw/{utils => utilsnew}/FirePointQueryManager.java | 2 +- .../{utils => utilsnew}/FirePointSubscribeManager.java | 2 +- .../com/xkrs/straw/{utils => utilsnew}/JsonUtils.java | 2 +- .../straw/{utils => utilsnew}/SysUserConvertUtils.java | 2 +- .../xkrs/straw/{utils => utilsnew}/VipTimeRangeUtils.java | 2 +- src/main/java/com/xkrs/utils/FirePointCodeUtils.java | 3 +-- 17 files changed, 22 insertions(+), 23 deletions(-) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/FirePointConvertUtils.java (99%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/FirePointDispatchUtils.java (99%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/FirePointFilterUtils.java (99%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/FirePointPushManager.java (99%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/FirePointQueryManager.java (99%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/FirePointSubscribeManager.java (99%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/JsonUtils.java (97%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/SysUserConvertUtils.java (97%) rename src/main/java/com/xkrs/straw/{utils => utilsnew}/VipTimeRangeUtils.java (99%) diff --git a/src/main/java/com/xkrs/common/StaticScheduleTask.java b/src/main/java/com/xkrs/common/StaticScheduleTask.java index b3b7289..f3644ba 100644 --- a/src/main/java/com/xkrs/common/StaticScheduleTask.java +++ b/src/main/java/com/xkrs/common/StaticScheduleTask.java @@ -1,6 +1,6 @@ package com.xkrs.common; -import com.xkrs.straw.utils.FirePointSubscribeManager; +import com.xkrs.straw.utilsnew.FirePointSubscribeManager; import com.xkrs.utils.DateTimeUtils; import com.xkrs.utils.WDWxSendMsgUtil; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index 092021b..219d94d 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -12,8 +12,8 @@ import com.xkrs.straw.model.entity.FirePointOrdinaryEntity; 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.utils.FirePointConvertUtils; -import com.xkrs.straw.utils.FirePointQueryManager; +import com.xkrs.straw.utilsnew.FirePointConvertUtils; +import com.xkrs.straw.utilsnew.FirePointQueryManager; import com.xkrs.utils.DateTimeUtils; import com.xkrs.utils.TokenUtil; import org.apache.hc.core5.util.TextUtils; diff --git a/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java b/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java index 05f5645..b1afad3 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.utils.FirePointSubscribeManager; +import com.xkrs.straw.utilsnew.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 dca177b..708447b 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.utils.FirePointQueryManager; +import com.xkrs.straw.utilsnew.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 8424515..b0bc988 100644 --- a/src/main/java/com/xkrs/straw/controller/SysUserController.java +++ b/src/main/java/com/xkrs/straw/controller/SysUserController.java @@ -13,8 +13,8 @@ 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.utils.SysUserConvertUtils; -import com.xkrs.straw.utils.VipTimeRangeUtils; +import com.xkrs.straw.utilsnew.SysUserConvertUtils; +import com.xkrs.straw.utilsnew.VipTimeRangeUtils; 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/service/impl/DispatchFirePointServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java index a07b7e5..b96a6e4 100644 --- a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java @@ -15,10 +15,10 @@ import com.xkrs.straw.model.entity.FirePointOrdinaryEntity; import com.xkrs.straw.model.entity.FirePointPreciseEntity; import com.xkrs.straw.model.qo.AllFirePointQo; import com.xkrs.straw.service.DispatchFirePointService; -import com.xkrs.straw.utils.FirePointDispatchUtils; -import com.xkrs.straw.utils.FirePointFilterUtils; -import com.xkrs.straw.utils.FirePointPushManager; -import com.xkrs.straw.utils.FirePointQueryManager; +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 org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java index 4ab3849..8b18d7b 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java @@ -14,7 +14,7 @@ import com.xkrs.straw.model.entity.RelUserRoleEntity; import com.xkrs.straw.model.entity.SysRoleEntity; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.service.SysUserService; -import com.xkrs.straw.utils.VipTimeRangeUtils; +import com.xkrs.straw.utilsnew.VipTimeRangeUtils; import org.apache.http.util.TextUtils; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.data.domain.Sort; diff --git a/src/main/java/com/xkrs/straw/utils/FirePointConvertUtils.java b/src/main/java/com/xkrs/straw/utilsnew/FirePointConvertUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utils/FirePointConvertUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/FirePointConvertUtils.java index 07c3c24..2f45786 100644 --- a/src/main/java/com/xkrs/straw/utils/FirePointConvertUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/FirePointConvertUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.xkrs.straw.model.entity.FirePointOrdinaryEntity; import com.xkrs.straw.model.entity.FirePointPreciseEntity; diff --git a/src/main/java/com/xkrs/straw/utils/FirePointDispatchUtils.java b/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utils/FirePointDispatchUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java index a697e53..ea4cbbd 100644 --- a/src/main/java/com/xkrs/straw/utils/FirePointDispatchUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.xkrs.straw.model.bean.FirePointChannelConfigBean; import com.xkrs.straw.model.entity.FirePointChannelConfigEntity; diff --git a/src/main/java/com/xkrs/straw/utils/FirePointFilterUtils.java b/src/main/java/com/xkrs/straw/utilsnew/FirePointFilterUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utils/FirePointFilterUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/FirePointFilterUtils.java index bfb380d..a2f3bef 100644 --- a/src/main/java/com/xkrs/straw/utils/FirePointFilterUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/FirePointFilterUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.xkrs.straw.dao.FirePointOrdinaryDao; import com.xkrs.straw.dao.FirePointPreciseDao; diff --git a/src/main/java/com/xkrs/straw/utils/FirePointPushManager.java b/src/main/java/com/xkrs/straw/utilsnew/FirePointPushManager.java similarity index 99% rename from src/main/java/com/xkrs/straw/utils/FirePointPushManager.java rename to src/main/java/com/xkrs/straw/utilsnew/FirePointPushManager.java index a0c07d1..a6086f4 100644 --- a/src/main/java/com/xkrs/straw/utils/FirePointPushManager.java +++ b/src/main/java/com/xkrs/straw/utilsnew/FirePointPushManager.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.xkrs.straw.dao.CountyCodeWeiXinDao; import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity; diff --git a/src/main/java/com/xkrs/straw/utils/FirePointQueryManager.java b/src/main/java/com/xkrs/straw/utilsnew/FirePointQueryManager.java similarity index 99% rename from src/main/java/com/xkrs/straw/utils/FirePointQueryManager.java rename to src/main/java/com/xkrs/straw/utilsnew/FirePointQueryManager.java index b8b4709..6fafa22 100644 --- a/src/main/java/com/xkrs/straw/utils/FirePointQueryManager.java +++ b/src/main/java/com/xkrs/straw/utilsnew/FirePointQueryManager.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.xkrs.straw.dao.FirePointOrdinaryDao; import com.xkrs.straw.dao.FirePointPreciseDao; diff --git a/src/main/java/com/xkrs/straw/utils/FirePointSubscribeManager.java b/src/main/java/com/xkrs/straw/utilsnew/FirePointSubscribeManager.java similarity index 99% rename from src/main/java/com/xkrs/straw/utils/FirePointSubscribeManager.java rename to src/main/java/com/xkrs/straw/utilsnew/FirePointSubscribeManager.java index aad7a77..4167659 100644 --- a/src/main/java/com/xkrs/straw/utils/FirePointSubscribeManager.java +++ b/src/main/java/com/xkrs/straw/utilsnew/FirePointSubscribeManager.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.fasterxml.jackson.databind.ObjectMapper; import com.xkrs.straw.dao.FirePointChannelConfigDao; diff --git a/src/main/java/com/xkrs/straw/utils/JsonUtils.java b/src/main/java/com/xkrs/straw/utilsnew/JsonUtils.java similarity index 97% rename from src/main/java/com/xkrs/straw/utils/JsonUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/JsonUtils.java index 247d6f1..aafd0af 100644 --- a/src/main/java/com/xkrs/straw/utils/JsonUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/JsonUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/src/main/java/com/xkrs/straw/utils/SysUserConvertUtils.java b/src/main/java/com/xkrs/straw/utilsnew/SysUserConvertUtils.java similarity index 97% rename from src/main/java/com/xkrs/straw/utils/SysUserConvertUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/SysUserConvertUtils.java index ef91e76..ba0c1d2 100644 --- a/src/main/java/com/xkrs/straw/utils/SysUserConvertUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/SysUserConvertUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.vo.SysUserVo; diff --git a/src/main/java/com/xkrs/straw/utils/VipTimeRangeUtils.java b/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utils/VipTimeRangeUtils.java rename to src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java index b569a9f..e7bbbbe 100644 --- a/src/main/java/com/xkrs/straw/utils/VipTimeRangeUtils.java +++ b/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utils; +package com.xkrs.straw.utilsnew; import com.xkrs.straw.model.bean.VipLocalDateTimeRangePair; import com.xkrs.straw.model.bean.VipTimeRangeBean; diff --git a/src/main/java/com/xkrs/utils/FirePointCodeUtils.java b/src/main/java/com/xkrs/utils/FirePointCodeUtils.java index 9c7e85c..2302b90 100644 --- a/src/main/java/com/xkrs/utils/FirePointCodeUtils.java +++ b/src/main/java/com/xkrs/utils/FirePointCodeUtils.java @@ -1,10 +1,9 @@ package com.xkrs.utils; import com.xkrs.straw.model.entity.SysUserEntity; -import com.xkrs.straw.utils.VipTimeRangeUtils; +import com.xkrs.straw.utilsnew.VipTimeRangeUtils; import org.apache.hc.core5.util.TextUtils; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List;