diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-client/pom.xml b/epmet-plugins-module/pli-power-base/pli-power-base-client/pom.xml similarity index 93% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-client/pom.xml rename to epmet-plugins-module/pli-power-base/pli-power-base-client/pom.xml index b0735aa..a00bb69 100644 --- a/epmet-plugins-module/pli-power-axis/pli-power-axis-client/pom.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/pom.xml @@ -9,7 +9,7 @@ 2.0.0 - pli-power-axis-client + pli-power-base-client jar diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/.gitkeep b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/.gitkeep similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/.gitkeep rename to epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/.gitkeep diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java rename to epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerAxisStructDTO.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java rename to epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerKernelHouseholdDTO.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerServiceStationDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerServiceStationDTO.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerServiceStationDTO.java rename to epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/axis/PowerServiceStationDTO.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/feign/.gitkeep b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/.gitkeep similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-client/src/main/java/com/epmet/plugin/power/feign/.gitkeep rename to epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/.gitkeep diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/Dockerfile b/epmet-plugins-module/pli-power-base/pli-power-base-server/Dockerfile similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/Dockerfile rename to epmet-plugins-module/pli-power-base/pli-power-base-server/Dockerfile diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/deploy/docker-compose-dev.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-dev.yml similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/deploy/docker-compose-dev.yml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-dev.yml diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/deploy/docker-compose-prod.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/deploy/docker-compose-prod.yml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-prod.yml diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/deploy/docker-compose-test.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-test.yml similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/deploy/docker-compose-test.yml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/deploy/docker-compose-test.yml diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/pom.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml similarity index 99% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/pom.xml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml index 569fb08..26b8c7e 100644 --- a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/pom.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml @@ -8,7 +8,7 @@ pli-power-axis 2.0.0 - pli-power-axis-server + pli-power-base-server jar diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/PliPowerAxisApplication.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/PliPowerAxisApplication.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/PliPowerAxisApplication.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/PliPowerAxisApplication.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/aspect/RequestLogAspect.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/aspect/RequestLogAspect.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/aspect/RequestLogAspect.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/aspect/RequestLogAspect.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/config/ModuleConfigImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/config/ModuleConfigImpl.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/config/ModuleConfigImpl.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/config/ModuleConfigImpl.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/config/NacosServiceListListenerRegisterer.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/config/NacosServiceListListenerRegisterer.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/config/NacosServiceListListenerRegisterer.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/config/NacosServiceListListenerRegisterer.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/constant/.gitkeep b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/constant/.gitkeep similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/constant/.gitkeep rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/constant/.gitkeep diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/healthcheck/HealthCheckController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/healthcheck/HealthCheckController.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/healthcheck/HealthCheckController.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/healthcheck/HealthCheckController.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerServiceStationController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerServiceStationController.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerServiceStationController.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerServiceStationController.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerServiceStationDao.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerAxisStructEntity.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelHouseholdEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelHouseholdEntity.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelHouseholdEntity.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerKernelHouseholdEntity.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerServiceStationEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerServiceStationEntity.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerServiceStationEntity.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/entity/PowerServiceStationEntity.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerAxisStructExcel.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerAxisStructExcel.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerAxisStructExcel.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerAxisStructExcel.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerKernelHouseholdExcel.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerKernelHouseholdExcel.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerKernelHouseholdExcel.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerKernelHouseholdExcel.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerServiceStationExcel.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerServiceStationExcel.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerServiceStationExcel.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/excel/PowerServiceStationExcel.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerAxisStructRedis.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerAxisStructRedis.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerAxisStructRedis.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerAxisStructRedis.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerKernelHouseholdRedis.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerKernelHouseholdRedis.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerKernelHouseholdRedis.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerKernelHouseholdRedis.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerServiceStationRedis.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerServiceStationRedis.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerServiceStationRedis.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/redis/PowerServiceStationRedis.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerKernelHouseholdService.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerServiceStationService.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/exception/ModuleErrorCode.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/exception/ModuleErrorCode.java similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/exception/ModuleErrorCode.java rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/exception/ModuleErrorCode.java diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/feign/.gitkeep b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/feign/.gitkeep similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/feign/.gitkeep rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/feign/.gitkeep diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/utils/.gitkeep b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/.gitkeep similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/java/com/epmet/plugin/power/modules/utils/.gitkeep rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/utils/.gitkeep diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/bootstrap.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml similarity index 98% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/bootstrap.yml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml index 8c856b5..2d57da4 100644 --- a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/bootstrap.yml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml @@ -8,7 +8,7 @@ spring: main: allow-bean-definition-overriding: true application: - name: pli-power-axis-server + name: pli-power-base-server #环境 dev|test|prod profiles: active: @spring.profiles.active@ diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages_en_US.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages_en_US.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages_en_US.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages_zh_CN.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages_zh_CN.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages_zh_CN.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages_zh_TW.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages_zh_TW.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/messages_zh_TW.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/messages_zh_TW.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation_en_US.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation_en_US.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation_en_US.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation_en_US.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation_zh_CN.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation_zh_CN.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation_zh_CN.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation_zh_CN.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation_zh_TW.properties b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation_zh_TW.properties similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/i18n/validation_zh_TW.properties rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/i18n/validation_zh_TW.properties diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/logback-spring.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/logback-spring.xml similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/logback-spring.xml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/logback-spring.xml diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml diff --git a/epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml similarity index 100% rename from epmet-plugins-module/pli-power-axis/pli-power-axis-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml rename to epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerServiceStationDao.xml diff --git a/epmet-plugins-module/pli-power-axis/pom.xml b/epmet-plugins-module/pli-power-base/pom.xml similarity index 81% rename from epmet-plugins-module/pli-power-axis/pom.xml rename to epmet-plugins-module/pli-power-base/pom.xml index b3c3eb1..15c8638 100644 --- a/epmet-plugins-module/pli-power-axis/pom.xml +++ b/epmet-plugins-module/pli-power-base/pom.xml @@ -10,13 +10,13 @@ com.epmet - pli-power-axis + pli-power-base pom 插件:动力主轴 - pli-power-axis-client - pli-power-axis-server + pli-power-base-client + pli-power-base-server diff --git a/epmet-plugins-module/pom.xml b/epmet-plugins-module/pom.xml index e35e6f8..765be3d 100644 --- a/epmet-plugins-module/pom.xml +++ b/epmet-plugins-module/pom.xml @@ -14,7 +14,7 @@ pom - pli-power-axis + pli-power-base