liuchengqian/fire_point
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
liuchengqian 2023-03-08 11:21:05 +08:00
parent 74f1e87e56
commit 392715402c
16 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/xkrs/common/StaticScheduleTask.java
View File

@ -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;

6
src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
View File

@ -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;

2
src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java
View File

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

2
src/main/java/com/xkrs/straw/controller/FirePointController.java
View File

@ -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;

3
src/main/java/com/xkrs/straw/controller/SysUserController.java
View File

@ -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;

5
src/main/java/com/xkrs/straw/utilsnew/FirePointPushManager.java → src/main/java/com/xkrs/straw/managers/FirePointPushManager.java
View File

@ -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;

6
src/main/java/com/xkrs/straw/utilsnew/FirePointQueryManager.java → src/main/java/com/xkrs/straw/managers/FirePointQueryManager.java
View File

@ -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;

8
src/main/java/com/xkrs/straw/utilsnew/FirePointSubscribeManager.java → src/main/java/com/xkrs/straw/managers/FirePointSubscribeManager.java
View File

@ -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;

6
src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java
View File

@ -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;

2
src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java
View File

@ -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;

2
src/main/java/com/xkrs/utils/DateTimeUtils.java → src/main/java/com/xkrs/straw/utilsnew/DateTimeUtils.java
View File

@ -1,4 +1,4 @@
package com.xkrs.utils;
package com.xkrs.straw.utilsnew;
import java.time.LocalDate;
import java.time.LocalDateTime;

2
src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java
View File

@ -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;

10
src/main/java/com/xkrs/utils/ListUtils.java → src/main/java/com/xkrs/straw/utilsnew/ListUtils.java
View File

@ -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;
}
}

2
src/main/java/com/xkrs/utils/SMSUtils.java → src/main/java/com/xkrs/straw/utilsnew/SMSUtils.java
View File

@ -1,4 +1,4 @@
package com.xkrs.utils;
package com.xkrs.straw.utilsnew;
import com.tencentcloudapi.common.Credential;
import com.tencentcloudapi.common.exception.TencentCloudSDKException;

2
src/main/java/com/xkrs/utils/TokenUtil.java → src/main/java/com/xkrs/straw/utilsnew/TokenUtil.java
View File

@ -1,4 +1,4 @@
package com.xkrs.utils;
package com.xkrs.straw.utilsnew;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;

1
src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java
View File

@ -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;