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 14:06:14 +08:00
parent 0f87cd3e91
commit fcc1ae2119
99 changed files with 297 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
package com.xkrs.common;
import com.xkrs.straw.helper.FirePointSubscribeManager;
import com.xkrs.straw.utilsnew.DateTimeUtils;
import com.xkrs.straw.utilsnew.WeiXinMessageUtils;
import com.xkrs.helper.FirePointSubscribeManager;
import com.xkrs.utilsnew.DateTimeUtils;
import com.xkrs.utilsnew.WeiXinMessageUtils;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;

14
src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java
View File

@ -1,11 +1,11 @@
package com.xkrs.common.account;
import com.xkrs.straw.service.SysAuthorityService;
import com.xkrs.straw.model.entity.SysAuthorityEntity;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.service.SysRoleService;
import com.xkrs.straw.service.SysUserService;
import com.xkrs.straw.utilsold.DateTimeUtil;
import com.xkrs.service.SysAuthorityService;
import com.xkrs.model.entity.SysAuthorityEntity;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.service.SysRoleService;
import com.xkrs.service.SysUserService;
import com.xkrs.utilsold.DateTimeUtil;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.DisabledException;
@ -21,7 +21,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import static com.xkrs.straw.utilsnew.EncryptDecryptUtil.encry256;
import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
/**
* 自定义认证Provider

4
src/main/java/com/xkrs/common/account/JwtLoginFilter.java
View File

@ -2,8 +2,8 @@ package com.xkrs.common.account;
import com.xkrs.common.encapsulation.OutputEncapsulation;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.service.SysUserService;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.service.SysUserService;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;

2
src/main/java/com/xkrs/common/account/TokenAuthenticationService.java
View File

@ -2,7 +2,7 @@ package com.xkrs.common.account;
import com.xkrs.common.encapsulation.OutputEncapsulation;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.entity.SysUserEntity;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.security.Keys;

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

@ -1,10 +1,10 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.xkrs.straw.service.impl.FirePointServiceImpl;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.helper.FirePointSubscribeManager;
import com.xkrs.straw.model.qo.AllFirePointQo;
import com.xkrs.straw.service.DispatchFirePointService;
import com.xkrs.service.impl.FirePointServiceImpl;
import com.xkrs.dao.SysUserDao;
import com.xkrs.helper.FirePointSubscribeManager;
import com.xkrs.model.qo.AllFirePointQo;
import com.xkrs.service.DispatchFirePointService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.GetMapping;

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

@ -1,11 +1,11 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.service.FirePointService;
import com.xkrs.straw.service.impl.FirePointServiceImpl;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.helper.FirePointQueryManager;
import com.xkrs.straw.service.StreetService;
import com.xkrs.service.FirePointService;
import com.xkrs.service.impl.FirePointServiceImpl;
import com.xkrs.dao.SysUserDao;
import com.xkrs.helper.FirePointQueryManager;
import com.xkrs.service.StreetService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.i18n.LocaleContextHolder;

10
src/main/java/com/xkrs/straw/controller/GaoDeApiController.java → src/main/java/com/xkrs/controller/GaoDeApiController.java
View File

@ -1,10 +1,10 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo;
import com.xkrs.straw.model.vo.GaoDeWeatherVo;
import com.xkrs.model.vo.GaoDeIgGeocodeVo;
import com.xkrs.model.vo.GaoDeWeatherVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.i18n.LocaleContextHolder;
@ -16,8 +16,8 @@ import java.util.List;
import java.util.Locale;
import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
import static com.xkrs.straw.utilsnew.CommonConstant.*;
import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpsGet;
import static com.xkrs.utilsnew.CommonConstant.*;
import static com.xkrs.utilsold.HttpClientUtils.sendHttpsGet;
/**
* @author wudong

6
src/main/java/com/xkrs/straw/controller/NoticeController.java → src/main/java/com/xkrs/controller/NoticeController.java
View File

@ -1,7 +1,7 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.xkrs.straw.model.entity.NoticeEntity;
import com.xkrs.straw.service.NoticeService;
import com.xkrs.model.entity.NoticeEntity;
import com.xkrs.service.NoticeService;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;

10
src/main/java/com/xkrs/straw/controller/PushController.java → src/main/java/com/xkrs/controller/PushController.java
View File

@ -1,10 +1,10 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.model.qo.SysUserPushIdQo;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.model.helper.PushHelper;
import com.xkrs.model.qo.SysUserPushIdQo;
import com.xkrs.dao.SysUserDao;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.model.helper.PushHelper;
import org.apache.hc.core5.util.TextUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.*;

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

@ -1,7 +1,7 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.dao.StreetDao;
import com.xkrs.dao.StreetDao;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;

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

@ -1,7 +1,7 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.dao.StreetDao;
import com.xkrs.dao.StreetDao;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

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

@ -1,21 +1,21 @@
package com.xkrs.straw.controller;
package com.xkrs.controller;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.model.va.SysUserQoInsert;
import com.xkrs.straw.model.va.SysUserQoUpdate;
import com.xkrs.straw.service.RedisService;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.model.qo.SysUserQo;
import com.xkrs.straw.model.qo.SysUserReceiveSmsQo;
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.*;
import com.xkrs.straw.utilsnew.AliYunSmsUtils;
import com.xkrs.straw.utilsnew.RandomUtil;
import com.xkrs.model.va.SysUserQoInsert;
import com.xkrs.model.va.SysUserQoUpdate;
import com.xkrs.service.RedisService;
import com.xkrs.dao.SysUserDao;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.model.qo.SysUserQo;
import com.xkrs.model.qo.SysUserReceiveSmsQo;
import com.xkrs.model.qo.SysUserRemarkQo;
import com.xkrs.model.qo.SysUserVipLevelQo;
import com.xkrs.model.vo.SysUserVo;
import com.xkrs.service.SysUserService;
import com.xkrs.utilsnew.*;
import com.xkrs.utilsnew.AliYunSmsUtils;
import com.xkrs.utilsnew.RandomUtil;
import org.apache.hc.core5.util.TextUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.data.domain.Sort;
@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit;
import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationErrorList;
import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
import static com.xkrs.straw.utilsnew.EncryptDecryptUtil.encry256;
import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
/**
* 系统用户Controller

4
src/main/java/com/xkrs/straw/dao/CountyCodeWeiXinDao.java → src/main/java/com/xkrs/dao/CountyCodeWeiXinDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity;
import com.xkrs.model.entity.CountyCodeWeiXinEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/FirePointChannelConfigDao.java → src/main/java/com/xkrs/dao/FirePointChannelConfigDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.FirePointChannelConfigEntity;
import com.xkrs.model.entity.FirePointChannelConfigEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/FirePointOrdinaryDao.java → src/main/java/com/xkrs/dao/FirePointOrdinaryDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
import com.xkrs.model.entity.FirePointOrdinaryEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/FirePointPreciseDao.java → src/main/java/com/xkrs/dao/FirePointPreciseDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.FirePointPreciseEntity;
import com.xkrs.model.entity.FirePointPreciseEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/NoticeDao.java → src/main/java/com/xkrs/dao/NoticeDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.NoticeEntity;
import com.xkrs.model.entity.NoticeEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/NoticeRelaDao.java → src/main/java/com/xkrs/dao/NoticeRelaDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.NoticeRelaEntity;
import com.xkrs.model.entity.NoticeRelaEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/RelRoleAuthorityDao.java → src/main/java/com/xkrs/dao/RelRoleAuthorityDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.RelRoleAuthorityEntity;
import com.xkrs.model.entity.RelRoleAuthorityEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

4
src/main/java/com/xkrs/straw/dao/RelUserRoleDao.java → src/main/java/com/xkrs/dao/RelUserRoleDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.RelUserRoleEntity;
import com.xkrs.model.entity.RelUserRoleEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/StreetDao.java → src/main/java/com/xkrs/dao/StreetDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.StreetEntity;
import com.xkrs.model.entity.StreetEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;

4
src/main/java/com/xkrs/straw/dao/SysAuthorityDao.java → src/main/java/com/xkrs/dao/SysAuthorityDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.SysAuthorityEntity;
import com.xkrs.model.entity.SysAuthorityEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.stereotype.Component;

4
src/main/java/com/xkrs/straw/dao/SysRoleDao.java → src/main/java/com/xkrs/dao/SysRoleDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.SysRoleEntity;
import com.xkrs.model.entity.SysRoleEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;

4
src/main/java/com/xkrs/straw/dao/SysUserDao.java → src/main/java/com/xkrs/dao/SysUserDao.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.dao;
package com.xkrs.dao;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.entity.SysUserEntity;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;

26
src/main/java/com/xkrs/straw/helper/FirePointPushManager.java → src/main/java/com/xkrs/helper/FirePointPushManager.java
View File

@ -1,17 +1,17 @@
package com.xkrs.straw.helper;
package com.xkrs.helper;
import com.xkrs.straw.dao.CountyCodeWeiXinDao;
import com.xkrs.straw.model.entity.CountyCodeWeiXinEntity;
import com.xkrs.straw.dao.SysUserDao;
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.helper.PushHelper;
import com.xkrs.straw.model.vo.AllFirePointVo;
import com.xkrs.straw.utilsnew.FirePointConvertUtils;
import com.xkrs.straw.utilsnew.FirePointCodeUtils;
import com.xkrs.straw.utilsnew.SMSUtils;
import com.xkrs.straw.utilsnew.WeiXinMessageUtils;
import com.xkrs.dao.CountyCodeWeiXinDao;
import com.xkrs.model.entity.CountyCodeWeiXinEntity;
import com.xkrs.dao.SysUserDao;
import com.xkrs.model.entity.FirePointOrdinaryEntity;
import com.xkrs.model.entity.FirePointPreciseEntity;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.model.helper.PushHelper;
import com.xkrs.model.vo.AllFirePointVo;
import com.xkrs.utilsnew.FirePointConvertUtils;
import com.xkrs.utilsnew.FirePointCodeUtils;
import com.xkrs.utilsnew.SMSUtils;
import com.xkrs.utilsnew.WeiXinMessageUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;

28
src/main/java/com/xkrs/straw/helper/FirePointQueryManager.java → src/main/java/com/xkrs/helper/FirePointQueryManager.java
View File

@ -1,18 +1,18 @@
package com.xkrs.straw.helper;
package com.xkrs.helper;
import com.xkrs.straw.dao.FirePointOrdinaryDao;
import com.xkrs.straw.dao.FirePointPreciseDao;
import com.xkrs.straw.model.bean.FirePointQueryResultBean;
import com.xkrs.straw.model.bean.VipTimeRangeBean;
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.straw.utilsold.DateTimeUtil;
import com.xkrs.straw.utilsnew.DateTimeUtils;
import com.xkrs.straw.utilsnew.FirePointCodeUtils;
import com.xkrs.dao.FirePointOrdinaryDao;
import com.xkrs.dao.FirePointPreciseDao;
import com.xkrs.model.bean.FirePointQueryResultBean;
import com.xkrs.model.bean.VipTimeRangeBean;
import com.xkrs.model.entity.FirePointOrdinaryEntity;
import com.xkrs.model.entity.FirePointPreciseEntity;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.model.vo.AllFirePointVo;
import com.xkrs.utilsnew.FirePointConvertUtils;
import com.xkrs.utilsnew.JsonUtils;
import com.xkrs.utilsold.DateTimeUtil;
import com.xkrs.utilsnew.DateTimeUtils;
import com.xkrs.utilsnew.FirePointCodeUtils;
import org.apache.hc.core5.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

28
src/main/java/com/xkrs/straw/helper/FirePointSubscribeManager.java → src/main/java/com/xkrs/helper/FirePointSubscribeManager.java
View File

@ -1,25 +1,25 @@
package com.xkrs.straw.helper;
package com.xkrs.helper;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.xkrs.straw.dao.FirePointChannelConfigDao;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.model.bean.DataWrapper4;
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.straw.utilsnew.JsonUtils;
import com.xkrs.straw.utilsnew.VipTimeRangeUtils;
import com.xkrs.straw.utilsnew.DateTimeUtils;
import com.xkrs.straw.utilsnew.FirePointCodeUtils;
import com.xkrs.straw.utilsnew.ListUtils;
import com.xkrs.dao.FirePointChannelConfigDao;
import com.xkrs.dao.SysUserDao;
import com.xkrs.model.bean.DataWrapper4;
import com.xkrs.model.bean.FirePointChannelConfigBean;
import com.xkrs.model.bean.LocalDateTimeRange;
import com.xkrs.model.entity.FirePointChannelConfigEntity;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.utilsnew.JsonUtils;
import com.xkrs.utilsnew.VipTimeRangeUtils;
import com.xkrs.utilsnew.DateTimeUtils;
import com.xkrs.utilsnew.FirePointCodeUtils;
import com.xkrs.utilsnew.ListUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpPost;
import static com.xkrs.utilsold.HttpClientUtils.sendHttpPost;
@Component
public class FirePointSubscribeManager {

8
src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java → src/main/java/com/xkrs/helper/GeoCodeHelper.java
View File

@ -1,8 +1,8 @@
package com.xkrs.straw.helper;
package com.xkrs.helper;
import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo;
import com.xkrs.straw.service.impl.DispatchFirePointServiceImpl;
import com.xkrs.straw.utilsold.GaoDeApiUtil;
import com.xkrs.model.vo.GaoDeIgGeocodeVo;
import com.xkrs.service.impl.DispatchFirePointServiceImpl;
import com.xkrs.utilsold.GaoDeApiUtil;
import org.apache.hc.core5.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/com/xkrs/straw/model/bean/DataWrapper.java → src/main/java/com/xkrs/model/bean/DataWrapper.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
public class DataWrapper<DataType> {

2
src/main/java/com/xkrs/straw/model/bean/DataWrapper2.java → src/main/java/com/xkrs/model/bean/DataWrapper2.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
public class DataWrapper2<DataType1, DataType2> {

2
src/main/java/com/xkrs/straw/model/bean/DataWrapper3.java → src/main/java/com/xkrs/model/bean/DataWrapper3.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
public class DataWrapper3<DataType1, DataType2, DataType3> {

2
src/main/java/com/xkrs/straw/model/bean/DataWrapper4.java → src/main/java/com/xkrs/model/bean/DataWrapper4.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
public class DataWrapper4<DataType1, DataType2, DataType3, DataType4> {

2
src/main/java/com/xkrs/straw/model/bean/FirePointChannelConfigBean.java → src/main/java/com/xkrs/model/bean/FirePointChannelConfigBean.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
import java.util.List;

4
src/main/java/com/xkrs/straw/model/bean/FirePointQueryResultBean.java → src/main/java/com/xkrs/model/bean/FirePointQueryResultBean.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
import com.xkrs.straw.model.vo.AllFirePointVo;
import com.xkrs.model.vo.AllFirePointVo;
import java.util.List;

2
src/main/java/com/xkrs/straw/model/bean/KeyValueBean.java → src/main/java/com/xkrs/model/bean/KeyValueBean.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
public class KeyValueBean {

2
src/main/java/com/xkrs/straw/model/bean/LocalDateTimeRange.java → src/main/java/com/xkrs/model/bean/LocalDateTimeRange.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
import java.time.LocalDateTime;

2
src/main/java/com/xkrs/straw/model/bean/VipLocalDateTimeRangePair.java → src/main/java/com/xkrs/model/bean/VipLocalDateTimeRangePair.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
import java.time.LocalDateTime;

2
src/main/java/com/xkrs/straw/model/bean/VipTimeRangeBean.java → src/main/java/com/xkrs/model/bean/VipTimeRangeBean.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.bean;
package com.xkrs.model.bean;
import java.util.List;

2
src/main/java/com/xkrs/straw/model/entity/CountyCodeWeiXinEntity.java → src/main/java/com/xkrs/model/entity/CountyCodeWeiXinEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/FirePointChannelConfigEntity.java → src/main/java/com/xkrs/model/entity/FirePointChannelConfigEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java → src/main/java/com/xkrs/model/entity/FirePointOrdinaryEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java → src/main/java/com/xkrs/model/entity/FirePointPreciseEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/LandEntity.java → src/main/java/com/xkrs/model/entity/LandEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;

2
src/main/java/com/xkrs/straw/model/entity/NoticeEntity.java → src/main/java/com/xkrs/model/entity/NoticeEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/NoticeRelaEntity.java → src/main/java/com/xkrs/model/entity/NoticeRelaEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/RelRoleAuthorityEntity.java → src/main/java/com/xkrs/model/entity/RelRoleAuthorityEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/RelUserRoleEntity.java → src/main/java/com/xkrs/model/entity/RelUserRoleEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/StreetEntity.java → src/main/java/com/xkrs/model/entity/StreetEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/SysAuthorityEntity.java → src/main/java/com/xkrs/model/entity/SysAuthorityEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/SysRoleEntity.java → src/main/java/com/xkrs/model/entity/SysRoleEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

2
src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java → src/main/java/com/xkrs/model/entity/SysUserEntity.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.entity;
package com.xkrs.model.entity;
import javax.persistence.*;
import java.io.Serializable;

6
src/main/java/com/xkrs/straw/model/helper/PushHelper.java → src/main/java/com/xkrs/model/helper/PushHelper.java
View File

@ -1,12 +1,12 @@
package com.xkrs.straw.model.helper;
package com.xkrs.model.helper;
import com.xiaomi.push.sdk.ErrorCode;
import com.xiaomi.xmpush.server.Constants;
import com.xiaomi.xmpush.server.Message;
import com.xiaomi.xmpush.server.Result;
import com.xiaomi.xmpush.server.Sender;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.model.vo.AllFirePointVo;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.model.vo.AllFirePointVo;
import org.springframework.stereotype.Component;
import java.util.ArrayList;

2
src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java → src/main/java/com/xkrs/model/qo/AllFirePointQo.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.qo;
package com.xkrs.model.qo;
public class AllFirePointQo {

2
src/main/java/com/xkrs/straw/model/qo/SysUserPushIdQo.java → src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.qo;
package com.xkrs.model.qo;
public class SysUserPushIdQo {

6
src/main/java/com/xkrs/straw/model/qo/SysUserQo.java → src/main/java/com/xkrs/model/qo/SysUserQo.java
View File

@ -1,7 +1,7 @@
package com.xkrs.straw.model.qo;
package com.xkrs.model.qo;
import com.xkrs.straw.model.va.SysUserQoInsert;
import com.xkrs.straw.model.va.SysUserQoUpdate;
import com.xkrs.model.va.SysUserQoInsert;
import com.xkrs.model.va.SysUserQoUpdate;
import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank;

4
src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java → src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.model.qo;
package com.xkrs.model.qo;
import com.xkrs.straw.model.va.SysUserQoUpdate;
import com.xkrs.model.va.SysUserQoUpdate;
import javax.validation.constraints.NotNull;

4
src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java → src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.model.qo;
package com.xkrs.model.qo;
import com.xkrs.straw.model.va.SysUserQoUpdate;
import com.xkrs.model.va.SysUserQoUpdate;
import javax.validation.constraints.NotNull;

4
src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java → src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.model.qo;
package com.xkrs.model.qo;
import com.xkrs.straw.model.va.SysUserQoUpdate;
import com.xkrs.model.va.SysUserQoUpdate;
import javax.validation.constraints.NotNull;

2
src/main/java/com/xkrs/straw/model/va/SysUserQoInsert.java → src/main/java/com/xkrs/model/va/SysUserQoInsert.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.va;
package com.xkrs.model.va;
/**
* SysUserQoInsert

2
src/main/java/com/xkrs/straw/model/va/SysUserQoUpdate.java → src/main/java/com/xkrs/model/va/SysUserQoUpdate.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.va;
package com.xkrs.model.va;
/**
* SysUserQoUpdate

2
src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java → src/main/java/com/xkrs/model/vo/AllFirePointVo.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.vo;
package com.xkrs.model.vo;
public class AllFirePointVo {

2
src/main/java/com/xkrs/straw/model/vo/GaoDeIgGeocodeVo.java → src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.vo;
package com.xkrs.model.vo;
import java.util.List;

2
src/main/java/com/xkrs/straw/model/vo/GaoDeWeatherVo.java → src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.vo;
package com.xkrs.model.vo;
import java.util.List;

2
src/main/java/com/xkrs/straw/model/vo/SysUserVo.java → src/main/java/com/xkrs/model/vo/SysUserVo.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.model.vo;
package com.xkrs.model.vo;
public class SysUserVo {

4
src/main/java/com/xkrs/straw/service/DispatchFirePointService.java → src/main/java/com/xkrs/service/DispatchFirePointService.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.service;
package com.xkrs.service;
import com.xkrs.straw.model.qo.AllFirePointQo;
import com.xkrs.model.qo.AllFirePointQo;
public interface DispatchFirePointService {

2
src/main/java/com/xkrs/straw/service/FirePointService.java → src/main/java/com/xkrs/service/FirePointService.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.service;
package com.xkrs.service;
public interface FirePointService {

4
src/main/java/com/xkrs/straw/service/NoticeService.java → src/main/java/com/xkrs/service/NoticeService.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.service;
package com.xkrs.service;
import com.xkrs.straw.model.entity.NoticeEntity;
import com.xkrs.model.entity.NoticeEntity;
/**
* 公告栏通知接口

3
src/main/java/com/xkrs/straw/service/RedisService.java → src/main/java/com/xkrs/service/RedisService.java
View File

@ -1,6 +1,5 @@
package com.xkrs.straw.service;
package com.xkrs.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

4
src/main/java/com/xkrs/straw/service/StreetService.java → src/main/java/com/xkrs/service/StreetService.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.service;
package com.xkrs.service;
import com.xkrs.straw.model.entity.StreetEntity;
import com.xkrs.model.entity.StreetEntity;
import java.util.List;
import java.util.Map;

4
src/main/java/com/xkrs/straw/service/SysAuthorityService.java → src/main/java/com/xkrs/service/SysAuthorityService.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.service;
package com.xkrs.service;
import com.xkrs.straw.model.entity.SysAuthorityEntity;
import com.xkrs.model.entity.SysAuthorityEntity;
import java.util.List;

4
src/main/java/com/xkrs/straw/service/SysRoleService.java → src/main/java/com/xkrs/service/SysRoleService.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.service;
package com.xkrs.service;
import com.xkrs.straw.model.entity.SysRoleEntity;
import com.xkrs.model.entity.SysRoleEntity;
import java.util.List;

6
src/main/java/com/xkrs/straw/service/SysUserService.java → src/main/java/com/xkrs/service/SysUserService.java
View File

@ -1,7 +1,7 @@
package com.xkrs.straw.service;
package com.xkrs.service;
import com.xkrs.straw.model.qo.SysUserQo;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.qo.SysUserQo;
import com.xkrs.model.entity.SysUserEntity;
import javax.servlet.http.HttpServletRequest;
import java.util.List;

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

@ -1,20 +1,20 @@
package com.xkrs.straw.service.impl;
package com.xkrs.service.impl;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.dao.*;
import com.xkrs.straw.helper.FirePointPushManager;
import com.xkrs.straw.helper.FirePointQueryManager;
import com.xkrs.straw.helper.GeoCodeHelper;
import com.xkrs.straw.model.bean.DataWrapper2;
import com.xkrs.straw.model.entity.FirePointChannelConfigEntity;
import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
import com.xkrs.straw.model.entity.FirePointPreciseEntity;
import com.xkrs.straw.model.entity.StreetEntity;
import com.xkrs.straw.model.qo.AllFirePointQo;
import com.xkrs.straw.service.DispatchFirePointService;
import com.xkrs.straw.utilsnew.DateTimeUtils;
import com.xkrs.straw.utilsnew.FirePointDispatchUtils;
import com.xkrs.straw.utilsnew.FirePointFilterUtils;
import com.xkrs.dao.*;
import com.xkrs.helper.FirePointPushManager;
import com.xkrs.helper.FirePointQueryManager;
import com.xkrs.helper.GeoCodeHelper;
import com.xkrs.model.bean.DataWrapper2;
import com.xkrs.model.entity.FirePointChannelConfigEntity;
import com.xkrs.model.entity.FirePointOrdinaryEntity;
import com.xkrs.model.entity.FirePointPreciseEntity;
import com.xkrs.model.entity.StreetEntity;
import com.xkrs.model.qo.AllFirePointQo;
import com.xkrs.service.DispatchFirePointService;
import com.xkrs.utilsnew.DateTimeUtils;
import com.xkrs.utilsnew.FirePointDispatchUtils;
import com.xkrs.utilsnew.FirePointFilterUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.i18n.LocaleContextHolder;

32
src/main/java/com/xkrs/straw/service/impl/FirePointServiceImpl.java → src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java
View File

@ -1,21 +1,21 @@
package com.xkrs.straw.service.impl;
package com.xkrs.service.impl;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.service.FirePointService;
import com.xkrs.straw.dao.CountyCodeWeiXinDao;
import com.xkrs.straw.dao.FirePointOrdinaryDao;
import com.xkrs.straw.dao.StreetDao;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.helper.FirePointQueryManager;
import com.xkrs.straw.model.bean.FirePointQueryResultBean;
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.service.StreetService;
import com.xkrs.straw.utilsnew.DateTimeUtils;
import com.xkrs.straw.utilsnew.FirePointConvertUtils;
import com.xkrs.straw.utilsnew.TokenUtil;
import com.xkrs.service.FirePointService;
import com.xkrs.dao.CountyCodeWeiXinDao;
import com.xkrs.dao.FirePointOrdinaryDao;
import com.xkrs.dao.StreetDao;
import com.xkrs.dao.SysUserDao;
import com.xkrs.helper.FirePointQueryManager;
import com.xkrs.model.bean.FirePointQueryResultBean;
import com.xkrs.model.entity.FirePointOrdinaryEntity;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.model.helper.PushHelper;
import com.xkrs.model.vo.AllFirePointVo;
import com.xkrs.service.StreetService;
import com.xkrs.utilsnew.DateTimeUtils;
import com.xkrs.utilsnew.FirePointConvertUtils;
import com.xkrs.utilsnew.TokenUtil;
import org.apache.hc.core5.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -1,14 +1,14 @@
package com.xkrs.straw.service.impl;
package com.xkrs.service.impl;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.dao.NoticeDao;
import com.xkrs.straw.dao.NoticeRelaDao;
import com.xkrs.straw.dao.SysUserDao;
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.straw.utilsnew.TokenUtil;
import com.xkrs.dao.NoticeDao;
import com.xkrs.dao.NoticeRelaDao;
import com.xkrs.dao.SysUserDao;
import com.xkrs.model.entity.NoticeEntity;
import com.xkrs.model.entity.NoticeRelaEntity;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.service.NoticeService;
import com.xkrs.utilsnew.TokenUtil;
import org.apache.hc.core5.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -1,8 +1,8 @@
package com.xkrs.straw.service.impl;
package com.xkrs.service.impl;
import com.xkrs.straw.dao.StreetDao;
import com.xkrs.straw.model.entity.StreetEntity;
import com.xkrs.straw.service.StreetService;
import com.xkrs.dao.StreetDao;
import com.xkrs.model.entity.StreetEntity;
import com.xkrs.service.StreetService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

10
src/main/java/com/xkrs/straw/service/impl/SysAuthorityServiceImpl.java → src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.xkrs.straw.service.impl;
package com.xkrs.service.impl;
import com.xkrs.straw.service.SysAuthorityService;
import com.xkrs.straw.dao.RelRoleAuthorityDao;
import com.xkrs.straw.dao.SysAuthorityDao;
import com.xkrs.straw.model.entity.SysAuthorityEntity;
import com.xkrs.service.SysAuthorityService;
import com.xkrs.dao.RelRoleAuthorityDao;
import com.xkrs.dao.SysAuthorityDao;
import com.xkrs.model.entity.SysAuthorityEntity;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

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

@ -1,8 +1,8 @@
package com.xkrs.straw.service.impl;
package com.xkrs.service.impl;
import com.xkrs.straw.dao.SysRoleDao;
import com.xkrs.straw.model.entity.SysRoleEntity;
import com.xkrs.straw.service.SysRoleService;
import com.xkrs.dao.SysRoleDao;
import com.xkrs.model.entity.SysRoleEntity;
import com.xkrs.service.SysRoleService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;

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

@ -1,20 +1,20 @@
package com.xkrs.straw.service.impl;
package com.xkrs.service.impl;
import com.xkrs.common.encapsulation.PromptMessageEnum;
import com.xkrs.straw.dao.StreetDao;
import com.xkrs.straw.model.entity.StreetEntity;
import com.xkrs.straw.model.qo.SysUserQo;
import com.xkrs.straw.service.RedisService;
import com.xkrs.straw.dao.RelRoleAuthorityDao;
import com.xkrs.straw.dao.RelUserRoleDao;
import com.xkrs.straw.dao.SysRoleDao;
import com.xkrs.straw.dao.SysUserDao;
import com.xkrs.straw.model.entity.RelRoleAuthorityEntity;
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.utilsnew.VipTimeRangeUtils;
import com.xkrs.dao.StreetDao;
import com.xkrs.model.entity.StreetEntity;
import com.xkrs.model.qo.SysUserQo;
import com.xkrs.service.RedisService;
import com.xkrs.dao.RelRoleAuthorityDao;
import com.xkrs.dao.RelUserRoleDao;
import com.xkrs.dao.SysRoleDao;
import com.xkrs.dao.SysUserDao;
import com.xkrs.model.entity.RelRoleAuthorityEntity;
import com.xkrs.model.entity.RelUserRoleEntity;
import com.xkrs.model.entity.SysRoleEntity;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.service.SysUserService;
import com.xkrs.utilsnew.VipTimeRangeUtils;
import org.apache.http.util.TextUtils;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.data.domain.Sort;
@ -32,8 +32,8 @@ import java.util.List;
import java.util.Locale;
import static com.xkrs.common.encapsulation.OutputEncapsulation.outputEncapsulationObject;
import static com.xkrs.straw.utilsold.DateTimeUtil.dateTimeToString;
import static com.xkrs.straw.utilsnew.EncryptDecryptUtil.encry256;
import static com.xkrs.utilsold.DateTimeUtil.dateTimeToString;
import static com.xkrs.utilsnew.EncryptDecryptUtil.encry256;
/**
* 系统用户服务实现

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.aliyuncs.DefaultAcsClient;
import com.aliyuncs.IAcsClient;

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
public interface CommonConstant {

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

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

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

4
src/main/java/com/xkrs/straw/utilsnew/FirePointCodeUtils.java → src/main/java/com/xkrs/utilsnew/FirePointCodeUtils.java
View File

@ -1,6 +1,6 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.model.entity.SysUserEntity;
import org.apache.hc.core5.util.TextUtils;
import java.util.ArrayList;

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

@ -1,8 +1,8 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
import com.xkrs.straw.model.entity.FirePointPreciseEntity;
import com.xkrs.straw.model.vo.AllFirePointVo;
import com.xkrs.model.entity.FirePointOrdinaryEntity;
import com.xkrs.model.entity.FirePointPreciseEntity;
import com.xkrs.model.vo.AllFirePointVo;
/**
* AllFirePointVo输出格式转化工具

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

@ -1,8 +1,8 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.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.model.bean.FirePointChannelConfigBean;
import com.xkrs.model.entity.FirePointChannelConfigEntity;
import com.xkrs.service.impl.DispatchFirePointServiceImpl;
import org.apache.hc.core5.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

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

@ -1,10 +1,10 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.xkrs.straw.dao.FirePointOrdinaryDao;
import com.xkrs.straw.dao.FirePointPreciseDao;
import com.xkrs.straw.model.bean.DataWrapper2;
import com.xkrs.straw.model.entity.FirePointOrdinaryEntity;
import com.xkrs.straw.model.entity.FirePointPreciseEntity;
import com.xkrs.dao.FirePointOrdinaryDao;
import com.xkrs.dao.FirePointPreciseDao;
import com.xkrs.model.bean.DataWrapper2;
import com.xkrs.model.entity.FirePointOrdinaryEntity;
import com.xkrs.model.entity.FirePointPreciseEntity;
import org.springframework.data.jpa.domain.Specification;
import javax.persistence.criteria.Predicate;

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import org.apache.hc.core5.util.TextUtils;

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

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import java.util.Random;

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

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

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

@ -1,7 +1,7 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.xkrs.straw.model.entity.SysUserEntity;
import com.xkrs.straw.model.vo.SysUserVo;
import com.xkrs.model.entity.SysUserEntity;
import com.xkrs.model.vo.SysUserVo;
public class SysUserConvertUtils {

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

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

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

@ -1,7 +1,7 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.xkrs.straw.model.bean.VipLocalDateTimeRangePair;
import com.xkrs.straw.model.bean.VipTimeRangeBean;
import com.xkrs.model.bean.VipLocalDateTimeRangePair;
import com.xkrs.model.bean.VipTimeRangeBean;
import org.apache.hc.core5.util.TextUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/com/xkrs/straw/utilsnew/WeiXinMessageUtils.java → src/main/java/com/xkrs/utilsnew/WeiXinMessageUtils.java
View File

@ -1,11 +1,11 @@
package com.xkrs.straw.utilsnew;
package com.xkrs.utilsnew;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.util.HashMap;
import java.util.Map;
import static com.xkrs.straw.utilsold.WDHttpClientUtils.sendHttpPost;
import static com.xkrs.utilsold.WDHttpClientUtils.sendHttpPost;
public class WeiXinMessageUtils {

2
src/main/java/com/xkrs/straw/utilsold/DateTimeUtil.java → src/main/java/com/xkrs/utilsold/DateTimeUtil.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsold;
package com.xkrs.utilsold;
import org.apache.hc.core5.util.TextUtils;

10
src/main/java/com/xkrs/straw/utilsold/GaoDeApiUtil.java → src/main/java/com/xkrs/utilsold/GaoDeApiUtil.java
View File

@ -1,7 +1,7 @@
package com.xkrs.straw.utilsold;
package com.xkrs.utilsold;
import com.alibaba.fastjson.JSON;
import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo;
import com.xkrs.model.vo.GaoDeIgGeocodeVo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -10,9 +10,9 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import static com.xkrs.straw.utilsnew.CommonConstant.INVERSEGEOGRAPHY_KEY;
import static com.xkrs.straw.utilsnew.CommonConstant.INVERSEGEOGRAPHY_URL;
import static com.xkrs.straw.utilsold.HttpClientUtils.sendHttpsGet;
import static com.xkrs.utilsnew.CommonConstant.INVERSEGEOGRAPHY_KEY;
import static com.xkrs.utilsnew.CommonConstant.INVERSEGEOGRAPHY_URL;
import static com.xkrs.utilsold.HttpClientUtils.sendHttpsGet;
/**
* @author wudong

2
src/main/java/com/xkrs/straw/utilsold/HttpClientUtils.java → src/main/java/com/xkrs/utilsold/HttpClientUtils.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsold;
package com.xkrs.utilsold;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;

2
src/main/java/com/xkrs/straw/utilsold/WDHttpClientUtils.java → src/main/java/com/xkrs/utilsold/WDHttpClientUtils.java
View File

@ -1,4 +1,4 @@
package com.xkrs.straw.utilsold;
package com.xkrs.utilsold;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;