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:17:16 +08:00
parent 5e2d65a783
commit 74f1e87e56
17 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
package com.xkrs.common; 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.DateTimeUtils;
import com.xkrs.utils.WDWxSendMsgUtil; import com.xkrs.utils.WDWxSendMsgUtil;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

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

@ -12,8 +12,8 @@ import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.model.helper.PushHelper; import com.xkrs.straw.model.helper.PushHelper;
import com.xkrs.straw.model.vo.AllFirePointVo; import com.xkrs.straw.model.vo.AllFirePointVo;
import com.xkrs.straw.utils.FirePointConvertUtils; import com.xkrs.straw.utilsnew.FirePointConvertUtils;
import com.xkrs.straw.utils.FirePointQueryManager; import com.xkrs.straw.utilsnew.FirePointQueryManager;
import com.xkrs.utils.DateTimeUtils; import com.xkrs.utils.DateTimeUtils;
import com.xkrs.utils.TokenUtil; import com.xkrs.utils.TokenUtil;
import org.apache.hc.core5.util.TextUtils; import org.apache.hc.core5.util.TextUtils;

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.dao.SysUserDao;
import com.xkrs.straw.model.qo.AllFirePointQo; import com.xkrs.straw.model.qo.AllFirePointQo;
import com.xkrs.straw.service.DispatchFirePointService; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*; 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.StreetService;
import com.xkrs.service.impl.FirePointServiceImpl; import com.xkrs.service.impl.FirePointServiceImpl;
import com.xkrs.straw.dao.SysUserDao; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;

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

@ -13,8 +13,8 @@ import com.xkrs.straw.model.qo.SysUserRemarkQo;
import com.xkrs.straw.model.qo.SysUserVipLevelQo; import com.xkrs.straw.model.qo.SysUserVipLevelQo;
import com.xkrs.straw.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;
import com.xkrs.straw.service.SysUserService; import com.xkrs.straw.service.SysUserService;
import com.xkrs.straw.utils.SysUserConvertUtils; import com.xkrs.straw.utilsnew.SysUserConvertUtils;
import com.xkrs.straw.utils.VipTimeRangeUtils; import com.xkrs.straw.utilsnew.VipTimeRangeUtils;
import com.xkrs.utils.*; import com.xkrs.utils.*;
import org.apache.hc.core5.util.TextUtils; import org.apache.hc.core5.util.TextUtils;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;

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

@ -15,10 +15,10 @@ import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
import com.xkrs.straw.model.entity.FirePointPreciseEntity; import com.xkrs.straw.model.entity.FirePointPreciseEntity;
import com.xkrs.straw.model.qo.AllFirePointQo; import com.xkrs.straw.model.qo.AllFirePointQo;
import com.xkrs.straw.service.DispatchFirePointService; import com.xkrs.straw.service.DispatchFirePointService;
import com.xkrs.straw.utils.FirePointDispatchUtils; import com.xkrs.straw.utilsnew.FirePointDispatchUtils;
import com.xkrs.straw.utils.FirePointFilterUtils; import com.xkrs.straw.utilsnew.FirePointFilterUtils;
import com.xkrs.straw.utils.FirePointPushManager; import com.xkrs.straw.utilsnew.FirePointPushManager;
import com.xkrs.straw.utils.FirePointQueryManager; import com.xkrs.straw.utilsnew.FirePointQueryManager;
import com.xkrs.utils.DateTimeUtils; import com.xkrs.utils.DateTimeUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

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

@ -14,7 +14,7 @@ import com.xkrs.straw.model.entity.RelUserRoleEntity;
import com.xkrs.straw.model.entity.SysRoleEntity; import com.xkrs.straw.model.entity.SysRoleEntity;
import com.xkrs.straw.model.entity.SysUserEntity; import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.service.SysUserService; 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.apache.http.util.TextUtils;
import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;

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

@ -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.FirePointOrdinaryEntity;
import com.xkrs.straw.model.entity.FirePointPreciseEntity; import com.xkrs.straw.model.entity.FirePointPreciseEntity;

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

@ -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.bean.FirePointChannelConfigBean;
import com.xkrs.straw.model.entity.FirePointChannelConfigEntity; import com.xkrs.straw.model.entity.FirePointChannelConfigEntity;

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

@ -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.FirePointOrdinaryDao;
import com.xkrs.straw.dao.FirePointPreciseDao; import com.xkrs.straw.dao.FirePointPreciseDao;

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utils; package com.xkrs.straw.utilsnew;
import com.xkrs.straw.dao.CountyCodeWeiXinDao; import com.xkrs.straw.dao.CountyCodeWeiXinDao;
import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity; import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity;

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

@ -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.FirePointOrdinaryDao;
import com.xkrs.straw.dao.FirePointPreciseDao; import com.xkrs.straw.dao.FirePointPreciseDao;

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utils; package com.xkrs.straw.utilsnew;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.xkrs.straw.dao.FirePointChannelConfigDao; import com.xkrs.straw.dao.FirePointChannelConfigDao;

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

@ -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.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;

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

@ -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.entity.SysUserEntity;
import com.xkrs.straw.model.vo.SysUserVo; import com.xkrs.straw.model.vo.SysUserVo;

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

@ -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.VipLocalDateTimeRangePair;
import com.xkrs.straw.model.bean.VipTimeRangeBean; import com.xkrs.straw.model.bean.VipTimeRangeBean;

3
src/main/java/com/xkrs/utils/FirePointCodeUtils.java
View File

@ -1,10 +1,9 @@
package com.xkrs.utils; package com.xkrs.utils;
import com.xkrs.straw.model.entity.SysUserEntity; 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 org.apache.hc.core5.util.TextUtils;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;