From 818538f34dd322dbd5ce35ee5a60f600ae1e15be Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 8 Jun 2023 14:11:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CsEventBootApplication.java | 2 +- .../constant/HarmonicConstant.java | 6 +---- .../param/CsConfigurationParm.java | 2 +- .../param/CsPageParm.java | 2 +- .../param/ThdDataQueryParm.java | 2 +- .../pojo/influx/CsCommon.java | 2 +- .../pojo/influx/CsDataHarmPhasicI.java | 2 +- .../pojo/influx/CsDataHarmPhasicV.java | 2 +- .../pojo/influx/CsDataHarmPowerP.java | 2 +- .../pojo/influx/CsDataHarmRateI.java | 2 +- .../pojo/influx/CsDataHarmRateV.java | 2 +- .../pojo/influx/CsDataI.java | 2 +- .../pojo/influx/CsDataV.java | 2 +- .../pojo/influx/CsPqdData.java | 2 +- .../pojo/po/CsConfigurationPO.java | 2 +- .../pojo/po/CsNetDevPO.java | 2 +- .../pojo/po/CsPagePO.java | 2 +- .../pojo/vo/ConditionVO.java | 2 +- .../pojo/vo/CsConfigurationVO.java | 7 +----- .../pojo/vo/CsPageVO.java | 5 +--- .../pojo/vo/ElementsVO.java | 2 +- .../pojo/vo/RtDataVO.java | 4 ++-- .../pojo/vo/TargetDetailVO.java | 2 +- .../pojo/vo/ThdDataVO.java | 2 +- .../pojo/vo/ZuTaiVo.java | 2 +- .../utils/CsReflectUitl.java | 2 +- .../CsHarmonicBootApplication.java | 2 +- .../controller/CsConfigurationController.java | 8 +++---- .../controller/CsNetDevPOController.java | 2 +- .../controller/CsPagePOController.java | 8 +++---- .../controller/LineTargetController.java | 8 +++---- .../controller/StableDataController.java | 8 +++---- .../handler/MqttMessageHandler.java | 6 ++--- .../mapper/CsConfigurationMapper.java | 4 ++-- .../mapper/CsNetDevPOMapper.java | 4 ++-- .../mapper/CsPagePOMapper.java | 4 ++-- .../mapper/mapping/CsConfigurationMapper.xml | 4 ++-- .../mapper/mapping/CsNetDevPOMapper.xml | 4 ++-- .../mapper/mapping/CsPagePOMapper.xml | 4 ++-- .../service/CsConfigurationService.java | 8 +++---- .../service/CsNetDevPOService.java | 4 ++-- .../service/CsPagePOService.java | 8 +++---- .../service/ILineTargetService.java | 6 ++--- .../service/StableDataService.java | 6 ++--- .../impl/CsConfigurationServiceImpl.java | 14 +++++------ .../service/impl/CsNetDevPOServiceImpl.java | 8 +++---- .../service/impl/CsPagePOServiceImpl.java | 18 +++++++------- .../service/impl/LineTargetServiceImpl.java | 24 +++++++++---------- .../service/impl/StableDataServiceImpl.java | 8 +++---- .../src/test/java/com/njcn/InfluxDbTest.java | 6 ----- .../CsReportBootApplication.java | 2 +- .../enums/CsSystemResponseEnum.java | 2 +- .../pojo/param/CsFeedbackAddParm.java | 2 +- .../pojo/param/CsFeedbackChatAddParm.java | 2 +- .../pojo/param/CsFeedbackChatCheckParm.java | 2 +- .../pojo/param/CsFeedbackQueryParm.java | 2 +- .../pojo/param/EleEpdPqdParam.java | 2 +- .../pojo/po/CsFeedbackChatPO.java | 2 +- .../pojo/po/CsFeedbackPO.java | 2 +- .../pojo/po/CsFilePathPO.java | 2 +- .../pojo/po/EleEpdPqd.java | 2 +- .../pojo/vo/CsFeedbackDetailVO.java | 4 ++-- .../pojo/vo/CsFeedbackVO.java | 2 +- .../pojo/vo/EleEpdPqdVO.java | 2 +- .../utils/CsSystemEnumUtil.java | 4 ++-- .../CsSystemBootApplication.java | 2 +- .../feedback/FeedBackChatController.java | 8 +++---- .../feedback/FeedBackController.java | 12 +++++----- .../mapper/CsFeedbackChatMapper.java | 4 ++-- .../mapper/CsFeedbackMapper.java | 4 ++-- .../mapper/CsFilePathMapper.java | 4 ++-- .../mapper/mapping/CsFeedbackChatMapper.xml | 2 +- .../mapper/mapping/CsFeedbackMapper.xml | 2 +- .../mapper/mapping/CsFilePathMapper.xml | 4 ++-- .../service/CsFeedbackChatService.java | 8 +++---- .../service/CsFeedbackService.java | 12 +++++----- .../service/CsFilePathService.java | 4 ++-- .../impl/CsFeedbackChatServiceImpl.java | 12 +++++----- .../service/impl/CsFeedbackServiceImpl.java | 24 +++++++++---------- .../service/impl/CsFilePathServiceImpl.java | 8 +++---- 80 files changed, 184 insertions(+), 202 deletions(-) rename cs-event/cs-event-boot/src/main/java/com/njcn/{event => csevent}/CsEventBootApplication.java (96%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/constant/HarmonicConstant.java (91%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/param/CsConfigurationParm.java (96%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/param/CsPageParm.java (97%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/param/ThdDataQueryParm.java (96%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsCommon.java (94%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsDataHarmPhasicI.java (88%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsDataHarmPhasicV.java (88%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsDataHarmPowerP.java (86%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsDataHarmRateI.java (88%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsDataHarmRateV.java (88%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsDataI.java (88%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsDataV.java (88%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/influx/CsPqdData.java (88%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/po/CsConfigurationPO.java (97%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/po/CsNetDevPO.java (98%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/po/CsPagePO.java (97%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/ConditionVO.java (91%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/CsConfigurationVO.java (69%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/CsPageVO.java (89%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/ElementsVO.java (97%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/RtDataVO.java (72%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/TargetDetailVO.java (92%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/ThdDataVO.java (94%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/pojo/vo/ZuTaiVo.java (92%) rename cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/{harmonic => csharmonic}/utils/CsReflectUitl.java (98%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/CsHarmonicBootApplication.java (96%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/controller/CsConfigurationController.java (94%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/controller/CsNetDevPOController.java (91%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/controller/CsPagePOController.java (93%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/controller/LineTargetController.java (94%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/controller/StableDataController.java (95%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/handler/MqttMessageHandler.java (89%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/mapper/CsConfigurationMapper.java (73%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/mapper/CsNetDevPOMapper.java (73%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/mapper/CsPagePOMapper.java (74%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/mapper/mapping/CsConfigurationMapper.xml (84%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/mapper/mapping/CsNetDevPOMapper.xml (89%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/mapper/mapping/CsPagePOMapper.xml (87%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/CsConfigurationService.java (76%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/CsNetDevPOService.java (74%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/CsPagePOService.java (77%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/ILineTargetService.java (81%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/StableDataService.java (83%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/impl/CsConfigurationServiceImpl.java (92%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/impl/CsNetDevPOServiceImpl.java (64%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/impl/CsPagePOServiceImpl.java (92%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/impl/LineTargetServiceImpl.java (94%) rename cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/{harmonic => csharmonic}/service/impl/StableDataServiceImpl.java (97%) rename cs-report/cs-report-boot/src/main/java/com/njcn/{report => csreport}/CsReportBootApplication.java (96%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/enums/CsSystemResponseEnum.java (94%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/param/CsFeedbackAddParm.java (96%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/param/CsFeedbackChatAddParm.java (95%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/param/CsFeedbackChatCheckParm.java (93%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/param/CsFeedbackQueryParm.java (96%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/param/EleEpdPqdParam.java (98%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/po/CsFeedbackChatPO.java (96%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/po/CsFeedbackPO.java (97%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/po/CsFilePathPO.java (95%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/po/EleEpdPqd.java (98%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/vo/CsFeedbackDetailVO.java (94%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/vo/CsFeedbackVO.java (97%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/pojo/vo/EleEpdPqdVO.java (97%) rename cs-system/cs-system-api/src/main/java/com/njcn/{system => cssystem}/utils/CsSystemEnumUtil.java (95%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/CsSystemBootApplication.java (96%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/controller/feedback/FeedBackChatController.java (91%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/controller/feedback/FeedBackController.java (89%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/mapper/CsFeedbackChatMapper.java (78%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/mapper/CsFeedbackMapper.java (78%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/mapper/CsFilePathMapper.java (78%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/mapper/mapping/CsFeedbackChatMapper.xml (91%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/mapper/mapping/CsFeedbackMapper.xml (93%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/mapper/mapping/CsFilePathMapper.xml (78%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/service/CsFeedbackChatService.java (76%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/service/CsFeedbackService.java (80%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/service/CsFilePathService.java (79%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/service/impl/CsFeedbackChatServiceImpl.java (83%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/service/impl/CsFeedbackServiceImpl.java (89%) rename cs-system/cs-system-boot/src/main/java/com/njcn/{system => cssystem}/service/impl/CsFilePathServiceImpl.java (69%) diff --git a/cs-event/cs-event-boot/src/main/java/com/njcn/event/CsEventBootApplication.java b/cs-event/cs-event-boot/src/main/java/com/njcn/csevent/CsEventBootApplication.java similarity index 96% rename from cs-event/cs-event-boot/src/main/java/com/njcn/event/CsEventBootApplication.java rename to cs-event/cs-event-boot/src/main/java/com/njcn/csevent/CsEventBootApplication.java index 171bbef..ba4a3af 100644 --- a/cs-event/cs-event-boot/src/main/java/com/njcn/event/CsEventBootApplication.java +++ b/cs-event/cs-event-boot/src/main/java/com/njcn/csevent/CsEventBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.event; +package com.njcn.csevent; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/constant/HarmonicConstant.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/constant/HarmonicConstant.java similarity index 91% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/constant/HarmonicConstant.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/constant/HarmonicConstant.java index 5eeb867..8243c6b 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/constant/HarmonicConstant.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/constant/HarmonicConstant.java @@ -1,10 +1,6 @@ -package com.njcn.harmonic.constant; +package com.njcn.csharmonic.constant; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * 常量类 * @author qijian diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsConfigurationParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java similarity index 96% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsConfigurationParm.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java index 0d80419..5338ae1 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsConfigurationParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsConfigurationParm.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.param; +package com.njcn.csharmonic.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsPageParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsPageParm.java similarity index 97% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsPageParm.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsPageParm.java index 6a7a55b..12ca438 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/CsPageParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsPageParm.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.param; +package com.njcn.csharmonic.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/ThdDataQueryParm.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/ThdDataQueryParm.java similarity index 96% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/ThdDataQueryParm.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/ThdDataQueryParm.java index dcd4840..6eeb668 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/param/ThdDataQueryParm.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/ThdDataQueryParm.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.param; +package com.njcn.csharmonic.param; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsCommon.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsCommon.java similarity index 94% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsCommon.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsCommon.java index ea12cd6..3d0158b 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsCommon.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsCommon.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.common.utils.serializer.InstantDateSerializer; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPhasicI.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPhasicI.java similarity index 88% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPhasicI.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPhasicI.java index 4a90c74..199b9b9 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPhasicI.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPhasicI.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPhasicV.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPhasicV.java similarity index 88% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPhasicV.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPhasicV.java index 5840870..9a9e904 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPhasicV.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPhasicV.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPowerP.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPowerP.java similarity index 86% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPowerP.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPowerP.java index ca172eb..3e83c65 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmPowerP.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmPowerP.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import org.influxdb.annotation.Measurement; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmRateI.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmRateI.java similarity index 88% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmRateI.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmRateI.java index 8fac623..8a141bd 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmRateI.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmRateI.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmRateV.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmRateV.java similarity index 88% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmRateV.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmRateV.java index ea980c3..7868b5d 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataHarmRateV.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataHarmRateV.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataI.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataI.java similarity index 88% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataI.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataI.java index 4d4bf06..d6580a3 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataI.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataI.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataV.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataV.java similarity index 88% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataV.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataV.java index 2bfe5e1..fcd7ffe 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsDataV.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsDataV.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsPqdData.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsPqdData.java similarity index 88% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsPqdData.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsPqdData.java index 3e896f9..22ae8f3 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/influx/CsPqdData.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/influx/CsPqdData.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.influx; +package com.njcn.csharmonic.pojo.influx; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsConfigurationPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java similarity index 97% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsConfigurationPO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java index 75c0c93..6683105 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsConfigurationPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsConfigurationPO.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.po; +package com.njcn.csharmonic.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsNetDevPO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsNetDevPO.java similarity index 98% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsNetDevPO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsNetDevPO.java index 4603fb2..a9572b6 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsNetDevPO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsNetDevPO.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.po; +package com.njcn.csharmonic.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsPagePO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPagePO.java similarity index 97% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsPagePO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPagePO.java index acdfdc3..58d52af 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/CsPagePO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/po/CsPagePO.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.po; +package com.njcn.csharmonic.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ConditionVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ConditionVO.java similarity index 91% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ConditionVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ConditionVO.java index 3f089ef..df0fc36 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ConditionVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ConditionVO.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java similarity index 69% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java index 831342a..ade5e0a 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsConfigurationVO.java @@ -1,13 +1,8 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.NoArgsConstructor; /** * Description: diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsPageVO.java similarity index 89% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsPageVO.java index 48b2f41..668da1c 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsPageVO.java @@ -1,14 +1,11 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; -import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; import java.time.LocalDateTime; -import java.util.Date; /** * diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ElementsVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ElementsVO.java similarity index 97% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ElementsVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ElementsVO.java index 610aef1..40c556f 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ElementsVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ElementsVO.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RtDataVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/RtDataVO.java similarity index 72% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RtDataVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/RtDataVO.java index 3cb5925..455b71a 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RtDataVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/RtDataVO.java @@ -1,6 +1,6 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; -import com.njcn.harmonic.pojo.influx.CsCommon; +import com.njcn.csharmonic.pojo.influx.CsCommon; import lombok.Data; /** diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/TargetDetailVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/TargetDetailVO.java similarity index 92% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/TargetDetailVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/TargetDetailVO.java index 1f5ff0b..31052c9 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/TargetDetailVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/TargetDetailVO.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ThdDataVO.java similarity index 94% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ThdDataVO.java index c9fb14b..311fd13 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ThdDataVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ThdDataVO.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ZuTaiVo.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ZuTaiVo.java similarity index 92% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ZuTaiVo.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ZuTaiVo.java index 1c0b092..bb3dbfd 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/ZuTaiVo.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ZuTaiVo.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.pojo.vo; +package com.njcn.csharmonic.pojo.vo; import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName; import lombok.Data; diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/utils/CsReflectUitl.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/utils/CsReflectUitl.java similarity index 98% rename from cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/utils/CsReflectUitl.java rename to cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/utils/CsReflectUitl.java index 71e7495..15ce789 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/utils/CsReflectUitl.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/utils/CsReflectUitl.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.utils; +package com.njcn.csharmonic.utils; import org.influxdb.annotation.Measurement; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/CsHarmonicBootApplication.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/CsHarmonicBootApplication.java similarity index 96% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/CsHarmonicBootApplication.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/CsHarmonicBootApplication.java index b0febfc..874165a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/CsHarmonicBootApplication.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/CsHarmonicBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic; +package com.njcn.csharmonic; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsConfigurationController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java similarity index 94% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsConfigurationController.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java index 9efb7e1..36c49bc 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsConfigurationController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.controller; +package com.njcn.csharmonic.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.service.CsConfigurationService; +import com.njcn.csharmonic.service.CsConfigurationService; import com.njcn.minioss.bo.MinIoUploadResDTO; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -16,8 +16,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.harmonic.param.CsConfigurationParm; -import com.njcn.harmonic.pojo.vo.CsConfigurationVO; +import com.njcn.csharmonic.param.CsConfigurationParm; +import com.njcn.csharmonic.pojo.vo.CsConfigurationVO; import org.springframework.web.multipart.MultipartFile; /** diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsNetDevPOController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java similarity index 91% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsNetDevPOController.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java index 57e0902..0fe1d25 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsNetDevPOController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.controller; +package com.njcn.csharmonic.controller; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsPagePOController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java similarity index 93% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsPagePOController.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java index 198ca58..8d8220d 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/CsPagePOController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java @@ -1,19 +1,19 @@ -package com.njcn.harmonic.controller; +package com.njcn.csharmonic.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.service.CsPagePOService; -import com.njcn.harmonic.pojo.vo.CsPageVO; +import com.njcn.csharmonic.service.CsPagePOService; +import com.njcn.csharmonic.pojo.vo.CsPageVO; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.validation.annotation.Validated; -import com.njcn.harmonic.param.CsPageParm; +import com.njcn.csharmonic.param.CsPageParm; import org.springframework.web.bind.annotation.*; /** diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/LineTargetController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java similarity index 94% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/LineTargetController.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java index 9933373..718ea7b 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/LineTargetController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.controller; +package com.njcn.csharmonic.controller; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; @@ -6,9 +6,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.vo.LineTargetVO; -import com.njcn.harmonic.pojo.vo.RtDataVO; -import com.njcn.harmonic.pojo.vo.TargetDetailVO; -import com.njcn.harmonic.service.ILineTargetService; +import com.njcn.csharmonic.pojo.vo.RtDataVO; +import com.njcn.csharmonic.pojo.vo.TargetDetailVO; +import com.njcn.csharmonic.service.ILineTargetService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/StableDataController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java similarity index 95% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/StableDataController.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java index fc3ce66..87dfe3c 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/controller/StableDataController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java @@ -1,11 +1,11 @@ -package com.njcn.harmonic.controller; +package com.njcn.csharmonic.controller; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.harmonic.service.StableDataService; +import com.njcn.csharmonic.service.StableDataService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -15,8 +15,8 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.harmonic.param.ThdDataQueryParm; -import com.njcn.harmonic.pojo.vo.ThdDataVO; +import com.njcn.csharmonic.param.ThdDataQueryParm; +import com.njcn.csharmonic.pojo.vo.ThdDataVO; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/handler/MqttMessageHandler.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java similarity index 89% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/handler/MqttMessageHandler.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java index c850b38..75f07a2 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/handler/MqttMessageHandler.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java @@ -1,12 +1,12 @@ -package com.njcn.harmonic.handler; +package com.njcn.csharmonic.handler; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.github.tocrhz.mqtt.annotation.MqttSubscribe; import com.github.tocrhz.mqtt.annotation.NamedValue; import com.github.tocrhz.mqtt.annotation.Payload; import com.github.tocrhz.mqtt.publisher.MqttPublisher; -import com.njcn.harmonic.pojo.vo.RtDataVO; -import com.njcn.harmonic.service.ILineTargetService; +import com.njcn.csharmonic.pojo.vo.RtDataVO; +import com.njcn.csharmonic.service.ILineTargetService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttMessage; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsConfigurationMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java similarity index 73% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsConfigurationMapper.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java index 05c53cb..54b64c0 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsConfigurationMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsConfigurationMapper.java @@ -1,7 +1,7 @@ -package com.njcn.harmonic.mapper; +package com.njcn.csharmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.CsConfigurationPO; +import com.njcn.csharmonic.pojo.po.CsConfigurationPO; /** * Description: diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsNetDevPOMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsNetDevPOMapper.java similarity index 73% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsNetDevPOMapper.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsNetDevPOMapper.java index 3db2e2d..b31fcac 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsNetDevPOMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsNetDevPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.harmonic.mapper; +package com.njcn.csharmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.CsNetDevPO; +import com.njcn.csharmonic.pojo.po.CsNetDevPO; /** * Description: diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsPagePOMapper.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsPagePOMapper.java similarity index 74% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsPagePOMapper.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsPagePOMapper.java index a3d6ee2..2bddba1 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/CsPagePOMapper.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsPagePOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.harmonic.mapper; +package com.njcn.csharmonic.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.harmonic.pojo.po.CsPagePO; +import com.njcn.csharmonic.pojo.po.CsPagePO; /** * diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsConfigurationMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml similarity index 84% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsConfigurationMapper.xml rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml index 48cba75..4e7b2a4 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsConfigurationMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsConfigurationMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsNetDevPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsNetDevPOMapper.xml similarity index 89% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsNetDevPOMapper.xml rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsNetDevPOMapper.xml index 2ccb6a5..c3e3691 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsNetDevPOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsNetDevPOMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsPagePOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsPagePOMapper.xml similarity index 87% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsPagePOMapper.xml rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsPagePOMapper.xml index 05aef33..8489793 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/CsPagePOMapper.xml +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsPagePOMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsConfigurationService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsConfigurationService.java similarity index 76% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsConfigurationService.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsConfigurationService.java index def52bb..dcd8035 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsConfigurationService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsConfigurationService.java @@ -1,10 +1,10 @@ -package com.njcn.harmonic.service; +package com.njcn.csharmonic.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.param.CsConfigurationParm; -import com.njcn.harmonic.pojo.po.CsConfigurationPO; -import com.njcn.harmonic.pojo.vo.CsConfigurationVO; +import com.njcn.csharmonic.param.CsConfigurationParm; +import com.njcn.csharmonic.pojo.po.CsConfigurationPO; +import com.njcn.csharmonic.pojo.vo.CsConfigurationVO; import org.springframework.web.multipart.MultipartFile; /** diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsNetDevPOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsNetDevPOService.java similarity index 74% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsNetDevPOService.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsNetDevPOService.java index 77d5ea1..115b9f4 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsNetDevPOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsNetDevPOService.java @@ -1,7 +1,7 @@ -package com.njcn.harmonic.service; +package com.njcn.csharmonic.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.pojo.po.CsNetDevPO; +import com.njcn.csharmonic.pojo.po.CsNetDevPO; /** * diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsPagePOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPagePOService.java similarity index 77% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsPagePOService.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPagePOService.java index b7b791a..0485c3d 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/CsPagePOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPagePOService.java @@ -1,10 +1,10 @@ -package com.njcn.harmonic.service; +package com.njcn.csharmonic.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.harmonic.param.CsPageParm; -import com.njcn.harmonic.pojo.po.CsPagePO; -import com.njcn.harmonic.pojo.vo.CsPageVO; +import com.njcn.csharmonic.param.CsPageParm; +import com.njcn.csharmonic.pojo.po.CsPagePO; +import com.njcn.csharmonic.pojo.vo.CsPageVO; /** * diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/ILineTargetService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ILineTargetService.java similarity index 81% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/ILineTargetService.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ILineTargetService.java index 08f83c9..3f3019c 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/ILineTargetService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ILineTargetService.java @@ -1,8 +1,8 @@ -package com.njcn.harmonic.service; +package com.njcn.csharmonic.service; import com.njcn.csdevice.pojo.vo.LineTargetVO; -import com.njcn.harmonic.pojo.vo.RtDataVO; -import com.njcn.harmonic.pojo.vo.TargetDetailVO; +import com.njcn.csharmonic.pojo.vo.RtDataVO; +import com.njcn.csharmonic.pojo.vo.TargetDetailVO; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/StableDataService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/StableDataService.java similarity index 83% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/StableDataService.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/StableDataService.java index eba4ec7..a3ded67 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/StableDataService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/StableDataService.java @@ -1,9 +1,9 @@ -package com.njcn.harmonic.service; +package com.njcn.csharmonic.service; -import com.njcn.harmonic.param.ThdDataQueryParm; -import com.njcn.harmonic.pojo.vo.ThdDataVO; +import com.njcn.csharmonic.param.ThdDataQueryParm; +import com.njcn.csharmonic.pojo.vo.ThdDataVO; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java similarity index 92% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java index f58cee3..e491170 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java @@ -1,16 +1,16 @@ -package com.njcn.harmonic.service.impl; +package com.njcn.csharmonic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.utils.NjcnBeanUtil; -import com.njcn.harmonic.constant.HarmonicConstant; -import com.njcn.harmonic.mapper.CsConfigurationMapper; -import com.njcn.harmonic.param.CsConfigurationParm; -import com.njcn.harmonic.pojo.po.CsConfigurationPO; -import com.njcn.harmonic.pojo.vo.CsConfigurationVO; -import com.njcn.harmonic.service.CsConfigurationService; +import com.njcn.csharmonic.constant.HarmonicConstant; +import com.njcn.csharmonic.mapper.CsConfigurationMapper; +import com.njcn.csharmonic.param.CsConfigurationParm; +import com.njcn.csharmonic.pojo.po.CsConfigurationPO; +import com.njcn.csharmonic.pojo.vo.CsConfigurationVO; +import com.njcn.csharmonic.service.CsConfigurationService; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.po.User; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsNetDevPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsNetDevPOServiceImpl.java similarity index 64% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsNetDevPOServiceImpl.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsNetDevPOServiceImpl.java index a37c42d..824b44a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsNetDevPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsNetDevPOServiceImpl.java @@ -1,9 +1,9 @@ -package com.njcn.harmonic.service.impl; +package com.njcn.csharmonic.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.harmonic.mapper.CsNetDevPOMapper; -import com.njcn.harmonic.pojo.po.CsNetDevPO; -import com.njcn.harmonic.service.CsNetDevPOService; +import com.njcn.csharmonic.mapper.CsNetDevPOMapper; +import com.njcn.csharmonic.pojo.po.CsNetDevPO; +import com.njcn.csharmonic.service.CsNetDevPOService; import org.springframework.stereotype.Service; /** * diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java similarity index 92% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java index 3c11486..7b79cde 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java @@ -1,17 +1,17 @@ -package com.njcn.harmonic.service.impl; +package com.njcn.csharmonic.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.harmonic.constant.HarmonicConstant; -import com.njcn.harmonic.mapper.CsConfigurationMapper; -import com.njcn.harmonic.mapper.CsPagePOMapper; -import com.njcn.harmonic.param.CsPageParm; -import com.njcn.harmonic.pojo.po.CsConfigurationPO; -import com.njcn.harmonic.pojo.po.CsPagePO; -import com.njcn.harmonic.pojo.vo.CsPageVO; -import com.njcn.harmonic.service.CsPagePOService; +import com.njcn.csharmonic.constant.HarmonicConstant; +import com.njcn.csharmonic.mapper.CsConfigurationMapper; +import com.njcn.csharmonic.mapper.CsPagePOMapper; +import com.njcn.csharmonic.param.CsPageParm; +import com.njcn.csharmonic.pojo.po.CsConfigurationPO; +import com.njcn.csharmonic.pojo.po.CsPagePO; +import com.njcn.csharmonic.pojo.vo.CsPageVO; +import com.njcn.csharmonic.service.CsPagePOService; import com.njcn.oss.utils.FileStorageUtil; import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.po.User; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java similarity index 94% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/LineTargetServiceImpl.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java index e4930f4..6ebcd86 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/LineTargetServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.harmonic.service.impl; +package com.njcn.csharmonic.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.shaded.com.google.gson.Gson; @@ -8,17 +8,17 @@ import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.po.CsDevModelPO; import com.njcn.csdevice.pojo.po.CsDevModelRelationPO; import com.njcn.csdevice.pojo.vo.LineTargetVO; -import com.njcn.harmonic.constant.HarmonicConstant; -import com.njcn.harmonic.pojo.influx.CsDataHarmPowerP; -import com.njcn.harmonic.pojo.influx.CsDataV; -import com.njcn.harmonic.pojo.influx.CsPqdData; -import com.njcn.harmonic.pojo.vo.ElementsVO; -import com.njcn.harmonic.pojo.vo.RtDataVO; -import com.njcn.harmonic.pojo.vo.TargetDetailVO; -import com.njcn.harmonic.pojo.vo.ZuTaiVo; -import com.njcn.harmonic.service.CsPagePOService; -import com.njcn.harmonic.service.ILineTargetService; -import com.njcn.harmonic.utils.CsReflectUitl; +import com.njcn.csharmonic.constant.HarmonicConstant; +import com.njcn.csharmonic.pojo.influx.CsDataHarmPowerP; +import com.njcn.csharmonic.pojo.influx.CsDataV; +import com.njcn.csharmonic.pojo.influx.CsPqdData; +import com.njcn.csharmonic.pojo.vo.ElementsVO; +import com.njcn.csharmonic.pojo.vo.RtDataVO; +import com.njcn.csharmonic.pojo.vo.TargetDetailVO; +import com.njcn.csharmonic.pojo.vo.ZuTaiVo; +import com.njcn.csharmonic.service.CsPagePOService; +import com.njcn.csharmonic.service.ILineTargetService; +import com.njcn.csharmonic.utils.CsReflectUitl; import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.influx.service.CommonService; import com.njcn.influxdb.utils.InfluxDbUtils; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java similarity index 97% rename from cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java rename to cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java index e8aeb31..63eb8df 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/StableDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java @@ -1,17 +1,17 @@ -package com.njcn.harmonic.service.impl; +package com.njcn.csharmonic.service.impl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.utils.ReflectUtils; -import com.njcn.harmonic.service.StableDataService; +import com.njcn.csharmonic.service.StableDataService; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import com.njcn.harmonic.param.ThdDataQueryParm; -import com.njcn.harmonic.pojo.vo.ThdDataVO; +import com.njcn.csharmonic.param.ThdDataQueryParm; +import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.influx.pojo.po.HarmonicRatioData; import com.njcn.influx.pojo.po.PowerQualityData; import com.njcn.influx.service.HaronicRatioService; diff --git a/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/InfluxDbTest.java b/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/InfluxDbTest.java index 4191fe2..670bf78 100644 --- a/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/InfluxDbTest.java +++ b/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/InfluxDbTest.java @@ -1,18 +1,12 @@ package com.njcn; -import com.alibaba.nacos.shaded.com.google.gson.Gson; -import com.github.tocrhz.mqtt.publisher.MqttPublisher; -import com.njcn.harmonic.pojo.vo.RtDataVO; -import com.njcn.harmonic.service.ILineTargetService; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import lombok.AllArgsConstructor; import org.influxdb.InfluxDB; import org.influxdb.dto.BatchPoints; import org.influxdb.dto.Point; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/cs-report/cs-report-boot/src/main/java/com/njcn/report/CsReportBootApplication.java b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/CsReportBootApplication.java similarity index 96% rename from cs-report/cs-report-boot/src/main/java/com/njcn/report/CsReportBootApplication.java rename to cs-report/cs-report-boot/src/main/java/com/njcn/csreport/CsReportBootApplication.java index 41c2831..878e5f6 100644 --- a/cs-report/cs-report-boot/src/main/java/com/njcn/report/CsReportBootApplication.java +++ b/cs-report/cs-report-boot/src/main/java/com/njcn/csreport/CsReportBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.report; +package com.njcn.csreport; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/enums/CsSystemResponseEnum.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/enums/CsSystemResponseEnum.java similarity index 94% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/enums/CsSystemResponseEnum.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/enums/CsSystemResponseEnum.java index aff6299..d50d966 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/enums/CsSystemResponseEnum.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/enums/CsSystemResponseEnum.java @@ -1,4 +1,4 @@ -package com.njcn.system.enums; +package com.njcn.cssystem.enums; import lombok.Getter; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackAddParm.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAddParm.java similarity index 96% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackAddParm.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAddParm.java index f3c25b7..ec89115 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackAddParm.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAddParm.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.param; +package com.njcn.cssystem.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackChatAddParm.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatAddParm.java similarity index 95% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackChatAddParm.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatAddParm.java index 80c8e70..d230aef 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackChatAddParm.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatAddParm.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.param; +package com.njcn.cssystem.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackChatCheckParm.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatCheckParm.java similarity index 93% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackChatCheckParm.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatCheckParm.java index f27080a..31ba47c 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackChatCheckParm.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatCheckParm.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.param; +package com.njcn.cssystem.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackQueryParm.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java similarity index 96% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackQueryParm.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java index e5b8de3..be3e2f0 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/CsFeedbackQueryParm.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.param; +package com.njcn.cssystem.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/EleEpdPqdParam.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/EleEpdPqdParam.java similarity index 98% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/EleEpdPqdParam.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/EleEpdPqdParam.java index d7bb18b..ffed960 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/param/EleEpdPqdParam.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/EleEpdPqdParam.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.param; +package com.njcn.cssystem.pojo.param; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFeedbackChatPO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackChatPO.java similarity index 96% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFeedbackChatPO.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackChatPO.java index 4e5a0b4..e0bb00e 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFeedbackChatPO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackChatPO.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.po; +package com.njcn.cssystem.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFeedbackPO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackPO.java similarity index 97% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFeedbackPO.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackPO.java index 6391476..492778e 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFeedbackPO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackPO.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.po; +package com.njcn.cssystem.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFilePathPO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFilePathPO.java similarity index 95% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFilePathPO.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFilePathPO.java index 2f1e8b6..20a0812 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/CsFilePathPO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFilePathPO.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.po; +package com.njcn.cssystem.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/EleEpdPqd.java similarity index 98% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/EleEpdPqd.java index 62a28c5..7ef7da3 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/EleEpdPqd.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.po; +package com.njcn.cssystem.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/CsFeedbackDetailVO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackDetailVO.java similarity index 94% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/CsFeedbackDetailVO.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackDetailVO.java index 2ee9d83..3033a32 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/CsFeedbackDetailVO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackDetailVO.java @@ -1,7 +1,7 @@ -package com.njcn.system.pojo.vo; +package com.njcn.cssystem.pojo.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.system.pojo.po.CsFeedbackChatPO; +import com.njcn.cssystem.pojo.po.CsFeedbackChatPO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/CsFeedbackVO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java similarity index 97% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/CsFeedbackVO.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java index b1105db..9c86a8a 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/CsFeedbackVO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/CsFeedbackVO.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.vo; +package com.njcn.cssystem.pojo.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java similarity index 97% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java index c4e0899..5bbd095 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdVO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java @@ -1,4 +1,4 @@ -package com.njcn.system.pojo.vo; +package com.njcn.cssystem.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/system/utils/CsSystemEnumUtil.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/utils/CsSystemEnumUtil.java similarity index 95% rename from cs-system/cs-system-api/src/main/java/com/njcn/system/utils/CsSystemEnumUtil.java rename to cs-system/cs-system-api/src/main/java/com/njcn/cssystem/utils/CsSystemEnumUtil.java index 41a10c4..3afa3f4 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/system/utils/CsSystemEnumUtil.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/utils/CsSystemEnumUtil.java @@ -1,11 +1,11 @@ -package com.njcn.system.utils; +package com.njcn.cssystem.utils; import cn.hutool.core.util.StrUtil; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.EnumUtils; -import com.njcn.system.enums.CsSystemResponseEnum; +import com.njcn.cssystem.enums.CsSystemResponseEnum; import javax.validation.constraints.NotNull; import java.util.Objects; diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/CsSystemBootApplication.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/CsSystemBootApplication.java similarity index 96% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/CsSystemBootApplication.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/CsSystemBootApplication.java index 5968e11..f759970 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/CsSystemBootApplication.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/CsSystemBootApplication.java @@ -1,4 +1,4 @@ -package com.njcn.system; +package com.njcn.cssystem; import com.github.jeffreyning.mybatisplus.conf.EnableMPP; import lombok.extern.slf4j.Slf4j; diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/feedback/FeedBackChatController.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackChatController.java similarity index 91% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/feedback/FeedBackChatController.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackChatController.java index 764b5e8..e7e62b2 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/feedback/FeedBackChatController.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackChatController.java @@ -1,4 +1,4 @@ -package com.njcn.system.controller.feedback; +package com.njcn.cssystem.controller.feedback; import com.njcn.common.pojo.annotation.OperateInfo; @@ -6,9 +6,9 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.system.pojo.param.CsFeedbackChatAddParm; -import com.njcn.system.pojo.param.CsFeedbackChatCheckParm; -import com.njcn.system.service.CsFeedbackChatService; +import com.njcn.cssystem.pojo.param.CsFeedbackChatAddParm; +import com.njcn.cssystem.pojo.param.CsFeedbackChatCheckParm; +import com.njcn.cssystem.service.CsFeedbackChatService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/feedback/FeedBackController.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackController.java similarity index 89% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/feedback/FeedBackController.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackController.java index 682a88a..c870a41 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/controller/feedback/FeedBackController.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackController.java @@ -1,4 +1,4 @@ -package com.njcn.system.controller.feedback; +package com.njcn.cssystem.controller.feedback; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,11 +7,11 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.system.pojo.param.CsFeedbackAddParm; -import com.njcn.system.pojo.param.CsFeedbackQueryParm; -import com.njcn.system.pojo.vo.CsFeedbackDetailVO; -import com.njcn.system.pojo.vo.CsFeedbackVO; -import com.njcn.system.service.CsFeedbackService; +import com.njcn.cssystem.pojo.param.CsFeedbackAddParm; +import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm; +import com.njcn.cssystem.pojo.vo.CsFeedbackDetailVO; +import com.njcn.cssystem.pojo.vo.CsFeedbackVO; +import com.njcn.cssystem.service.CsFeedbackService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFeedbackChatMapper.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFeedbackChatMapper.java similarity index 78% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFeedbackChatMapper.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFeedbackChatMapper.java index 547b6bf..7540fd6 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFeedbackChatMapper.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFeedbackChatMapper.java @@ -1,7 +1,7 @@ -package com.njcn.system.mapper; +package com.njcn.cssystem.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.system.pojo.po.CsFeedbackChatPO; +import com.njcn.cssystem.pojo.po.CsFeedbackChatPO; /** * diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFeedbackMapper.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFeedbackMapper.java similarity index 78% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFeedbackMapper.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFeedbackMapper.java index 8b2d077..f7f8b2f 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFeedbackMapper.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFeedbackMapper.java @@ -1,7 +1,7 @@ -package com.njcn.system.mapper; +package com.njcn.cssystem.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.system.pojo.po.CsFeedbackPO; +import com.njcn.cssystem.pojo.po.CsFeedbackPO; /** * diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFilePathMapper.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFilePathMapper.java similarity index 78% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFilePathMapper.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFilePathMapper.java index b19be3b..3af5380 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/CsFilePathMapper.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/CsFilePathMapper.java @@ -1,7 +1,7 @@ -package com.njcn.system.mapper; +package com.njcn.cssystem.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.system.pojo.po.CsFilePathPO; +import com.njcn.cssystem.pojo.po.CsFilePathPO; /** * diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFeedbackChatMapper.xml b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFeedbackChatMapper.xml similarity index 91% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFeedbackChatMapper.xml rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFeedbackChatMapper.xml index 9d42b96..b8c09d2 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFeedbackChatMapper.xml +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFeedbackChatMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFeedbackMapper.xml b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFeedbackMapper.xml similarity index 93% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFeedbackMapper.xml rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFeedbackMapper.xml index c9adab1..d60dd24 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFeedbackMapper.xml +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFeedbackMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFilePathMapper.xml b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFilePathMapper.xml similarity index 78% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFilePathMapper.xml rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFilePathMapper.xml index 7bb1f0f..1773c46 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/mapper/mapping/CsFilePathMapper.xml +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/mapping/CsFilePathMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFeedbackChatService.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackChatService.java similarity index 76% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFeedbackChatService.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackChatService.java index 0b8a9c4..3405aa9 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFeedbackChatService.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackChatService.java @@ -1,9 +1,9 @@ -package com.njcn.system.service; +package com.njcn.cssystem.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.system.pojo.param.CsFeedbackChatAddParm; -import com.njcn.system.pojo.param.CsFeedbackChatCheckParm; -import com.njcn.system.pojo.po.CsFeedbackChatPO; +import com.njcn.cssystem.pojo.param.CsFeedbackChatAddParm; +import com.njcn.cssystem.pojo.param.CsFeedbackChatCheckParm; +import com.njcn.cssystem.pojo.po.CsFeedbackChatPO; /** * diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFeedbackService.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackService.java similarity index 80% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFeedbackService.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackService.java index 978b2b8..c1d0282 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFeedbackService.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackService.java @@ -1,12 +1,12 @@ -package com.njcn.system.service; +package com.njcn.cssystem.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.system.pojo.param.CsFeedbackAddParm; -import com.njcn.system.pojo.param.CsFeedbackQueryParm; -import com.njcn.system.pojo.po.CsFeedbackPO; -import com.njcn.system.pojo.vo.CsFeedbackDetailVO; -import com.njcn.system.pojo.vo.CsFeedbackVO; +import com.njcn.cssystem.pojo.param.CsFeedbackAddParm; +import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm; +import com.njcn.cssystem.pojo.po.CsFeedbackPO; +import com.njcn.cssystem.pojo.vo.CsFeedbackDetailVO; +import com.njcn.cssystem.pojo.vo.CsFeedbackVO; /** diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFilePathService.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFilePathService.java similarity index 79% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFilePathService.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFilePathService.java index 7fac207..6e9bc5e 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/CsFilePathService.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFilePathService.java @@ -1,7 +1,7 @@ -package com.njcn.system.service; +package com.njcn.cssystem.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.system.pojo.po.CsFilePathPO; +import com.njcn.cssystem.pojo.po.CsFilePathPO; /** * diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFeedbackChatServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java similarity index 83% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFeedbackChatServiceImpl.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java index 1b2fb2b..20b7bd7 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFeedbackChatServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java @@ -1,13 +1,13 @@ -package com.njcn.system.service.impl; +package com.njcn.cssystem.service.impl; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.system.mapper.CsFeedbackChatMapper; -import com.njcn.system.pojo.param.CsFeedbackChatAddParm; -import com.njcn.system.pojo.param.CsFeedbackChatCheckParm; -import com.njcn.system.pojo.po.CsFeedbackChatPO; -import com.njcn.system.service.CsFeedbackChatService; +import com.njcn.cssystem.mapper.CsFeedbackChatMapper; +import com.njcn.cssystem.service.CsFeedbackChatService; +import com.njcn.cssystem.pojo.param.CsFeedbackChatAddParm; +import com.njcn.cssystem.pojo.param.CsFeedbackChatCheckParm; +import com.njcn.cssystem.pojo.po.CsFeedbackChatPO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFeedbackServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java similarity index 89% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFeedbackServiceImpl.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java index 6ce6c4c..aee98ca 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFeedbackServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java @@ -1,23 +1,23 @@ -package com.njcn.system.service.impl; +package com.njcn.cssystem.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.cssystem.service.CsFeedbackChatService; +import com.njcn.cssystem.service.CsFeedbackService; +import com.njcn.cssystem.service.CsFilePathService; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; -import com.njcn.system.mapper.CsFeedbackMapper; -import com.njcn.system.pojo.param.CsFeedbackAddParm; -import com.njcn.system.pojo.param.CsFeedbackQueryParm; -import com.njcn.system.pojo.po.CsFeedbackChatPO; -import com.njcn.system.pojo.po.CsFeedbackPO; -import com.njcn.system.pojo.po.CsFilePathPO; -import com.njcn.system.pojo.vo.CsFeedbackDetailVO; -import com.njcn.system.pojo.vo.CsFeedbackVO; -import com.njcn.system.service.CsFeedbackChatService; -import com.njcn.system.service.CsFeedbackService; -import com.njcn.system.service.CsFilePathService; +import com.njcn.cssystem.mapper.CsFeedbackMapper; +import com.njcn.cssystem.pojo.param.CsFeedbackAddParm; +import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm; +import com.njcn.cssystem.pojo.po.CsFeedbackChatPO; +import com.njcn.cssystem.pojo.po.CsFeedbackPO; +import com.njcn.cssystem.pojo.po.CsFilePathPO; +import com.njcn.cssystem.pojo.vo.CsFeedbackDetailVO; +import com.njcn.cssystem.pojo.vo.CsFeedbackVO; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFilePathServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFilePathServiceImpl.java similarity index 69% rename from cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFilePathServiceImpl.java rename to cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFilePathServiceImpl.java index 7589bcc..b6fe7be 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/system/service/impl/CsFilePathServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFilePathServiceImpl.java @@ -1,10 +1,10 @@ -package com.njcn.system.service.impl; +package com.njcn.cssystem.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.system.mapper.CsFilePathMapper; -import com.njcn.system.pojo.po.CsFilePathPO; -import com.njcn.system.service.CsFilePathService; +import com.njcn.cssystem.service.CsFilePathService; +import com.njcn.cssystem.mapper.CsFilePathMapper; +import com.njcn.cssystem.pojo.po.CsFilePathPO; import org.springframework.stereotype.Service; /** *