优化

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.straw.managers.FirePointSubscribeManager;
-import com.xkrs.utils.DateTimeUtils;
+import com.xkrs.straw.utilsnew.DateTimeUtils;
 import com.xkrs.utils.WDWxSendMsgUtil;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;

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.straw.managers.FirePointQueryManager;
-import com.xkrs.utils.DateTimeUtils;
+import com.xkrs.straw.utilsnew.DateTimeUtils;
-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;

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.*;

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;

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.*;
-import com.xkrs.straw.utilsnew.VipTimeRangeUtils;
 import com.xkrs.utils.*;
 import org.apache.hc.core5.util.TextUtils;
 import org.springframework.context.i18n.LocaleContextHolder;

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;

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;

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;

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.managers.FirePointPushManager;
-import com.xkrs.straw.utilsnew.FirePointQueryManager;
+import com.xkrs.straw.managers.FirePointQueryManager;
-import com.xkrs.utils.DateTimeUtils;
+import com.xkrs.straw.utilsnew.DateTimeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.i18n.LocaleContextHolder;

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;

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;

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;

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<Long> stringListToLongList(List<String> stringList) {
-        List<Long> longList = new ArrayList<>();
-        for (String string:stringList) {
-            longList.add(Long.parseLong(string));
-        }
-        return longList;
-
-    }
 }

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;

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;

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;