diff --git a/src/main/java/com/xkrs/common/StaticScheduleTask.java b/src/main/java/com/xkrs/common/StaticScheduleTask.java index 2e5100b..d128c5d 100644 --- a/src/main/java/com/xkrs/common/StaticScheduleTask.java +++ b/src/main/java/com/xkrs/common/StaticScheduleTask.java @@ -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; diff --git a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java index 287d646..0371c7a 100644 --- a/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java +++ b/src/main/java/com/xkrs/common/account/CustomAuthenticationProvider.java @@ -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 diff --git a/src/main/java/com/xkrs/common/account/JwtLoginFilter.java b/src/main/java/com/xkrs/common/account/JwtLoginFilter.java index 2b5cc3a..cf869f9 100644 --- a/src/main/java/com/xkrs/common/account/JwtLoginFilter.java +++ b/src/main/java/com/xkrs/common/account/JwtLoginFilter.java @@ -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; diff --git a/src/main/java/com/xkrs/common/account/TokenAuthenticationService.java b/src/main/java/com/xkrs/common/account/TokenAuthenticationService.java index 93e23d6..3715e4a 100644 --- a/src/main/java/com/xkrs/common/account/TokenAuthenticationService.java +++ b/src/main/java/com/xkrs/common/account/TokenAuthenticationService.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java b/src/main/java/com/xkrs/controller/DispatchFirePointController.java similarity index 90% rename from src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java rename to src/main/java/com/xkrs/controller/DispatchFirePointController.java index c2558f2..3dc7d97 100644 --- a/src/main/java/com/xkrs/straw/controller/DispatchFirePointController.java +++ b/src/main/java/com/xkrs/controller/DispatchFirePointController.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/controller/FirePointController.java b/src/main/java/com/xkrs/controller/FirePointController.java similarity index 95% rename from src/main/java/com/xkrs/straw/controller/FirePointController.java rename to src/main/java/com/xkrs/controller/FirePointController.java index 4af843b..e890490 100644 --- a/src/main/java/com/xkrs/straw/controller/FirePointController.java +++ b/src/main/java/com/xkrs/controller/FirePointController.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java b/src/main/java/com/xkrs/controller/GaoDeApiController.java similarity index 92% rename from src/main/java/com/xkrs/straw/controller/GaoDeApiController.java rename to src/main/java/com/xkrs/controller/GaoDeApiController.java index 2c8b7ef..826b5b3 100644 --- a/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java +++ b/src/main/java/com/xkrs/controller/GaoDeApiController.java @@ -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 diff --git a/src/main/java/com/xkrs/straw/controller/NoticeController.java b/src/main/java/com/xkrs/controller/NoticeController.java similarity index 92% rename from src/main/java/com/xkrs/straw/controller/NoticeController.java rename to src/main/java/com/xkrs/controller/NoticeController.java index 8d11d81..28c9376 100644 --- a/src/main/java/com/xkrs/straw/controller/NoticeController.java +++ b/src/main/java/com/xkrs/controller/NoticeController.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/controller/PushController.java b/src/main/java/com/xkrs/controller/PushController.java similarity index 91% rename from src/main/java/com/xkrs/straw/controller/PushController.java rename to src/main/java/com/xkrs/controller/PushController.java index 860299f..a6d909e 100644 --- a/src/main/java/com/xkrs/straw/controller/PushController.java +++ b/src/main/java/com/xkrs/controller/PushController.java @@ -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.*; diff --git a/src/main/java/com/xkrs/straw/controller/StreetController.java b/src/main/java/com/xkrs/controller/StreetController.java similarity index 97% rename from src/main/java/com/xkrs/straw/controller/StreetController.java rename to src/main/java/com/xkrs/controller/StreetController.java index 5ff70a7..88296bd 100644 --- a/src/main/java/com/xkrs/straw/controller/StreetController.java +++ b/src/main/java/com/xkrs/controller/StreetController.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/controller/StreettController.java b/src/main/java/com/xkrs/controller/StreettController.java similarity index 97% rename from src/main/java/com/xkrs/straw/controller/StreettController.java rename to src/main/java/com/xkrs/controller/StreettController.java index f8b8baf..479fce6 100644 --- a/src/main/java/com/xkrs/straw/controller/StreettController.java +++ b/src/main/java/com/xkrs/controller/StreettController.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/controller/SysUserController.java b/src/main/java/com/xkrs/controller/SysUserController.java similarity index 96% rename from src/main/java/com/xkrs/straw/controller/SysUserController.java rename to src/main/java/com/xkrs/controller/SysUserController.java index 0063448..6fbfe57 100644 --- a/src/main/java/com/xkrs/straw/controller/SysUserController.java +++ b/src/main/java/com/xkrs/controller/SysUserController.java @@ -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 diff --git a/src/main/java/com/xkrs/straw/dao/CountyCodeWeiXinDao.java b/src/main/java/com/xkrs/dao/CountyCodeWeiXinDao.java similarity index 80% rename from src/main/java/com/xkrs/straw/dao/CountyCodeWeiXinDao.java rename to src/main/java/com/xkrs/dao/CountyCodeWeiXinDao.java index 386eafe..c1ab9a4 100644 --- a/src/main/java/com/xkrs/straw/dao/CountyCodeWeiXinDao.java +++ b/src/main/java/com/xkrs/dao/CountyCodeWeiXinDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/FirePointChannelConfigDao.java b/src/main/java/com/xkrs/dao/FirePointChannelConfigDao.java similarity index 79% rename from src/main/java/com/xkrs/straw/dao/FirePointChannelConfigDao.java rename to src/main/java/com/xkrs/dao/FirePointChannelConfigDao.java index 98f4e4e..d4a804a 100644 --- a/src/main/java/com/xkrs/straw/dao/FirePointChannelConfigDao.java +++ b/src/main/java/com/xkrs/dao/FirePointChannelConfigDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/FirePointOrdinaryDao.java b/src/main/java/com/xkrs/dao/FirePointOrdinaryDao.java similarity index 79% rename from src/main/java/com/xkrs/straw/dao/FirePointOrdinaryDao.java rename to src/main/java/com/xkrs/dao/FirePointOrdinaryDao.java index 1517bf8..8b449d4 100644 --- a/src/main/java/com/xkrs/straw/dao/FirePointOrdinaryDao.java +++ b/src/main/java/com/xkrs/dao/FirePointOrdinaryDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/FirePointPreciseDao.java b/src/main/java/com/xkrs/dao/FirePointPreciseDao.java similarity index 79% rename from src/main/java/com/xkrs/straw/dao/FirePointPreciseDao.java rename to src/main/java/com/xkrs/dao/FirePointPreciseDao.java index 531b5b3..7819108 100644 --- a/src/main/java/com/xkrs/straw/dao/FirePointPreciseDao.java +++ b/src/main/java/com/xkrs/dao/FirePointPreciseDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/NoticeDao.java b/src/main/java/com/xkrs/dao/NoticeDao.java similarity index 80% rename from src/main/java/com/xkrs/straw/dao/NoticeDao.java rename to src/main/java/com/xkrs/dao/NoticeDao.java index 9f22283..51dc1b5 100644 --- a/src/main/java/com/xkrs/straw/dao/NoticeDao.java +++ b/src/main/java/com/xkrs/dao/NoticeDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/NoticeRelaDao.java b/src/main/java/com/xkrs/dao/NoticeRelaDao.java similarity index 79% rename from src/main/java/com/xkrs/straw/dao/NoticeRelaDao.java rename to src/main/java/com/xkrs/dao/NoticeRelaDao.java index 09d6394..e800b86 100644 --- a/src/main/java/com/xkrs/straw/dao/NoticeRelaDao.java +++ b/src/main/java/com/xkrs/dao/NoticeRelaDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/RelRoleAuthorityDao.java b/src/main/java/com/xkrs/dao/RelRoleAuthorityDao.java similarity index 89% rename from src/main/java/com/xkrs/straw/dao/RelRoleAuthorityDao.java rename to src/main/java/com/xkrs/dao/RelRoleAuthorityDao.java index ca88274..bba7018 100644 --- a/src/main/java/com/xkrs/straw/dao/RelRoleAuthorityDao.java +++ b/src/main/java/com/xkrs/dao/RelRoleAuthorityDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/RelUserRoleDao.java b/src/main/java/com/xkrs/dao/RelUserRoleDao.java similarity index 79% rename from src/main/java/com/xkrs/straw/dao/RelUserRoleDao.java rename to src/main/java/com/xkrs/dao/RelUserRoleDao.java index 0f679e6..2396fae 100644 --- a/src/main/java/com/xkrs/straw/dao/RelUserRoleDao.java +++ b/src/main/java/com/xkrs/dao/RelUserRoleDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/StreetDao.java b/src/main/java/com/xkrs/dao/StreetDao.java similarity index 95% rename from src/main/java/com/xkrs/straw/dao/StreetDao.java rename to src/main/java/com/xkrs/dao/StreetDao.java index c72f19c..928c0d8 100644 --- a/src/main/java/com/xkrs/straw/dao/StreetDao.java +++ b/src/main/java/com/xkrs/dao/StreetDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/SysAuthorityDao.java b/src/main/java/com/xkrs/dao/SysAuthorityDao.java similarity index 84% rename from src/main/java/com/xkrs/straw/dao/SysAuthorityDao.java rename to src/main/java/com/xkrs/dao/SysAuthorityDao.java index f9d4540..329469c 100644 --- a/src/main/java/com/xkrs/straw/dao/SysAuthorityDao.java +++ b/src/main/java/com/xkrs/dao/SysAuthorityDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/SysRoleDao.java b/src/main/java/com/xkrs/dao/SysRoleDao.java similarity index 95% rename from src/main/java/com/xkrs/straw/dao/SysRoleDao.java rename to src/main/java/com/xkrs/dao/SysRoleDao.java index 2fa9b43..6729aeb 100644 --- a/src/main/java/com/xkrs/straw/dao/SysRoleDao.java +++ b/src/main/java/com/xkrs/dao/SysRoleDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/dao/SysUserDao.java b/src/main/java/com/xkrs/dao/SysUserDao.java similarity index 97% rename from src/main/java/com/xkrs/straw/dao/SysUserDao.java rename to src/main/java/com/xkrs/dao/SysUserDao.java index b0ded8e..7d2e6e4 100644 --- a/src/main/java/com/xkrs/straw/dao/SysUserDao.java +++ b/src/main/java/com/xkrs/dao/SysUserDao.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/helper/FirePointPushManager.java b/src/main/java/com/xkrs/helper/FirePointPushManager.java similarity index 89% rename from src/main/java/com/xkrs/straw/helper/FirePointPushManager.java rename to src/main/java/com/xkrs/helper/FirePointPushManager.java index 8acf9c3..c10d690 100644 --- a/src/main/java/com/xkrs/straw/helper/FirePointPushManager.java +++ b/src/main/java/com/xkrs/helper/FirePointPushManager.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/helper/FirePointQueryManager.java b/src/main/java/com/xkrs/helper/FirePointQueryManager.java similarity index 96% rename from src/main/java/com/xkrs/straw/helper/FirePointQueryManager.java rename to src/main/java/com/xkrs/helper/FirePointQueryManager.java index 0d19c4d..5149011 100644 --- a/src/main/java/com/xkrs/straw/helper/FirePointQueryManager.java +++ b/src/main/java/com/xkrs/helper/FirePointQueryManager.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/helper/FirePointSubscribeManager.java b/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java similarity index 92% rename from src/main/java/com/xkrs/straw/helper/FirePointSubscribeManager.java rename to src/main/java/com/xkrs/helper/FirePointSubscribeManager.java index 01eced1..3fc8d75 100644 --- a/src/main/java/com/xkrs/straw/helper/FirePointSubscribeManager.java +++ b/src/main/java/com/xkrs/helper/FirePointSubscribeManager.java @@ -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 { diff --git a/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java b/src/main/java/com/xkrs/helper/GeoCodeHelper.java similarity index 95% rename from src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java rename to src/main/java/com/xkrs/helper/GeoCodeHelper.java index 18ecdff..b4a6de6 100644 --- a/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java +++ b/src/main/java/com/xkrs/helper/GeoCodeHelper.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/model/bean/DataWrapper.java b/src/main/java/com/xkrs/model/bean/DataWrapper.java similarity index 90% rename from src/main/java/com/xkrs/straw/model/bean/DataWrapper.java rename to src/main/java/com/xkrs/model/bean/DataWrapper.java index 2749ec4..b932f1e 100644 --- a/src/main/java/com/xkrs/straw/model/bean/DataWrapper.java +++ b/src/main/java/com/xkrs/model/bean/DataWrapper.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; public class DataWrapper { diff --git a/src/main/java/com/xkrs/straw/model/bean/DataWrapper2.java b/src/main/java/com/xkrs/model/bean/DataWrapper2.java similarity index 94% rename from src/main/java/com/xkrs/straw/model/bean/DataWrapper2.java rename to src/main/java/com/xkrs/model/bean/DataWrapper2.java index 713552a..4e0fc3b 100644 --- a/src/main/java/com/xkrs/straw/model/bean/DataWrapper2.java +++ b/src/main/java/com/xkrs/model/bean/DataWrapper2.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; public class DataWrapper2 { diff --git a/src/main/java/com/xkrs/straw/model/bean/DataWrapper3.java b/src/main/java/com/xkrs/model/bean/DataWrapper3.java similarity index 96% rename from src/main/java/com/xkrs/straw/model/bean/DataWrapper3.java rename to src/main/java/com/xkrs/model/bean/DataWrapper3.java index 3498640..a1c7be1 100644 --- a/src/main/java/com/xkrs/straw/model/bean/DataWrapper3.java +++ b/src/main/java/com/xkrs/model/bean/DataWrapper3.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; public class DataWrapper3 { diff --git a/src/main/java/com/xkrs/straw/model/bean/DataWrapper4.java b/src/main/java/com/xkrs/model/bean/DataWrapper4.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/bean/DataWrapper4.java rename to src/main/java/com/xkrs/model/bean/DataWrapper4.java index f2f638b..0395899 100644 --- a/src/main/java/com/xkrs/straw/model/bean/DataWrapper4.java +++ b/src/main/java/com/xkrs/model/bean/DataWrapper4.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; public class DataWrapper4 { diff --git a/src/main/java/com/xkrs/straw/model/bean/FirePointChannelConfigBean.java b/src/main/java/com/xkrs/model/bean/FirePointChannelConfigBean.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/bean/FirePointChannelConfigBean.java rename to src/main/java/com/xkrs/model/bean/FirePointChannelConfigBean.java index e3efe9c..6c590e5 100644 --- a/src/main/java/com/xkrs/straw/model/bean/FirePointChannelConfigBean.java +++ b/src/main/java/com/xkrs/model/bean/FirePointChannelConfigBean.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; import java.util.List; diff --git a/src/main/java/com/xkrs/straw/model/bean/FirePointQueryResultBean.java b/src/main/java/com/xkrs/model/bean/FirePointQueryResultBean.java similarity index 94% rename from src/main/java/com/xkrs/straw/model/bean/FirePointQueryResultBean.java rename to src/main/java/com/xkrs/model/bean/FirePointQueryResultBean.java index 4cb89de..7457767 100644 --- a/src/main/java/com/xkrs/straw/model/bean/FirePointQueryResultBean.java +++ b/src/main/java/com/xkrs/model/bean/FirePointQueryResultBean.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/model/bean/KeyValueBean.java b/src/main/java/com/xkrs/model/bean/KeyValueBean.java similarity index 94% rename from src/main/java/com/xkrs/straw/model/bean/KeyValueBean.java rename to src/main/java/com/xkrs/model/bean/KeyValueBean.java index 4054586..3380758 100644 --- a/src/main/java/com/xkrs/straw/model/bean/KeyValueBean.java +++ b/src/main/java/com/xkrs/model/bean/KeyValueBean.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; public class KeyValueBean { diff --git a/src/main/java/com/xkrs/straw/model/bean/LocalDateTimeRange.java b/src/main/java/com/xkrs/model/bean/LocalDateTimeRange.java similarity index 95% rename from src/main/java/com/xkrs/straw/model/bean/LocalDateTimeRange.java rename to src/main/java/com/xkrs/model/bean/LocalDateTimeRange.java index 56515a5..7ac2fc3 100644 --- a/src/main/java/com/xkrs/straw/model/bean/LocalDateTimeRange.java +++ b/src/main/java/com/xkrs/model/bean/LocalDateTimeRange.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; import java.time.LocalDateTime; diff --git a/src/main/java/com/xkrs/straw/model/bean/VipLocalDateTimeRangePair.java b/src/main/java/com/xkrs/model/bean/VipLocalDateTimeRangePair.java similarity index 94% rename from src/main/java/com/xkrs/straw/model/bean/VipLocalDateTimeRangePair.java rename to src/main/java/com/xkrs/model/bean/VipLocalDateTimeRangePair.java index 8d78cd7..b7429fc 100644 --- a/src/main/java/com/xkrs/straw/model/bean/VipLocalDateTimeRangePair.java +++ b/src/main/java/com/xkrs/model/bean/VipLocalDateTimeRangePair.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; import java.time.LocalDateTime; diff --git a/src/main/java/com/xkrs/straw/model/bean/VipTimeRangeBean.java b/src/main/java/com/xkrs/model/bean/VipTimeRangeBean.java similarity index 96% rename from src/main/java/com/xkrs/straw/model/bean/VipTimeRangeBean.java rename to src/main/java/com/xkrs/model/bean/VipTimeRangeBean.java index 32d7033..20289a5 100644 --- a/src/main/java/com/xkrs/straw/model/bean/VipTimeRangeBean.java +++ b/src/main/java/com/xkrs/model/bean/VipTimeRangeBean.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.bean; +package com.xkrs.model.bean; import java.util.List; diff --git a/src/main/java/com/xkrs/straw/model/entity/CountyCodeWeiXinEntity.java b/src/main/java/com/xkrs/model/entity/CountyCodeWeiXinEntity.java similarity index 98% rename from src/main/java/com/xkrs/straw/model/entity/CountyCodeWeiXinEntity.java rename to src/main/java/com/xkrs/model/entity/CountyCodeWeiXinEntity.java index f1d0d71..a8a8064 100644 --- a/src/main/java/com/xkrs/straw/model/entity/CountyCodeWeiXinEntity.java +++ b/src/main/java/com/xkrs/model/entity/CountyCodeWeiXinEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/FirePointChannelConfigEntity.java b/src/main/java/com/xkrs/model/entity/FirePointChannelConfigEntity.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/entity/FirePointChannelConfigEntity.java rename to src/main/java/com/xkrs/model/entity/FirePointChannelConfigEntity.java index 8a63f1a..0cadc11 100644 --- a/src/main/java/com/xkrs/straw/model/entity/FirePointChannelConfigEntity.java +++ b/src/main/java/com/xkrs/model/entity/FirePointChannelConfigEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java b/src/main/java/com/xkrs/model/entity/FirePointOrdinaryEntity.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java rename to src/main/java/com/xkrs/model/entity/FirePointOrdinaryEntity.java index e95e267..abc17a7 100644 --- a/src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java +++ b/src/main/java/com/xkrs/model/entity/FirePointOrdinaryEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java b/src/main/java/com/xkrs/model/entity/FirePointPreciseEntity.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java rename to src/main/java/com/xkrs/model/entity/FirePointPreciseEntity.java index 781bff1..a5052e0 100644 --- a/src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java +++ b/src/main/java/com/xkrs/model/entity/FirePointPreciseEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/LandEntity.java b/src/main/java/com/xkrs/model/entity/LandEntity.java similarity index 96% rename from src/main/java/com/xkrs/straw/model/entity/LandEntity.java rename to src/main/java/com/xkrs/model/entity/LandEntity.java index 4c06d93..5a5c613 100644 --- a/src/main/java/com/xkrs/straw/model/entity/LandEntity.java +++ b/src/main/java/com/xkrs/model/entity/LandEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; diff --git a/src/main/java/com/xkrs/straw/model/entity/NoticeEntity.java b/src/main/java/com/xkrs/model/entity/NoticeEntity.java similarity index 98% rename from src/main/java/com/xkrs/straw/model/entity/NoticeEntity.java rename to src/main/java/com/xkrs/model/entity/NoticeEntity.java index c43e1df..aa8cafc 100644 --- a/src/main/java/com/xkrs/straw/model/entity/NoticeEntity.java +++ b/src/main/java/com/xkrs/model/entity/NoticeEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/NoticeRelaEntity.java b/src/main/java/com/xkrs/model/entity/NoticeRelaEntity.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/entity/NoticeRelaEntity.java rename to src/main/java/com/xkrs/model/entity/NoticeRelaEntity.java index ae02df5..77f0385 100644 --- a/src/main/java/com/xkrs/straw/model/entity/NoticeRelaEntity.java +++ b/src/main/java/com/xkrs/model/entity/NoticeRelaEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/RelRoleAuthorityEntity.java b/src/main/java/com/xkrs/model/entity/RelRoleAuthorityEntity.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/entity/RelRoleAuthorityEntity.java rename to src/main/java/com/xkrs/model/entity/RelRoleAuthorityEntity.java index 342d8df..37b372e 100644 --- a/src/main/java/com/xkrs/straw/model/entity/RelRoleAuthorityEntity.java +++ b/src/main/java/com/xkrs/model/entity/RelRoleAuthorityEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/RelUserRoleEntity.java b/src/main/java/com/xkrs/model/entity/RelUserRoleEntity.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/entity/RelUserRoleEntity.java rename to src/main/java/com/xkrs/model/entity/RelUserRoleEntity.java index 2727676..3a6e414 100644 --- a/src/main/java/com/xkrs/straw/model/entity/RelUserRoleEntity.java +++ b/src/main/java/com/xkrs/model/entity/RelUserRoleEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/StreetEntity.java b/src/main/java/com/xkrs/model/entity/StreetEntity.java similarity index 98% rename from src/main/java/com/xkrs/straw/model/entity/StreetEntity.java rename to src/main/java/com/xkrs/model/entity/StreetEntity.java index d993b78..21624e3 100644 --- a/src/main/java/com/xkrs/straw/model/entity/StreetEntity.java +++ b/src/main/java/com/xkrs/model/entity/StreetEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/SysAuthorityEntity.java b/src/main/java/com/xkrs/model/entity/SysAuthorityEntity.java similarity index 98% rename from src/main/java/com/xkrs/straw/model/entity/SysAuthorityEntity.java rename to src/main/java/com/xkrs/model/entity/SysAuthorityEntity.java index 4a81f44..ee169d9 100644 --- a/src/main/java/com/xkrs/straw/model/entity/SysAuthorityEntity.java +++ b/src/main/java/com/xkrs/model/entity/SysAuthorityEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/SysRoleEntity.java b/src/main/java/com/xkrs/model/entity/SysRoleEntity.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/entity/SysRoleEntity.java rename to src/main/java/com/xkrs/model/entity/SysRoleEntity.java index 2fe7dfd..1884e98 100644 --- a/src/main/java/com/xkrs/straw/model/entity/SysRoleEntity.java +++ b/src/main/java/com/xkrs/model/entity/SysRoleEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java b/src/main/java/com/xkrs/model/entity/SysUserEntity.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java rename to src/main/java/com/xkrs/model/entity/SysUserEntity.java index ba775f3..8b88fd0 100644 --- a/src/main/java/com/xkrs/straw/model/entity/SysUserEntity.java +++ b/src/main/java/com/xkrs/model/entity/SysUserEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.entity; +package com.xkrs.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/model/helper/PushHelper.java b/src/main/java/com/xkrs/model/helper/PushHelper.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/helper/PushHelper.java rename to src/main/java/com/xkrs/model/helper/PushHelper.java index 8991589..68b4e4b 100644 --- a/src/main/java/com/xkrs/straw/model/helper/PushHelper.java +++ b/src/main/java/com/xkrs/model/helper/PushHelper.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java b/src/main/java/com/xkrs/model/qo/AllFirePointQo.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java rename to src/main/java/com/xkrs/model/qo/AllFirePointQo.java index 6559254..d703c20 100644 --- a/src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java +++ b/src/main/java/com/xkrs/model/qo/AllFirePointQo.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.qo; +package com.xkrs.model.qo; public class AllFirePointQo { diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserPushIdQo.java b/src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java similarity index 91% rename from src/main/java/com/xkrs/straw/model/qo/SysUserPushIdQo.java rename to src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java index 6339dfc..feb8f92 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserPushIdQo.java +++ b/src/main/java/com/xkrs/model/qo/SysUserPushIdQo.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.qo; +package com.xkrs.model.qo; public class SysUserPushIdQo { diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java b/src/main/java/com/xkrs/model/qo/SysUserQo.java similarity index 97% rename from src/main/java/com/xkrs/straw/model/qo/SysUserQo.java rename to src/main/java/com/xkrs/model/qo/SysUserQo.java index 3b8e6ee..c05cc99 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java +++ b/src/main/java/com/xkrs/model/qo/SysUserQo.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java b/src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java similarity index 90% rename from src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java rename to src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java index 55e8b1a..523c97e 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java +++ b/src/main/java/com/xkrs/model/qo/SysUserReceiveSmsQo.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java b/src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java similarity index 87% rename from src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java rename to src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java index 4269211..f728259 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java +++ b/src/main/java/com/xkrs/model/qo/SysUserRemarkQo.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java b/src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java similarity index 88% rename from src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java rename to src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java index 40543a8..dfdfca0 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java +++ b/src/main/java/com/xkrs/model/qo/SysUserVipLevelQo.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/model/va/SysUserQoInsert.java b/src/main/java/com/xkrs/model/va/SysUserQoInsert.java similarity index 72% rename from src/main/java/com/xkrs/straw/model/va/SysUserQoInsert.java rename to src/main/java/com/xkrs/model/va/SysUserQoInsert.java index 7c3fa50..d842a53 100644 --- a/src/main/java/com/xkrs/straw/model/va/SysUserQoInsert.java +++ b/src/main/java/com/xkrs/model/va/SysUserQoInsert.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.va; +package com.xkrs.model.va; /** * SysUserQoInsert diff --git a/src/main/java/com/xkrs/straw/model/va/SysUserQoUpdate.java b/src/main/java/com/xkrs/model/va/SysUserQoUpdate.java similarity index 72% rename from src/main/java/com/xkrs/straw/model/va/SysUserQoUpdate.java rename to src/main/java/com/xkrs/model/va/SysUserQoUpdate.java index 91172ad..c369218 100644 --- a/src/main/java/com/xkrs/straw/model/va/SysUserQoUpdate.java +++ b/src/main/java/com/xkrs/model/va/SysUserQoUpdate.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.va; +package com.xkrs.model.va; /** * SysUserQoUpdate diff --git a/src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java b/src/main/java/com/xkrs/model/vo/AllFirePointVo.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java rename to src/main/java/com/xkrs/model/vo/AllFirePointVo.java index fc4bf90..e859a76 100644 --- a/src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java +++ b/src/main/java/com/xkrs/model/vo/AllFirePointVo.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.vo; +package com.xkrs.model.vo; public class AllFirePointVo { diff --git a/src/main/java/com/xkrs/straw/model/vo/GaoDeIgGeocodeVo.java b/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/vo/GaoDeIgGeocodeVo.java rename to src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java index b13d9cd..71ebb1c 100644 --- a/src/main/java/com/xkrs/straw/model/vo/GaoDeIgGeocodeVo.java +++ b/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.vo; +package com.xkrs.model.vo; import java.util.List; diff --git a/src/main/java/com/xkrs/straw/model/vo/GaoDeWeatherVo.java b/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/vo/GaoDeWeatherVo.java rename to src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java index 131b708..d6d4f73 100644 --- a/src/main/java/com/xkrs/straw/model/vo/GaoDeWeatherVo.java +++ b/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.vo; +package com.xkrs.model.vo; import java.util.List; diff --git a/src/main/java/com/xkrs/straw/model/vo/SysUserVo.java b/src/main/java/com/xkrs/model/vo/SysUserVo.java similarity index 99% rename from src/main/java/com/xkrs/straw/model/vo/SysUserVo.java rename to src/main/java/com/xkrs/model/vo/SysUserVo.java index c36910b..7f86aa6 100644 --- a/src/main/java/com/xkrs/straw/model/vo/SysUserVo.java +++ b/src/main/java/com/xkrs/model/vo/SysUserVo.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.model.vo; +package com.xkrs.model.vo; public class SysUserVo { diff --git a/src/main/java/com/xkrs/straw/service/DispatchFirePointService.java b/src/main/java/com/xkrs/service/DispatchFirePointService.java similarity index 80% rename from src/main/java/com/xkrs/straw/service/DispatchFirePointService.java rename to src/main/java/com/xkrs/service/DispatchFirePointService.java index 363be23..7967f06 100644 --- a/src/main/java/com/xkrs/straw/service/DispatchFirePointService.java +++ b/src/main/java/com/xkrs/service/DispatchFirePointService.java @@ -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 { diff --git a/src/main/java/com/xkrs/straw/service/FirePointService.java b/src/main/java/com/xkrs/service/FirePointService.java similarity index 96% rename from src/main/java/com/xkrs/straw/service/FirePointService.java rename to src/main/java/com/xkrs/service/FirePointService.java index 57a5d10..53d4b93 100644 --- a/src/main/java/com/xkrs/straw/service/FirePointService.java +++ b/src/main/java/com/xkrs/service/FirePointService.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.service; +package com.xkrs.service; public interface FirePointService { diff --git a/src/main/java/com/xkrs/straw/service/NoticeService.java b/src/main/java/com/xkrs/service/NoticeService.java similarity index 87% rename from src/main/java/com/xkrs/straw/service/NoticeService.java rename to src/main/java/com/xkrs/service/NoticeService.java index bb94667..f010800 100644 --- a/src/main/java/com/xkrs/straw/service/NoticeService.java +++ b/src/main/java/com/xkrs/service/NoticeService.java @@ -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; /** * 公告栏通知接口 diff --git a/src/main/java/com/xkrs/straw/service/RedisService.java b/src/main/java/com/xkrs/service/RedisService.java similarity index 99% rename from src/main/java/com/xkrs/straw/service/RedisService.java rename to src/main/java/com/xkrs/service/RedisService.java index 69c486b..e0a14c9 100644 --- a/src/main/java/com/xkrs/straw/service/RedisService.java +++ b/src/main/java/com/xkrs/service/RedisService.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/StreetService.java b/src/main/java/com/xkrs/service/StreetService.java similarity index 90% rename from src/main/java/com/xkrs/straw/service/StreetService.java rename to src/main/java/com/xkrs/service/StreetService.java index 392894a..c676dfa 100644 --- a/src/main/java/com/xkrs/straw/service/StreetService.java +++ b/src/main/java/com/xkrs/service/StreetService.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/SysAuthorityService.java b/src/main/java/com/xkrs/service/SysAuthorityService.java similarity index 73% rename from src/main/java/com/xkrs/straw/service/SysAuthorityService.java rename to src/main/java/com/xkrs/service/SysAuthorityService.java index bdc81a7..a9e92f2 100644 --- a/src/main/java/com/xkrs/straw/service/SysAuthorityService.java +++ b/src/main/java/com/xkrs/service/SysAuthorityService.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/SysRoleService.java b/src/main/java/com/xkrs/service/SysRoleService.java similarity index 76% rename from src/main/java/com/xkrs/straw/service/SysRoleService.java rename to src/main/java/com/xkrs/service/SysRoleService.java index 2d03dca..9660d03 100644 --- a/src/main/java/com/xkrs/straw/service/SysRoleService.java +++ b/src/main/java/com/xkrs/service/SysRoleService.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/SysUserService.java b/src/main/java/com/xkrs/service/SysUserService.java similarity index 95% rename from src/main/java/com/xkrs/straw/service/SysUserService.java rename to src/main/java/com/xkrs/service/SysUserService.java index 3d68b54..9c2193b 100644 --- a/src/main/java/com/xkrs/straw/service/SysUserService.java +++ b/src/main/java/com/xkrs/service/SysUserService.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java similarity index 95% rename from src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java rename to src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java index 8b5bc68..9c68271 100644 --- a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/DispatchFirePointServiceImpl.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java similarity index 93% rename from src/main/java/com/xkrs/straw/service/impl/FirePointServiceImpl.java rename to src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index 63822f8..14da58d 100644 --- a/src/main/java/com/xkrs/straw/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java b/src/main/java/com/xkrs/service/impl/NoticeServiceImpl.java similarity index 95% rename from src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java rename to src/main/java/com/xkrs/service/impl/NoticeServiceImpl.java index 757022c..104fb5a 100644 --- a/src/main/java/com/xkrs/straw/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/NoticeServiceImpl.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/impl/StreetServiceImpl.java b/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java similarity index 92% rename from src/main/java/com/xkrs/straw/service/impl/StreetServiceImpl.java rename to src/main/java/com/xkrs/service/impl/StreetServiceImpl.java index f54ebec..a410194 100644 --- a/src/main/java/com/xkrs/straw/service/impl/StreetServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/impl/SysAuthorityServiceImpl.java b/src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java similarity index 73% rename from src/main/java/com/xkrs/straw/service/impl/SysAuthorityServiceImpl.java rename to src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java index c9e7ec8..64b5e5a 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysAuthorityServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/SysAuthorityServiceImpl.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/impl/SysRoleServiceImpl.java b/src/main/java/com/xkrs/service/impl/SysRoleServiceImpl.java similarity index 70% rename from src/main/java/com/xkrs/straw/service/impl/SysRoleServiceImpl.java rename to src/main/java/com/xkrs/service/impl/SysRoleServiceImpl.java index 54b7698..c6ecb03 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/SysRoleServiceImpl.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java b/src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java similarity index 94% rename from src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java rename to src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java index 8345675..e218585 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/SysUserServiceImpl.java @@ -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; /** * 系统用户服务实现 diff --git a/src/main/java/com/xkrs/straw/utilsnew/AliYunSmsUtils.java b/src/main/java/com/xkrs/utilsnew/AliYunSmsUtils.java similarity index 98% rename from src/main/java/com/xkrs/straw/utilsnew/AliYunSmsUtils.java rename to src/main/java/com/xkrs/utilsnew/AliYunSmsUtils.java index ac41cda..0166148 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/AliYunSmsUtils.java +++ b/src/main/java/com/xkrs/utilsnew/AliYunSmsUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; diff --git a/src/main/java/com/xkrs/straw/utilsnew/CommonConstant.java b/src/main/java/com/xkrs/utilsnew/CommonConstant.java similarity index 92% rename from src/main/java/com/xkrs/straw/utilsnew/CommonConstant.java rename to src/main/java/com/xkrs/utilsnew/CommonConstant.java index 9f775c9..e0bacaf 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/CommonConstant.java +++ b/src/main/java/com/xkrs/utilsnew/CommonConstant.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; public interface CommonConstant { diff --git a/src/main/java/com/xkrs/straw/utilsnew/DateTimeUtils.java b/src/main/java/com/xkrs/utilsnew/DateTimeUtils.java similarity index 96% rename from src/main/java/com/xkrs/straw/utilsnew/DateTimeUtils.java rename to src/main/java/com/xkrs/utilsnew/DateTimeUtils.java index d95649f..0881490 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/DateTimeUtils.java +++ b/src/main/java/com/xkrs/utilsnew/DateTimeUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/com/xkrs/straw/utilsnew/EncryptDecryptUtil.java b/src/main/java/com/xkrs/utilsnew/EncryptDecryptUtil.java similarity index 98% rename from src/main/java/com/xkrs/straw/utilsnew/EncryptDecryptUtil.java rename to src/main/java/com/xkrs/utilsnew/EncryptDecryptUtil.java index 3865a21..8bdead6 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/EncryptDecryptUtil.java +++ b/src/main/java/com/xkrs/utilsnew/EncryptDecryptUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointCodeUtils.java b/src/main/java/com/xkrs/utilsnew/FirePointCodeUtils.java similarity index 97% rename from src/main/java/com/xkrs/straw/utilsnew/FirePointCodeUtils.java rename to src/main/java/com/xkrs/utilsnew/FirePointCodeUtils.java index 2fad39e..ef0e5ab 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointCodeUtils.java +++ b/src/main/java/com/xkrs/utilsnew/FirePointCodeUtils.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointConvertUtils.java b/src/main/java/com/xkrs/utilsnew/FirePointConvertUtils.java similarity index 94% rename from src/main/java/com/xkrs/straw/utilsnew/FirePointConvertUtils.java rename to src/main/java/com/xkrs/utilsnew/FirePointConvertUtils.java index 2f45786..3dc45b7 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointConvertUtils.java +++ b/src/main/java/com/xkrs/utilsnew/FirePointConvertUtils.java @@ -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输出格式转化工具 diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java b/src/main/java/com/xkrs/utilsnew/FirePointDispatchUtils.java similarity index 97% rename from src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java rename to src/main/java/com/xkrs/utilsnew/FirePointDispatchUtils.java index 53d1f66..4a54f97 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointDispatchUtils.java +++ b/src/main/java/com/xkrs/utilsnew/FirePointDispatchUtils.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/utilsnew/FirePointFilterUtils.java b/src/main/java/com/xkrs/utilsnew/FirePointFilterUtils.java similarity index 93% rename from src/main/java/com/xkrs/straw/utilsnew/FirePointFilterUtils.java rename to src/main/java/com/xkrs/utilsnew/FirePointFilterUtils.java index a2f3bef..ac06eef 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/FirePointFilterUtils.java +++ b/src/main/java/com/xkrs/utilsnew/FirePointFilterUtils.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/utilsnew/JsonUtils.java b/src/main/java/com/xkrs/utilsnew/JsonUtils.java similarity index 97% rename from src/main/java/com/xkrs/straw/utilsnew/JsonUtils.java rename to src/main/java/com/xkrs/utilsnew/JsonUtils.java index aafd0af..7338307 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/JsonUtils.java +++ b/src/main/java/com/xkrs/utilsnew/JsonUtils.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/utilsnew/ListUtils.java b/src/main/java/com/xkrs/utilsnew/ListUtils.java similarity index 97% rename from src/main/java/com/xkrs/straw/utilsnew/ListUtils.java rename to src/main/java/com/xkrs/utilsnew/ListUtils.java index 3e31b1a..9280380 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/ListUtils.java +++ b/src/main/java/com/xkrs/utilsnew/ListUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; import org.apache.hc.core5.util.TextUtils; diff --git a/src/main/java/com/xkrs/straw/utilsnew/RandomUtil.java b/src/main/java/com/xkrs/utilsnew/RandomUtil.java similarity index 88% rename from src/main/java/com/xkrs/straw/utilsnew/RandomUtil.java rename to src/main/java/com/xkrs/utilsnew/RandomUtil.java index b5856e7..80be570 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/RandomUtil.java +++ b/src/main/java/com/xkrs/utilsnew/RandomUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; import java.util.Random; diff --git a/src/main/java/com/xkrs/straw/utilsnew/SMSUtils.java b/src/main/java/com/xkrs/utilsnew/SMSUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utilsnew/SMSUtils.java rename to src/main/java/com/xkrs/utilsnew/SMSUtils.java index 6d5bf94..117268f 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/SMSUtils.java +++ b/src/main/java/com/xkrs/utilsnew/SMSUtils.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; diff --git a/src/main/java/com/xkrs/straw/utilsnew/SysUserConvertUtils.java b/src/main/java/com/xkrs/utilsnew/SysUserConvertUtils.java similarity index 90% rename from src/main/java/com/xkrs/straw/utilsnew/SysUserConvertUtils.java rename to src/main/java/com/xkrs/utilsnew/SysUserConvertUtils.java index ba0c1d2..654ad1b 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/SysUserConvertUtils.java +++ b/src/main/java/com/xkrs/utilsnew/SysUserConvertUtils.java @@ -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 { diff --git a/src/main/java/com/xkrs/straw/utilsnew/TokenUtil.java b/src/main/java/com/xkrs/utilsnew/TokenUtil.java similarity index 97% rename from src/main/java/com/xkrs/straw/utilsnew/TokenUtil.java rename to src/main/java/com/xkrs/utilsnew/TokenUtil.java index 875c7f8..9b114ac 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/TokenUtil.java +++ b/src/main/java/com/xkrs/utilsnew/TokenUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsnew; +package com.xkrs.utilsnew; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java b/src/main/java/com/xkrs/utilsnew/VipTimeRangeUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java rename to src/main/java/com/xkrs/utilsnew/VipTimeRangeUtils.java index a239d9d..e5b45c3 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/VipTimeRangeUtils.java +++ b/src/main/java/com/xkrs/utilsnew/VipTimeRangeUtils.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/utilsnew/WeiXinMessageUtils.java b/src/main/java/com/xkrs/utilsnew/WeiXinMessageUtils.java similarity index 89% rename from src/main/java/com/xkrs/straw/utilsnew/WeiXinMessageUtils.java rename to src/main/java/com/xkrs/utilsnew/WeiXinMessageUtils.java index 11a1d2c..5d7c5da 100644 --- a/src/main/java/com/xkrs/straw/utilsnew/WeiXinMessageUtils.java +++ b/src/main/java/com/xkrs/utilsnew/WeiXinMessageUtils.java @@ -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 { diff --git a/src/main/java/com/xkrs/straw/utilsold/DateTimeUtil.java b/src/main/java/com/xkrs/utilsold/DateTimeUtil.java similarity index 98% rename from src/main/java/com/xkrs/straw/utilsold/DateTimeUtil.java rename to src/main/java/com/xkrs/utilsold/DateTimeUtil.java index 0600d01..f1c8cfc 100644 --- a/src/main/java/com/xkrs/straw/utilsold/DateTimeUtil.java +++ b/src/main/java/com/xkrs/utilsold/DateTimeUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.straw.utilsold; +package com.xkrs.utilsold; import org.apache.hc.core5.util.TextUtils; diff --git a/src/main/java/com/xkrs/straw/utilsold/GaoDeApiUtil.java b/src/main/java/com/xkrs/utilsold/GaoDeApiUtil.java similarity index 85% rename from src/main/java/com/xkrs/straw/utilsold/GaoDeApiUtil.java rename to src/main/java/com/xkrs/utilsold/GaoDeApiUtil.java index c83834b..fdf88a5 100644 --- a/src/main/java/com/xkrs/straw/utilsold/GaoDeApiUtil.java +++ b/src/main/java/com/xkrs/utilsold/GaoDeApiUtil.java @@ -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 diff --git a/src/main/java/com/xkrs/straw/utilsold/HttpClientUtils.java b/src/main/java/com/xkrs/utilsold/HttpClientUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utilsold/HttpClientUtils.java rename to src/main/java/com/xkrs/utilsold/HttpClientUtils.java index f36addc..dbcdbb6 100644 --- a/src/main/java/com/xkrs/straw/utilsold/HttpClientUtils.java +++ b/src/main/java/com/xkrs/utilsold/HttpClientUtils.java @@ -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; diff --git a/src/main/java/com/xkrs/straw/utilsold/WDHttpClientUtils.java b/src/main/java/com/xkrs/utilsold/WDHttpClientUtils.java similarity index 99% rename from src/main/java/com/xkrs/straw/utilsold/WDHttpClientUtils.java rename to src/main/java/com/xkrs/utilsold/WDHttpClientUtils.java index 504eb82..71f9199 100644 --- a/src/main/java/com/xkrs/straw/utilsold/WDHttpClientUtils.java +++ b/src/main/java/com/xkrs/utilsold/WDHttpClientUtils.java @@ -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;