From 53d2af1d3e8cdc013dfb9d120eb32088eef8fd97 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 8 Mar 2023 10:45:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xkrs/service/StreetService.java | 2 +- src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java | 4 ++-- src/main/java/com/xkrs/service/impl/StreetServiceImpl.java | 4 ++-- .../com/xkrs/{ => straw}/controller/StreetController.java | 4 ++-- .../com/xkrs/{ => straw}/controller/StreettController.java | 4 ++-- .../java/com/xkrs/{ => straw}/dao/CountyCodeWeiXinDao.java | 4 ++-- src/main/java/com/xkrs/{ => straw}/dao/StreetDao.java | 4 ++-- .../xkrs/{ => straw}/model/entity/CountyCodeWeiXinEntity.java | 2 +- .../java/com/xkrs/{ => straw}/model/entity/LandEntity.java | 2 +- .../java/com/xkrs/{ => straw}/model/entity/StreetEntity.java | 2 +- .../xkrs/straw/service/impl/DispatchFirePointServiceImpl.java | 4 ++-- .../java/com/xkrs/straw/service/impl/SysUserServiceImpl.java | 4 ++-- src/main/java/com/xkrs/straw/utils/FirePointPushManager.java | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) rename src/main/java/com/xkrs/{ => straw}/controller/StreetController.java (97%) rename src/main/java/com/xkrs/{ => straw}/controller/StreettController.java (97%) rename src/main/java/com/xkrs/{ => straw}/dao/CountyCodeWeiXinDao.java (80%) rename src/main/java/com/xkrs/{ => straw}/dao/StreetDao.java (95%) rename src/main/java/com/xkrs/{ => straw}/model/entity/CountyCodeWeiXinEntity.java (98%) rename src/main/java/com/xkrs/{ => straw}/model/entity/LandEntity.java (96%) rename src/main/java/com/xkrs/{ => straw}/model/entity/StreetEntity.java (98%) diff --git a/src/main/java/com/xkrs/service/StreetService.java b/src/main/java/com/xkrs/service/StreetService.java index c676dfa..a2abbf5 100644 --- a/src/main/java/com/xkrs/service/StreetService.java +++ b/src/main/java/com/xkrs/service/StreetService.java @@ -1,6 +1,6 @@ package com.xkrs.service; -import com.xkrs.model.entity.StreetEntity; +import com.xkrs.straw.model.entity.StreetEntity; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java index b53238e..092021b 100644 --- a/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/FirePointServiceImpl.java @@ -1,8 +1,8 @@ package com.xkrs.service.impl; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.dao.CountyCodeWeiXinDao; -import com.xkrs.dao.StreetDao; +import com.xkrs.straw.dao.CountyCodeWeiXinDao; +import com.xkrs.straw.dao.StreetDao; import com.xkrs.service.FirePointService; import com.xkrs.service.StreetService; import com.xkrs.straw.dao.FirePointOrdinaryDao; diff --git a/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java b/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java index a410194..0c61e1e 100644 --- a/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java +++ b/src/main/java/com/xkrs/service/impl/StreetServiceImpl.java @@ -1,7 +1,7 @@ package com.xkrs.service.impl; -import com.xkrs.dao.StreetDao; -import com.xkrs.model.entity.StreetEntity; +import com.xkrs.straw.dao.StreetDao; +import com.xkrs.straw.model.entity.StreetEntity; import com.xkrs.service.StreetService; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/xkrs/controller/StreetController.java b/src/main/java/com/xkrs/straw/controller/StreetController.java similarity index 97% rename from src/main/java/com/xkrs/controller/StreetController.java rename to src/main/java/com/xkrs/straw/controller/StreetController.java index 88296bd..5ff70a7 100644 --- a/src/main/java/com/xkrs/controller/StreetController.java +++ b/src/main/java/com/xkrs/straw/controller/StreetController.java @@ -1,7 +1,7 @@ -package com.xkrs.controller; +package com.xkrs.straw.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.dao.StreetDao; +import com.xkrs.straw.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/controller/StreettController.java b/src/main/java/com/xkrs/straw/controller/StreettController.java similarity index 97% rename from src/main/java/com/xkrs/controller/StreettController.java rename to src/main/java/com/xkrs/straw/controller/StreettController.java index 479fce6..f8b8baf 100644 --- a/src/main/java/com/xkrs/controller/StreettController.java +++ b/src/main/java/com/xkrs/straw/controller/StreettController.java @@ -1,7 +1,7 @@ -package com.xkrs.controller; +package com.xkrs.straw.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.dao.StreetDao; +import com.xkrs.straw.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/dao/CountyCodeWeiXinDao.java b/src/main/java/com/xkrs/straw/dao/CountyCodeWeiXinDao.java similarity index 80% rename from src/main/java/com/xkrs/dao/CountyCodeWeiXinDao.java rename to src/main/java/com/xkrs/straw/dao/CountyCodeWeiXinDao.java index c1ab9a4..386eafe 100644 --- a/src/main/java/com/xkrs/dao/CountyCodeWeiXinDao.java +++ b/src/main/java/com/xkrs/straw/dao/CountyCodeWeiXinDao.java @@ -1,6 +1,6 @@ -package com.xkrs.dao; +package com.xkrs.straw.dao; -import com.xkrs.model.entity.CountyCodeWeiXinEntity; +import com.xkrs.straw.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/dao/StreetDao.java b/src/main/java/com/xkrs/straw/dao/StreetDao.java similarity index 95% rename from src/main/java/com/xkrs/dao/StreetDao.java rename to src/main/java/com/xkrs/straw/dao/StreetDao.java index 928c0d8..c72f19c 100644 --- a/src/main/java/com/xkrs/dao/StreetDao.java +++ b/src/main/java/com/xkrs/straw/dao/StreetDao.java @@ -1,6 +1,6 @@ -package com.xkrs.dao; +package com.xkrs.straw.dao; -import com.xkrs.model.entity.StreetEntity; +import com.xkrs.straw.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/model/entity/CountyCodeWeiXinEntity.java b/src/main/java/com/xkrs/straw/model/entity/CountyCodeWeiXinEntity.java similarity index 98% rename from src/main/java/com/xkrs/model/entity/CountyCodeWeiXinEntity.java rename to src/main/java/com/xkrs/straw/model/entity/CountyCodeWeiXinEntity.java index a8a8064..f1d0d71 100644 --- a/src/main/java/com/xkrs/model/entity/CountyCodeWeiXinEntity.java +++ b/src/main/java/com/xkrs/straw/model/entity/CountyCodeWeiXinEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.model.entity; +package com.xkrs.straw.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/model/entity/LandEntity.java b/src/main/java/com/xkrs/straw/model/entity/LandEntity.java similarity index 96% rename from src/main/java/com/xkrs/model/entity/LandEntity.java rename to src/main/java/com/xkrs/straw/model/entity/LandEntity.java index 5a5c613..4c06d93 100644 --- a/src/main/java/com/xkrs/model/entity/LandEntity.java +++ b/src/main/java/com/xkrs/straw/model/entity/LandEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.model.entity; +package com.xkrs.straw.model.entity; import javax.persistence.*; diff --git a/src/main/java/com/xkrs/model/entity/StreetEntity.java b/src/main/java/com/xkrs/straw/model/entity/StreetEntity.java similarity index 98% rename from src/main/java/com/xkrs/model/entity/StreetEntity.java rename to src/main/java/com/xkrs/straw/model/entity/StreetEntity.java index 21624e3..d993b78 100644 --- a/src/main/java/com/xkrs/model/entity/StreetEntity.java +++ b/src/main/java/com/xkrs/straw/model/entity/StreetEntity.java @@ -1,4 +1,4 @@ -package com.xkrs.model.entity; +package com.xkrs.straw.model.entity; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java index 07c9630..a07b7e5 100644 --- a/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/DispatchFirePointServiceImpl.java @@ -1,8 +1,8 @@ package com.xkrs.straw.service.impl; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.dao.StreetDao; -import com.xkrs.model.entity.StreetEntity; +import com.xkrs.straw.dao.StreetDao; +import com.xkrs.straw.model.entity.StreetEntity; import com.xkrs.straw.dao.FirePointChannelConfigDao; import com.xkrs.straw.dao.FirePointOrdinaryDao; import com.xkrs.straw.dao.FirePointPreciseDao; diff --git a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java index 0a532a3..4ab3849 100644 --- a/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/xkrs/straw/service/impl/SysUserServiceImpl.java @@ -1,8 +1,8 @@ package com.xkrs.straw.service.impl; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.dao.StreetDao; -import com.xkrs.model.entity.StreetEntity; +import com.xkrs.straw.dao.StreetDao; +import com.xkrs.straw.model.entity.StreetEntity; import com.xkrs.straw.model.qo.SysUserQo; import com.xkrs.service.RedisService; import com.xkrs.straw.dao.RelRoleAuthorityDao; diff --git a/src/main/java/com/xkrs/straw/utils/FirePointPushManager.java b/src/main/java/com/xkrs/straw/utils/FirePointPushManager.java index 57b6728..a0c07d1 100644 --- a/src/main/java/com/xkrs/straw/utils/FirePointPushManager.java +++ b/src/main/java/com/xkrs/straw/utils/FirePointPushManager.java @@ -1,7 +1,7 @@ package com.xkrs.straw.utils; -import com.xkrs.dao.CountyCodeWeiXinDao; -import com.xkrs.model.entity.CountyCodeWeiXinEntity; +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;