From d092cbeff4e653e60f996d7d6bd3eab8d2631798 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Tue, 11 Jul 2023 09:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E9=A1=B9=E7=9B=AE=E4=B8=AD?= =?UTF-8?q?=E6=97=A0=E6=95=88=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/csdevice/api/CsEdDataFeignClient.java | 4 ++-- .../com/njcn/csdevice/api/CsLineFeignClient.java | 6 ------ .../njcn/csdevice/api/DevModelFeignClient.java | 4 ++-- .../api/DevModelRelationFeignClient.java | 6 ------ .../CsEdDataFeignClientFallbackFactory.java | 6 +++--- .../CsLineTopologyClientFallbackFactory.java | 2 -- .../DataSetFeignClientFallbackFactory.java | 5 ----- .../DevModelFeignClientFallbackFactory.java | 6 +++--- ...vModelRelationFeignClientFallbackFactory.java | 1 - .../EquipmentFeignClientFallbackFactory.java | 6 +++--- .../csdevice/pojo/param/CsDevModelAddParm.java | 1 - .../csdevice/pojo/param/CsDevModelAuditParm.java | 1 - .../csdevice/pojo/param/CsEdDataAuditParm.java | 1 - .../pojo/param/CsEquipmentDeliveryQueryParm.java | 4 ---- .../njcn/csdevice/pojo/param/CsLedgerParam.java | 1 - .../csdevice/pojo/param/CsTouristDataParm.java | 3 --- .../com/njcn/csdevice/pojo/po/CsDataArray.java | 5 ----- .../com/njcn/csdevice/pojo/po/CsDataSet.java | 2 -- .../com/njcn/csdevice/pojo/po/CsDevModelPO.java | 2 -- .../njcn/csdevice/pojo/po/CsDeviceUserPO.java | 3 --- .../csdevice/pojo/po/CsEngineeringUserPO.java | 1 - .../csdevice/pojo/po/CsEquipmentTransferPO.java | 2 -- .../java/com/njcn/csdevice/pojo/po/CsGroArr.java | 5 ----- .../java/com/njcn/csdevice/pojo/po/CsGroup.java | 5 ----- .../java/com/njcn/csdevice/pojo/po/CsLedger.java | 5 ----- .../java/com/njcn/csdevice/pojo/po/CsLinePO.java | 4 ++-- .../csdevice/pojo/po/CsLineTopologyTemplate.java | 5 ++--- .../pojo/po/CsTopologyDiagramTemplate.java | 3 --- .../njcn/csdevice/pojo/po/CsTouristDataPO.java | 4 ---- .../njcn/csdevice/pojo/vo/CsEngineeringVO.java | 1 - .../csdevice/pojo/vo/CsEquipmentDeliveryVO.java | 1 - .../pojo/vo/CsTopologyDiagramTemplateVO.java | 5 ----- .../com/njcn/csdevice/utils/ReflectUtils.java | 1 + .../controller/data/DataEffectiveController.java | 10 +++++----- .../equipment/CsDataArrayController.java | 1 - .../CsEquipmentTransferPOController.java | 2 +- .../controller/equipment/CsGroArrController.java | 11 +++++------ .../controller/equipment/DevModelController.java | 10 +++++----- .../equipment/DevModelRelationController.java | 10 +++++----- .../equipment/DeviceUserController.java | 3 --- .../equipment/EquipmentDeliveryController.java | 4 +++- .../controller/equipment/MqttUserController.java | 16 +--------------- .../controller/ledger/CsLedgerController.java | 6 +----- .../project/AppTopologyController.java | 10 +++++----- .../controller/project/CsEdDataController.java | 10 +++++----- .../project/CsEngineeringUserController.java | 8 ++++---- .../project/CsTouristDataPOController.java | 5 ++++- .../project/EngineeringController.java | 10 +++++----- .../project/LineTopologyDiagramController.java | 11 +++++------ .../project/TopologyTemplateController.java | 13 +++++-------- .../njcn/csdevice/mapper/AppProjectMapper.java | 1 - .../mapper/CsEquipmentDeliveryMapper.java | 2 -- .../com/njcn/csdevice/mapper/CsLedgerMapper.java | 1 - .../csdevice/service/CsDataEffectiveService.java | 2 +- .../service/CsDevModelRelationService.java | 2 +- .../csdevice/service/CsDeviceUserPOService.java | 2 +- .../njcn/csdevice/service/CsEdDataService.java | 2 +- .../csdevice/service/CsEngineeringService.java | 2 +- .../service/CsEquipmentDeliveryService.java | 6 +++--- .../service/CsEquipmentTransferPOService.java | 2 +- .../njcn/csdevice/service/CsLinePOService.java | 2 +- .../csdevice/service/CsTouristDataPOService.java | 2 +- .../csdevice/service/ICsDataArrayService.java | 3 --- .../csdevice/service/RoleEngineerDevService.java | 4 ---- .../service/impl/AppProjectServiceImpl.java | 4 ---- .../service/impl/CsDataArrayServiceImpl.java | 6 +++++- .../service/impl/CsDataEffectiveServiceImpl.java | 2 +- .../impl/CsDevModelRelationServiceImpl.java | 2 +- .../service/impl/CsDevModelServiceImpl.java | 4 ---- .../service/impl/CsDeviceUserPOServiceImpl.java | 11 ++++------- .../service/impl/CsEngineeringServiceImpl.java | 2 -- .../impl/CsEngineeringUserServiceImpl.java | 2 -- .../impl/CsEquipmentDeliveryServiceImpl.java | 1 - .../impl/CsEquipmentTransferPOServiceImpl.java | 1 - .../service/impl/CsLedgerServiceImpl.java | 9 ++++----- .../service/impl/CsLinePOServiceImpl.java | 1 - .../CsTopologyDiagramTemplateServiceImpl.java | 2 -- .../service/impl/CsTouristDataPOServiceImpl.java | 12 +++++------- .../src/test/java/com/njcn/AppTest.java | 4 ++-- .../src/test/java/com/njcn/AppTest.java | 4 ++-- .../csharmonic/param/CsConfigurationParm.java | 1 - .../param/DevicDataTrendQueryParam.java | 1 - .../com/njcn/csharmonic/pojo/po/CsElement.java | 5 ----- .../com/njcn/csharmonic/pojo/vo/CsRtDataVO.java | 1 - .../controller/CsConfigurationController.java | 5 +++-- .../controller/CsElementController.java | 8 +------- .../controller/CsNetDevPOController.java | 4 +++- .../controller/CsPagePOController.java | 12 +++++++----- .../controller/DeviceDataTrendController.java | 1 - .../controller/LineTargetController.java | 1 - .../controller/StableDataController.java | 5 ++--- .../csharmonic/handler/MqttMessageHandler.java | 1 - .../njcn/csharmonic/service/CsPagePOService.java | 2 -- .../csharmonic/service/ICsElementService.java | 1 - .../csharmonic/service/ILineTargetService.java | 1 - .../csharmonic/service/StableDataService.java | 2 -- .../service/impl/CsConfigurationServiceImpl.java | 2 -- .../service/impl/CsPagePOServiceImpl.java | 5 ----- .../service/impl/DeviceDataTrendServiceImpl.java | 7 ------- .../service/impl/LineTargetServiceImpl.java | 1 - .../service/impl/StableDataServiceImpl.java | 13 ++++++------- .../src/test/java/com/njcn/AppTest.java | 4 ++-- .../src/test/java/com/njcn/AppTest.java | 4 ++-- .../cssystem/pojo/po/AppBaseInformationPO.java | 1 - .../com/njcn/cssystem/pojo/po/EleEpdPqd.java | 5 ----- .../com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java | 1 - .../njcn/cssystem/CsSystemBootApplication.java | 2 -- .../impl/AppBaseInformationServiceImpl.java | 4 +--- .../service/impl/AppPersonSetServiceImpl.java | 4 +--- .../service/impl/CsFeedbackChatServiceImpl.java | 3 +-- .../service/impl/CsFeedbackServiceImpl.java | 11 +++++------ .../service/impl/CsFilePathServiceImpl.java | 3 +-- .../src/test/java/com/njcn/AppTest.java | 4 ++-- .../cswarn/api/CsEquipmentAlarmFeignClient.java | 8 -------- .../CsEquipmentAlarmClientFallbackFactory.java | 2 -- .../cswarn/pojo/parm/CsEquipmentAlarmParm.java | 4 ---- .../njcn/cswarn/pojo/parm/CsEventDetailParm.java | 5 ----- .../cswarn/pojo/vo/CsEquipmentAlarmCountVO.java | 4 ---- .../njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java | 1 - .../com/njcn/cswarn/CsWarnBootApplication.java | 1 - .../alarm/CsEquipmentAlarmController.java | 5 ++--- .../alarm/CsEventDetailPOController.java | 2 +- .../alarm/CsStatLimitRateDPOController.java | 4 ++-- .../cswarn/mapper/CsEventDetailPOMapper.java | 2 +- .../cswarn/mapper/CsStatLimitRateDPOMapper.java | 2 +- .../service/CsEquipmentAlarmPOService.java | 1 - .../impl/CsEquipmentAlarmPOServiceImpl.java | 7 +++---- .../service/impl/CsEventDetailPOServiceImpl.java | 4 ++-- .../impl/CsStatLimitRateDPOServiceImpl.java | 4 ++-- .../src/test/java/com/njcn/AppTest.java | 4 ++-- 130 files changed, 165 insertions(+), 371 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsEdDataFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsEdDataFeignClient.java index 082ea01..903f00a 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsEdDataFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsEdDataFeignClient.java @@ -1,10 +1,10 @@ package com.njcn.csdevice.api; +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; import com.njcn.csdevice.api.fallback.CsEdDataFeignClientFallbackFactory; import com.njcn.csdevice.pojo.po.CsEdDataPO; import com.njcn.csdevice.pojo.vo.CsEdDataVO; -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java index b5aca86..8dd3204 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java @@ -1,15 +1,9 @@ package com.njcn.csdevice.api; -import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.ServerInfo; -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.csdevice.api.fallback.CsLineClientFallbackFactory; import com.njcn.csdevice.pojo.po.CsLinePO; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelFeignClient.java index 2da5aaf..4d36582 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelFeignClient.java @@ -1,12 +1,12 @@ package com.njcn.csdevice.api; +import com.njcn.common.pojo.constant.ServerInfo; +import com.njcn.common.pojo.response.HttpResult; import com.njcn.csdevice.api.fallback.DevModelFeignClientFallbackFactory; import com.njcn.csdevice.pojo.param.CsDevModelAddParm; import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm; import com.njcn.csdevice.pojo.po.CsDevModelPO; import com.njcn.csdevice.pojo.vo.CsDevModelPageVO; -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelRelationFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelRelationFeignClient.java index ee0f438..8fb7504 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelRelationFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/DevModelRelationFeignClient.java @@ -1,16 +1,10 @@ package com.njcn.csdevice.api; -import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.ServerInfo; -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.csdevice.api.fallback.DevModelRelationFeignClientFallbackFactory; import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm; import com.njcn.csdevice.pojo.po.CsDevModelRelationPO; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsEdDataFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsEdDataFeignClientFallbackFactory.java index 5808063..27c9a96 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsEdDataFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsEdDataFeignClientFallbackFactory.java @@ -1,11 +1,11 @@ package com.njcn.csdevice.api.fallback; -import com.njcn.csdevice.api.CsEdDataFeignClient; -import com.njcn.csdevice.pojo.po.CsEdDataPO; -import com.njcn.csdevice.pojo.vo.CsEdDataVO; 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.csdevice.api.CsEdDataFeignClient; +import com.njcn.csdevice.pojo.po.CsEdDataPO; +import com.njcn.csdevice.pojo.vo.CsEdDataVO; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineTopologyClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineTopologyClientFallbackFactory.java index d55e729..07b5423 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineTopologyClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineTopologyClientFallbackFactory.java @@ -3,10 +3,8 @@ package com.njcn.csdevice.api.fallback; 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.csdevice.api.CsLineFeignClient; import com.njcn.csdevice.api.CsLineTopologyFeignClient; import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO; -import com.njcn.csdevice.pojo.po.CsLinePO; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataSetFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataSetFeignClientFallbackFactory.java index d193bdb..8825985 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataSetFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DataSetFeignClientFallbackFactory.java @@ -4,12 +4,7 @@ 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.csdevice.api.DataSetFeignClient; -import com.njcn.csdevice.api.DevModelFeignClient; -import com.njcn.csdevice.pojo.param.CsDevModelAddParm; -import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm; import com.njcn.csdevice.pojo.po.CsDataSet; -import com.njcn.csdevice.pojo.po.CsDevModelPO; -import com.njcn.csdevice.pojo.vo.CsDevModelPageVO; import com.njcn.csdevice.pojo.vo.LineTargetVO; import com.njcn.csdevice.utils.CsDeviceEnumUtil; import feign.hystrix.FallbackFactory; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelFeignClientFallbackFactory.java index b3b1c15..979da8b 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelFeignClientFallbackFactory.java @@ -1,13 +1,13 @@ package com.njcn.csdevice.api.fallback; +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.csdevice.api.DevModelFeignClient; import com.njcn.csdevice.pojo.param.CsDevModelAddParm; import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm; import com.njcn.csdevice.pojo.po.CsDevModelPO; import com.njcn.csdevice.pojo.vo.CsDevModelPageVO; -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.csdevice.utils.CsDeviceEnumUtil; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelRelationFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelRelationFeignClientFallbackFactory.java index 1816942..ba9fc75 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelRelationFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/DevModelRelationFeignClientFallbackFactory.java @@ -3,7 +3,6 @@ package com.njcn.csdevice.api.fallback; 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.csdevice.api.CsLedgerFeignClient; import com.njcn.csdevice.api.DevModelRelationFeignClient; import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm; import com.njcn.csdevice.pojo.po.CsDevModelRelationPO; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java index b897c47..171183d 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java @@ -1,11 +1,11 @@ package com.njcn.csdevice.api.fallback; -import com.njcn.csdevice.api.EquipmentFeignClient; -import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; -import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; 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.csdevice.api.EquipmentFeignClient; +import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; +import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java index 80bdbfe..42ecba9 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAddParm.java @@ -6,7 +6,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotBlank; -import java.time.LocalDateTime; import java.util.Date; /** diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java index 41a4d52..bbd59c6 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelAuditParm.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java index 20be7a1..97f3c9a 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEdDataAuditParm.java @@ -6,7 +6,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.multipart.MultipartFile; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java index d8f0d18..8a98ac0 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryQueryParm.java @@ -1,14 +1,10 @@ package com.njcn.csdevice.pojo.param; -import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; -import java.util.List; - /** * * Description: diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java index 754e37c..60c6137 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLedgerParam.java @@ -1,7 +1,6 @@ package com.njcn.csdevice.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.db.bo.BaseEntity; import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsTouristDataParm.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsTouristDataParm.java index 6a993b2..3751666 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsTouristDataParm.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsTouristDataParm.java @@ -1,8 +1,5 @@ package com.njcn.csdevice.pojo.param; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataArray.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataArray.java index 5b10fc3..cb6f2eb 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataArray.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataArray.java @@ -2,12 +2,7 @@ package com.njcn.csdevice.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** *

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java index 24f6328..e79e196 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java @@ -2,8 +2,6 @@ package com.njcn.csdevice.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java index 7b1b58d..87b071a 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDevModelPO.java @@ -8,9 +8,7 @@ import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; /** * diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDeviceUserPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDeviceUserPO.java index 2dba255..74a6b3f 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDeviceUserPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDeviceUserPO.java @@ -1,13 +1,10 @@ package com.njcn.csdevice.pojo.po; -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.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEngineeringUserPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEngineeringUserPO.java index 8cd2d28..694d11c 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEngineeringUserPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEngineeringUserPO.java @@ -1,7 +1,6 @@ package com.njcn.csdevice.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; import lombok.Getter; import lombok.Setter; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentTransferPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentTransferPO.java index 95b0606..be30029 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentTransferPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentTransferPO.java @@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Data; -import java.util.Date; - /** * * Description: diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroArr.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroArr.java index 7db9cb1..a6eb066 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroArr.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroArr.java @@ -1,12 +1,7 @@ package com.njcn.csdevice.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** *

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroup.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroup.java index 31343fc..4588ffb 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroup.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsGroup.java @@ -3,12 +3,7 @@ package com.njcn.csdevice.pojo.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** *

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLedger.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLedger.java index 1cdbf31..7809067 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLedger.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLedger.java @@ -4,13 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; -import java.time.LocalDateTime; - import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; /** *

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java index 0ca9e5e..a8eb031 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java @@ -4,11 +4,11 @@ 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 java.math.BigDecimal; - import com.njcn.db.bo.BaseEntity; import lombok.Data; +import java.math.BigDecimal; + /** * * Description: diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLineTopologyTemplate.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLineTopologyTemplate.java index 9644c6e..89bc46c 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLineTopologyTemplate.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLineTopologyTemplate.java @@ -5,13 +5,12 @@ 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.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.math.BigDecimal; -import java.util.Date; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; + /** * * Description: diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTopologyDiagramTemplate.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTopologyDiagramTemplate.java index f5b70f7..c74bfa6 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTopologyDiagramTemplate.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTopologyDiagramTemplate.java @@ -5,9 +5,6 @@ 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.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTouristDataPO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTouristDataPO.java index 7736347..d8561ac 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTouristDataPO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsTouristDataPO.java @@ -1,11 +1,7 @@ package com.njcn.csdevice.pojo.po; -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 io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEngineeringVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEngineeringVO.java index a6e0c62..e4f2029 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEngineeringVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEngineeringVO.java @@ -1,6 +1,5 @@ package com.njcn.csdevice.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java index 199070b..a009272 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java @@ -1,6 +1,5 @@ package com.njcn.csdevice.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsTopologyDiagramTemplateVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsTopologyDiagramTemplateVO.java index ded0799..cf530bd 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsTopologyDiagramTemplateVO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsTopologyDiagramTemplateVO.java @@ -1,12 +1,7 @@ package com.njcn.csdevice.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 lombok.Data; -import lombok.NoArgsConstructor; /** * diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/utils/ReflectUtils.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/utils/ReflectUtils.java index d0294ec..3f1b2cf 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/utils/ReflectUtils.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/utils/ReflectUtils.java @@ -1,6 +1,7 @@ package com.njcn.csdevice.utils; import org.apache.commons.lang3.StringUtils; + import java.beans.PropertyDescriptor; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/data/DataEffectiveController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/data/DataEffectiveController.java index 4a47135..ceacbea 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/data/DataEffectiveController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/data/DataEffectiveController.java @@ -1,16 +1,16 @@ package com.njcn.csdevice.controller.data; -import com.njcn.csdevice.pojo.param.CsDataEffectiveAddParm; -import com.njcn.csdevice.pojo.param.CsDataEffectiveAuditParm; -import com.njcn.csdevice.pojo.param.CsDataEffectiveQueryParm; -import com.njcn.csdevice.pojo.vo.AppBaseInformationVO; -import com.njcn.csdevice.pojo.vo.CsDataEffectiveVO; 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.csdevice.pojo.param.CsDataEffectiveAddParm; +import com.njcn.csdevice.pojo.param.CsDataEffectiveAuditParm; +import com.njcn.csdevice.pojo.param.CsDataEffectiveQueryParm; +import com.njcn.csdevice.pojo.vo.AppBaseInformationVO; +import com.njcn.csdevice.pojo.vo.CsDataEffectiveVO; import com.njcn.csdevice.service.CsDataEffectiveService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java index 8067fc8..e551ea4 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java @@ -9,7 +9,6 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.po.CsDataArray; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; -import com.njcn.csdevice.pojo.vo.LineTargetVO; import com.njcn.csdevice.service.ICsDataArrayService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentTransferPOController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentTransferPOController.java index 006330b..19e097b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentTransferPOController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentTransferPOController.java @@ -1,11 +1,11 @@ package com.njcn.csdevice.controller.equipment; -import com.njcn.csdevice.pojo.param.CsEquipmentTransferAddParm; 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.csdevice.pojo.param.CsEquipmentTransferAddParm; import com.njcn.csdevice.service.CsEquipmentTransferPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroArrController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroArrController.java index b844495..a5ac96a 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroArrController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsGroArrController.java @@ -8,18 +8,17 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.csdevice.pojo.param.GroupArrParam; -import com.njcn.csdevice.pojo.vo.CsGroupVO; import com.njcn.csdevice.service.ICsGroArrService; +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 lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import com.njcn.web.controller.BaseController; - -import java.util.List; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** *

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java index a80f767..95468b0 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java @@ -1,17 +1,17 @@ package com.njcn.csdevice.controller.equipment; 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.csdevice.pojo.param.CsDevModelAddParm; import com.njcn.csdevice.pojo.param.CsDevModelAuditParm; import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm; import com.njcn.csdevice.pojo.param.CsDevModelQueryParm; import com.njcn.csdevice.pojo.po.CsDevModelPO; import com.njcn.csdevice.pojo.vo.CsDevModelPageVO; -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.csdevice.service.CsDevModelService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelRelationController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelRelationController.java index 5a9ae71..cde6f08 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelRelationController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelRelationController.java @@ -1,16 +1,16 @@ package com.njcn.csdevice.controller.equipment; -import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm; -import com.njcn.csdevice.pojo.param.CsDevModelRelationAuidtParm; -import com.njcn.csdevice.pojo.param.CsDevModelRelationQueryParm; -import com.njcn.csdevice.pojo.po.CsDevModelRelationPO; -import com.njcn.csdevice.pojo.vo.CsDevModelRelationVO; 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.csdevice.pojo.param.CsDevModelRelationAddParm; +import com.njcn.csdevice.pojo.param.CsDevModelRelationAuidtParm; +import com.njcn.csdevice.pojo.param.CsDevModelRelationQueryParm; +import com.njcn.csdevice.pojo.po.CsDevModelRelationPO; +import com.njcn.csdevice.pojo.vo.CsDevModelRelationVO; import com.njcn.csdevice.service.CsDevModelRelationService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java index 28c1155..34dc0f5 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceUserController.java @@ -5,18 +5,15 @@ 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.csdevice.pojo.param.CsEquipmentTransferAddParm; import com.njcn.csdevice.pojo.po.CsDeviceUserPO; import com.njcn.csdevice.pojo.vo.DevCountVO; import com.njcn.csdevice.service.CsDeviceUserPOService; -import com.njcn.csdevice.service.CsEquipmentTransferPOService; 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 lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index 3ca8a1d..288f415 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -12,7 +12,9 @@ import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAuditParm; import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm; import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; -import com.njcn.csdevice.pojo.vo.*; +import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; +import com.njcn.csdevice.pojo.vo.DeviceManagerVO; +import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; import com.njcn.csdevice.service.CsEquipmentDeliveryService; import com.njcn.csdevice.service.IMqttUserService; import com.njcn.web.controller.BaseController; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java index 711d1ae..24f099f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/MqttUserController.java @@ -1,26 +1,12 @@ package com.njcn.csdevice.controller.equipment; -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.csdevice.pojo.param.CsDevModelAddParm; -import com.njcn.csdevice.pojo.po.CsDevModelPO; -import com.njcn.csdevice.service.IMqttUserService; +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 lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; -import com.njcn.web.controller.BaseController; /** *

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java index ba11215..1de3b31 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java @@ -6,13 +6,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.csdevice.mapper.AppProjectMapper; import com.njcn.csdevice.pojo.param.CsLedgerParam; import com.njcn.csdevice.pojo.po.CsLedger; -import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.vo.CsLedgerVO; -import com.njcn.csdevice.service.CsLinePOService; import com.njcn.csdevice.service.ICsLedgerService; +import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -21,8 +19,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.njcn.web.controller.BaseController; - import java.util.List; /** diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppTopologyController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppTopologyController.java index 7d6dad2..883f255 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppTopologyController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppTopologyController.java @@ -1,17 +1,17 @@ package com.njcn.csdevice.controller.project; 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.csdevice.pojo.param.AppTopologyDiagramAddParm; import com.njcn.csdevice.pojo.param.AppTopologyDiagramAuditParm; import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryPageParm; import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm; import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO; import com.njcn.csdevice.service.AppTopologyDiagramService; -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.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEdDataController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEdDataController.java index 5c52805..cac4e0a 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEdDataController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEdDataController.java @@ -1,16 +1,16 @@ package com.njcn.csdevice.controller.project; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.njcn.csdevice.pojo.param.CsEdDataAddParm; -import com.njcn.csdevice.pojo.param.CsEdDataAuditParm; -import com.njcn.csdevice.pojo.param.CsEdDataQueryParm; -import com.njcn.csdevice.pojo.vo.CsEdDataVO; -import com.njcn.csdevice.service.CsEdDataService; 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.csdevice.pojo.param.CsEdDataAddParm; +import com.njcn.csdevice.pojo.param.CsEdDataAuditParm; +import com.njcn.csdevice.pojo.param.CsEdDataQueryParm; +import com.njcn.csdevice.pojo.vo.CsEdDataVO; +import com.njcn.csdevice.service.CsEdDataService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEngineeringUserController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEngineeringUserController.java index 2b8ca85..8abe7aa 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEngineeringUserController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsEngineeringUserController.java @@ -8,14 +8,14 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.po.CsEngineeringPO; import com.njcn.csdevice.service.ICsEngineeringUserService; +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 lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import com.njcn.web.controller.BaseController; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java index 6d60fd7..6d799ca 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/CsTouristDataPOController.java @@ -15,7 +15,10 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java index e1dac4d..d9f76bd 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/EngineeringController.java @@ -1,17 +1,17 @@ package com.njcn.csdevice.controller.project; 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.csdevice.pojo.param.CsEngineeringAddParm; import com.njcn.csdevice.pojo.param.CsEngineeringAuditParm; import com.njcn.csdevice.pojo.param.CsEngineeringQueryPageParm; import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm; import com.njcn.csdevice.pojo.vo.CsEngineeringVO; import com.njcn.csdevice.service.CsEngineeringService; -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.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/LineTopologyDiagramController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/LineTopologyDiagramController.java index 6198215..a29664c 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/LineTopologyDiagramController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/LineTopologyDiagramController.java @@ -1,16 +1,15 @@ package com.njcn.csdevice.controller.project; -import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAddParm; -import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAuditParm; -import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO; -import com.njcn.csdevice.pojo.po.CsLinePO; -import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO; -import com.njcn.csdevice.service.AppLineTopologyDiagramService; 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.csdevice.pojo.param.AppLineTopologyDiagramAddParm; +import com.njcn.csdevice.pojo.param.AppLineTopologyDiagramAuditParm; +import com.njcn.csdevice.pojo.po.AppLineTopologyDiagramPO; +import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO; +import com.njcn.csdevice.service.AppLineTopologyDiagramService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/TopologyTemplateController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/TopologyTemplateController.java index d0682e7..8058a76 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/TopologyTemplateController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/TopologyTemplateController.java @@ -1,15 +1,11 @@ package com.njcn.csdevice.controller.project; -import com.baomidou.mybatisplus.core.metadata.IPage; + import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; 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.csdevice.pojo.param.AppTopologyDiagramQueryPageParm; -import com.njcn.csdevice.pojo.param.AppTopologyDiagramQueryParm; -import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO; import com.njcn.csdevice.pojo.vo.CsTopologyDiagramTemplateVO; import com.njcn.csdevice.service.CsTopologyDiagramTemplateService; import com.njcn.minioss.bo.MinIoUploadResDTO; @@ -19,11 +15,12 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.util.List; /** diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java index b81d893..e113c48 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java @@ -6,7 +6,6 @@ import com.njcn.csdevice.pojo.param.AppProjectQueryParm; import com.njcn.csdevice.pojo.po.AppProjectPO; import com.njcn.csdevice.pojo.vo.AppProjectVO; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; /** * diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java index 2956430..48d55f3 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsEquipmentDeliveryMapper.java @@ -3,12 +3,10 @@ package com.njcn.csdevice.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm; import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; -import com.njcn.system.pojo.vo.EleEpdPqdVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLedgerMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLedgerMapper.java index 4e2fd5d..50e117c 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLedgerMapper.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsLedgerMapper.java @@ -3,7 +3,6 @@ package com.njcn.csdevice.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.njcn.csdevice.pojo.po.CsLedger; import com.njcn.csdevice.pojo.vo.CsLedgerVO; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDataEffectiveService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDataEffectiveService.java index a289c50..8b3867e 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDataEffectiveService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDataEffectiveService.java @@ -1,10 +1,10 @@ package com.njcn.csdevice.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.param.CsDataEffectiveAddParm; import com.njcn.csdevice.pojo.param.CsDataEffectiveAuditParm; import com.njcn.csdevice.pojo.param.CsDataEffectiveQueryParm; import com.njcn.csdevice.pojo.po.CsDataEffectivePO; -import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.vo.CsDataEffectiveVO; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java index a8d2921..0b681a7 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java @@ -1,10 +1,10 @@ package com.njcn.csdevice.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm; import com.njcn.csdevice.pojo.param.CsDevModelRelationAuidtParm; import com.njcn.csdevice.pojo.param.CsDevModelRelationQueryParm; import com.njcn.csdevice.pojo.po.CsDevModelRelationPO; -import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.vo.CsDevModelRelationVO; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java index 220c3e5..aa97f51 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDeviceUserPOService.java @@ -1,7 +1,7 @@ package com.njcn.csdevice.service; -import com.njcn.csdevice.pojo.po.CsDeviceUserPO; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.csdevice.pojo.po.CsDeviceUserPO; import com.njcn.csdevice.pojo.vo.DevCountVO; /** diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEdDataService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEdDataService.java index 9947d29..8edd5af 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEdDataService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEdDataService.java @@ -1,11 +1,11 @@ package com.njcn.csdevice.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.param.CsEdDataAddParm; import com.njcn.csdevice.pojo.param.CsEdDataAuditParm; import com.njcn.csdevice.pojo.param.CsEdDataQueryParm; import com.njcn.csdevice.pojo.po.CsEdDataPO; -import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.vo.CsEdDataVO; /** diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java index 8d0f7e7..d7e6a54 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEngineeringService.java @@ -1,12 +1,12 @@ package com.njcn.csdevice.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.param.CsEngineeringAddParm; import com.njcn.csdevice.pojo.param.CsEngineeringAuditParm; import com.njcn.csdevice.pojo.param.CsEngineeringQueryPageParm; import com.njcn.csdevice.pojo.param.CsEngineeringQueryParm; import com.njcn.csdevice.pojo.po.CsEngineeringPO; -import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.vo.CsEngineeringVO; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java index 141e4a0..41f0ebd 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java @@ -8,9 +8,9 @@ import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAuditParm; import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm; import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; -import com.njcn.csdevice.pojo.vo.*; - -import java.util.List; +import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO; +import com.njcn.csdevice.pojo.vo.DeviceManagerVO; +import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO; /** * diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentTransferPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentTransferPOService.java index 4b65434..5b035bf 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentTransferPOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentTransferPOService.java @@ -1,8 +1,8 @@ package com.njcn.csdevice.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.param.CsEquipmentTransferAddParm; import com.njcn.csdevice.pojo.po.CsEquipmentTransferPO; -import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java index 4c36f44..17ec37b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java @@ -1,7 +1,7 @@ package com.njcn.csdevice.service; -import com.njcn.csdevice.pojo.po.CsLinePO; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.csdevice.pojo.po.CsLinePO; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java index 75463d2..bd1ddc9 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsTouristDataPOService.java @@ -1,8 +1,8 @@ package com.njcn.csdevice.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.param.CsTouristDataParm; import com.njcn.csdevice.pojo.po.CsTouristDataPO; -import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.vo.CsTouristDataParmVO; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java index 065540c..820edaa 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsDataArrayService.java @@ -2,11 +2,8 @@ package com.njcn.csdevice.service; import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.po.CsDataArray; -import com.njcn.csdevice.pojo.po.CsDataSet; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; import com.njcn.csdevice.pojo.vo.DeviceManagerDetailVO; -import com.njcn.csdevice.pojo.vo.LineTargetVO; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java index 5975e49..57f7f1b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/RoleEngineerDevService.java @@ -1,13 +1,9 @@ package com.njcn.csdevice.service; -import cn.hutool.core.collection.CollectionUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.alibaba.nacos.shaded.com.google.gson.JsonArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.njcn.csdevice.mapper.*; import com.njcn.csdevice.pojo.po.*; -import com.njcn.csdevice.pojo.vo.CsLedgerVO; import com.njcn.user.enums.AppRoleEnum; import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java index e25fc7f..da20d63 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java @@ -17,11 +17,7 @@ import com.njcn.csdevice.pojo.vo.AppProjectVO; import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO; import com.njcn.csdevice.service.AppProjectService; import com.njcn.csdevice.service.AppTopologyDiagramService; -import com.njcn.oss.utils.FileStorageUtil; -import com.njcn.web.utils.RequestUtil; -import kotlin.jvm.Throws; import lombok.RequiredArgsConstructor; -import net.bytebuddy.implementation.bytecode.Throw; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java index 1631195..e45f60f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java @@ -52,7 +52,11 @@ public class CsDataArrayServiceImpl extends ServiceImpl diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsRtDataVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsRtDataVO.java index 127bff0..261b0a6 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsRtDataVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/CsRtDataVO.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.njcn.common.utils.serializer.InstantDateSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.influxdb.annotation.Column; import java.time.Instant; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java index 8a9e053..90d01b2 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsConfigurationController.java @@ -1,4 +1,5 @@ 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,6 +7,8 @@ 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.csharmonic.param.CsConfigurationParm; +import com.njcn.csharmonic.pojo.vo.CsConfigurationVO; import com.njcn.csharmonic.service.CsConfigurationService; import com.njcn.minioss.bo.MinIoUploadResDTO; import com.njcn.web.controller.BaseController; @@ -16,8 +19,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -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/csharmonic/controller/CsElementController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java index 62eec84..e0829e7 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java @@ -1,16 +1,14 @@ 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.csharmonic.param.CsPageParm; -import com.njcn.csharmonic.pojo.vo.CsPageVO; import com.njcn.csharmonic.pojo.vo.ElementsVO; import com.njcn.csharmonic.service.ICsElementService; +import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -19,13 +17,9 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; - import org.springframework.web.bind.annotation.RestController; -import com.njcn.web.controller.BaseController; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; - /** *

* 组态图元库 前端控制器 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java index 0fe1d25..450685e 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsNetDevPOController.java @@ -1,9 +1,11 @@ package com.njcn.csharmonic.controller; + import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * (cs_net_dev)表控制层 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java index 91d7f2d..a30ff7a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsPagePOController.java @@ -1,22 +1,24 @@ 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.csharmonic.service.CsPagePOService; +import com.njcn.csharmonic.param.CsPageParm; import com.njcn.csharmonic.pojo.vo.CsPageVO; +import com.njcn.csharmonic.service.CsPagePOService; 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.csharmonic.param.CsPageParm; -import org.springframework.web.bind.annotation.*; - -import java.util.List; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * (cs_page)表控制层 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DeviceDataTrendController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DeviceDataTrendController.java index 950966b..b5b7b4e 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DeviceDataTrendController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DeviceDataTrendController.java @@ -5,7 +5,6 @@ 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.csharmonic.param.CommonStatisticalQueryParam; import com.njcn.csharmonic.param.DevicDataTrendQueryParam; import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.csharmonic.service.DeviceDataTrendService; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java index d0bc89b..6e1d419 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/LineTargetController.java @@ -7,7 +7,6 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; import com.njcn.csharmonic.service.ILineTargetService; -import com.njcn.influx.pojo.dto.StatisticalDataDTO; 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/csharmonic/controller/StableDataController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java index 733eb6f..c6beb70 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StableDataController.java @@ -6,8 +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.csharmonic.param.CommonStatisticalQueryParam; +import com.njcn.csharmonic.param.ThdDataQueryParm; +import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.csharmonic.service.StableDataService; -import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -17,8 +18,6 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -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/csharmonic/handler/MqttMessageHandler.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java index ba601cd..446ee52 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java @@ -7,7 +7,6 @@ import com.github.tocrhz.mqtt.annotation.Payload; import com.github.tocrhz.mqtt.publisher.MqttPublisher; import com.njcn.csharmonic.pojo.vo.CsRtDataVO; import com.njcn.csharmonic.service.ILineTargetService; -import com.njcn.influx.pojo.dto.StatisticalDataDTO; 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/csharmonic/service/CsPagePOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPagePOService.java index 84e2268..2d65525 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPagePOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsPagePOService.java @@ -6,8 +6,6 @@ import com.njcn.csharmonic.param.CsPageParm; import com.njcn.csharmonic.pojo.po.CsPagePO; import com.njcn.csharmonic.pojo.vo.CsPageVO; -import java.util.List; - /** * * Description: diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java index 2e4dab0..fa8d92c 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsElementService.java @@ -1,7 +1,6 @@ package com.njcn.csharmonic.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.csharmonic.param.CsPageParm; import com.njcn.csharmonic.pojo.po.CsElement; import com.njcn.csharmonic.pojo.vo.ElementsVO; import org.springframework.web.multipart.MultipartFile; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ILineTargetService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ILineTargetService.java index 5f9ffef..e8c0a26 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ILineTargetService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ILineTargetService.java @@ -2,7 +2,6 @@ package com.njcn.csharmonic.service; import com.njcn.csdevice.pojo.vo.DataArrayTreeVO; import com.njcn.csharmonic.pojo.vo.CsRtDataVO; -import com.njcn.influx.pojo.dto.StatisticalDataDTO; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/StableDataService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/StableDataService.java index c575105..2449208 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/StableDataService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/StableDataService.java @@ -1,11 +1,9 @@ package com.njcn.csharmonic.service; - import com.njcn.csharmonic.param.CommonStatisticalQueryParam; import com.njcn.csharmonic.param.ThdDataQueryParm; import com.njcn.csharmonic.pojo.vo.ThdDataVO; -import com.njcn.influx.pojo.dto.StatisticalDataDTO; import java.util.List; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java index 801f80b..efa9d74 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java @@ -5,7 +5,6 @@ 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.pojo.exception.BusinessException; -import com.njcn.common.utils.NjcnBeanUtil; import com.njcn.csharmonic.constant.HarmonicConstant; import com.njcn.csharmonic.mapper.CsConfigurationMapper; import com.njcn.csharmonic.param.CsConfigurationParm; @@ -15,7 +14,6 @@ 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; -import com.njcn.web.utils.RequestUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java index 64a5384..9da895e 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java @@ -1,7 +1,6 @@ package com.njcn.csharmonic.service.impl; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -16,21 +15,17 @@ 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; import lombok.RequiredArgsConstructor; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; import java.io.*; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** * diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java index 35712ba..2e9421c 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java @@ -1,17 +1,12 @@ package com.njcn.csharmonic.service.impl; -import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.DataArrayFeignClient; -import com.njcn.csdevice.enums.AlgorithmResponseEnum; -import com.njcn.csdevice.pojo.po.CsDataArray; -import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csharmonic.param.DevicDataTrendQueryParam; import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.csharmonic.service.DeviceDataTrendService; import com.njcn.influx.pojo.dto.StatisticalDataDTO; import com.njcn.influx.service.CommonService; import com.njcn.system.api.EpdFeignClient; -import com.njcn.system.pojo.po.EleEpdPqd; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -21,8 +16,6 @@ import java.math.RoundingMode; import java.time.ZoneId; import java.util.ArrayList; import java.util.List; -import java.util.Objects; -import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java index 6f0d523..b1bffa5 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/LineTargetServiceImpl.java @@ -1,6 +1,5 @@ package com.njcn.csharmonic.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.google.common.reflect.TypeToken; import com.njcn.common.pojo.exception.BusinessException; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java index 27f3b77..7eedc23 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java @@ -8,21 +8,20 @@ import com.njcn.csdevice.enums.AlgorithmResponseEnum; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.utils.ReflectUtils; import com.njcn.csharmonic.param.CommonStatisticalQueryParam; +import com.njcn.csharmonic.param.ThdDataQueryParm; +import com.njcn.csharmonic.pojo.vo.ThdDataVO; import com.njcn.csharmonic.service.StableDataService; - import com.njcn.influx.pojo.dto.StatisticalDataDTO; +import com.njcn.influx.pojo.po.HarmonicRatioData; +import com.njcn.influx.pojo.po.PowerQualityData; import com.njcn.influx.service.CommonService; +import com.njcn.influx.service.HaronicRatioService; +import com.njcn.influx.service.PowerQualityService; import com.njcn.system.api.EpdFeignClient; import com.njcn.system.pojo.po.EleEpdPqd; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -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; -import com.njcn.influx.service.PowerQualityService; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/AppTest.java b/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/AppTest.java index a7e14d2..17c8f16 100644 --- a/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/AppTest.java +++ b/cs-harmonic/cs-harmonic-boot/src/test/java/com/njcn/AppTest.java @@ -1,9 +1,9 @@ package com.njcn; -import static org.junit.Assert.assertTrue; - import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * Unit test for simple App. */ diff --git a/cs-report/cs-report-boot/src/test/java/com/njcn/AppTest.java b/cs-report/cs-report-boot/src/test/java/com/njcn/AppTest.java index a7e14d2..17c8f16 100644 --- a/cs-report/cs-report-boot/src/test/java/com/njcn/AppTest.java +++ b/cs-report/cs-report-boot/src/test/java/com/njcn/AppTest.java @@ -1,9 +1,9 @@ package com.njcn; -import static org.junit.Assert.assertTrue; - import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * Unit test for simple App. */ diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppBaseInformationPO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppBaseInformationPO.java index 07f131e..eee28f2 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppBaseInformationPO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppBaseInformationPO.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Data; -import org.influxdb.annotation.Column; /** * diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/EleEpdPqd.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/EleEpdPqd.java index 7ef7da3..205928e 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/EleEpdPqd.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/EleEpdPqd.java @@ -2,12 +2,7 @@ package com.njcn.cssystem.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; - import lombok.Data; -import lombok.Getter; -import lombok.Setter; /** *

diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java index 5bbd095..0216bff 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/EleEpdPqdVO.java @@ -3,7 +3,6 @@ package com.njcn.cssystem.pojo.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/CsSystemBootApplication.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/CsSystemBootApplication.java index 2330097..06ce637 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/CsSystemBootApplication.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/CsSystemBootApplication.java @@ -1,12 +1,10 @@ package com.njcn.cssystem; -import com.github.jeffreyning.mybatisplus.conf.EnableMPP; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.DependsOn; /** diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppBaseInformationServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppBaseInformationServiceImpl.java index ba74a4f..ff59748 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppBaseInformationServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppBaseInformationServiceImpl.java @@ -1,12 +1,10 @@ package com.njcn.cssystem.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.cssystem.mapper.AppBaseInformationMapper; import com.njcn.cssystem.pojo.po.AppBaseInformationPO; import com.njcn.cssystem.service.AppBaseInformationService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppPersonSetServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppPersonSetServiceImpl.java index a689887..aeb6ab1 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppPersonSetServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppPersonSetServiceImpl.java @@ -1,12 +1,10 @@ package com.njcn.cssystem.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.cssystem.mapper.AppPersonSetMapper; import com.njcn.cssystem.pojo.po.AppPersonSetPO; import com.njcn.cssystem.service.AppPersonSetService; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java index 20b7bd7..03eb6d8 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java @@ -2,12 +2,11 @@ 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.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 com.njcn.cssystem.service.CsFeedbackChatService; 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/cssystem/service/impl/CsFeedbackServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java index 9c17687..cda34dc 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java @@ -4,12 +4,6 @@ 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.cssystem.mapper.CsFeedbackMapper; import com.njcn.cssystem.pojo.param.CsFeedbackAddParm; import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm; @@ -18,6 +12,11 @@ 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 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 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/cssystem/service/impl/CsFilePathServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFilePathServiceImpl.java index b6fe7be..9e10e6a 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFilePathServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFilePathServiceImpl.java @@ -1,10 +1,9 @@ package com.njcn.cssystem.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.njcn.cssystem.service.CsFilePathService; import com.njcn.cssystem.mapper.CsFilePathMapper; import com.njcn.cssystem.pojo.po.CsFilePathPO; +import com.njcn.cssystem.service.CsFilePathService; import org.springframework.stereotype.Service; /** * diff --git a/cs-system/cs-system-boot/src/test/java/com/njcn/AppTest.java b/cs-system/cs-system-boot/src/test/java/com/njcn/AppTest.java index a7e14d2..17c8f16 100644 --- a/cs-system/cs-system-boot/src/test/java/com/njcn/AppTest.java +++ b/cs-system/cs-system-boot/src/test/java/com/njcn/AppTest.java @@ -1,9 +1,9 @@ package com.njcn; -import static org.junit.Assert.assertTrue; - import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * Unit test for simple App. */ diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/CsEquipmentAlarmFeignClient.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/CsEquipmentAlarmFeignClient.java index 63db47d..aaf6422 100644 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/CsEquipmentAlarmFeignClient.java +++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/CsEquipmentAlarmFeignClient.java @@ -1,21 +1,13 @@ package com.njcn.cswarn.api; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.cswarn.api.fallback.CsEquipmentAlarmClientFallbackFactory; import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmParm; import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/fallback/CsEquipmentAlarmClientFallbackFactory.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/fallback/CsEquipmentAlarmClientFallbackFactory.java index 94dbd5e..9019ea9 100644 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/fallback/CsEquipmentAlarmClientFallbackFactory.java +++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/api/fallback/CsEquipmentAlarmClientFallbackFactory.java @@ -1,7 +1,5 @@ package com.njcn.cswarn.api.fallback; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmParm.java index 79a5268..9dfdaac 100644 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmParm.java +++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEquipmentAlarmParm.java @@ -1,17 +1,13 @@ package com.njcn.cswarn.pojo.parm; import com.fasterxml.jackson.annotation.JsonFormat; -import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.web.constant.ValidMessage; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; import java.time.LocalDateTime; /** diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailParm.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailParm.java index dc22fd3..a282b9e 100644 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailParm.java +++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/parm/CsEventDetailParm.java @@ -5,15 +5,10 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import org.springframework.format.annotation.DateTimeFormat; -import org.w3c.dom.stylesheets.LinkStyle; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * Description: diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmCountVO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmCountVO.java index dea2929..8b51f33 100644 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmCountVO.java +++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmCountVO.java @@ -1,13 +1,9 @@ package com.njcn.cswarn.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.db.bo.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; import java.util.List; /** diff --git a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java index 71053ae..ce5db2a 100644 --- a/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java +++ b/cs-warn/cs-warn-api/src/main/java/com/njcn/cswarn/pojo/vo/CsEquipmentAlarmVO.java @@ -1,6 +1,5 @@ package com.njcn.cswarn.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.db.bo.BaseEntity; import lombok.Data; diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/CsWarnBootApplication.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/CsWarnBootApplication.java index 38cb6f2..49a57ba 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/CsWarnBootApplication.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/CsWarnBootApplication.java @@ -5,7 +5,6 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.DependsOn; /** diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEquipmentAlarmController.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEquipmentAlarmController.java index fd5da60..6da2652 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEquipmentAlarmController.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEquipmentAlarmController.java @@ -8,7 +8,8 @@ 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.param.CsEquipmentAlarmPageParm; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmCountVO; +import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; +import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; import com.njcn.cswarn.service.CsEquipmentAlarmPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -21,8 +22,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; import java.util.List; diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEventDetailPOController.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEventDetailPOController.java index 9ab45b0..7e6d84f 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEventDetailPOController.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsEventDetailPOController.java @@ -8,6 +8,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.cswarn.pojo.parm.CsEventDetailParm; +import com.njcn.cswarn.pojo.vo.CsEventDetailVO; import com.njcn.cswarn.service.CsEventDetailPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.njcn.cswarn.pojo.vo.CsEventDetailVO; import java.util.List; diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsStatLimitRateDPOController.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsStatLimitRateDPOController.java index c6fc452..c250ecb 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsStatLimitRateDPOController.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/controller/alarm/CsStatLimitRateDPOController.java @@ -6,6 +6,8 @@ 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.cswarn.pojo.parm.CsStatLimitRatePageParm; +import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; import com.njcn.cswarn.service.CsStatLimitRateDPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -18,8 +20,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.njcn.cswarn.pojo.parm.CsStatLimitRatePageParm; -import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; /** diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEventDetailPOMapper.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEventDetailPOMapper.java index 9bdba84..f12d268 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEventDetailPOMapper.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsEventDetailPOMapper.java @@ -3,9 +3,9 @@ package com.njcn.cswarn.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.cswarn.pojo.parm.CsEventDetailParm; -import org.apache.ibatis.annotations.Param; import com.njcn.cswarn.pojo.po.CsEventDetailPO; import com.njcn.cswarn.pojo.vo.CsEventDetailVO; +import org.apache.ibatis.annotations.Param; /** * Description: diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsStatLimitRateDPOMapper.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsStatLimitRateDPOMapper.java index 19e1e7b..0ed6798 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsStatLimitRateDPOMapper.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/mapper/CsStatLimitRateDPOMapper.java @@ -2,10 +2,10 @@ package com.njcn.cswarn.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; import com.njcn.cswarn.pojo.parm.CsStatLimitRatePageParm; import com.njcn.cswarn.pojo.po.CsStatLimitRateDPO; import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; +import org.apache.ibatis.annotations.Param; /** * diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEquipmentAlarmPOService.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEquipmentAlarmPOService.java index 4de17d9..72cc170 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEquipmentAlarmPOService.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/CsEquipmentAlarmPOService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.njcn.csdevice.pojo.param.CsEquipmentAlarmPageParm; import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; import com.njcn.cswarn.pojo.po.CsEquipmentAlarmPO; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmCountVO; import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; import java.util.List; diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java index 7cb8f56..6de437d 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEquipmentAlarmPOServiceImpl.java @@ -11,7 +11,9 @@ import com.njcn.csdevice.pojo.param.CsEquipmentAlarmPageParm; import com.njcn.csdevice.pojo.po.AppProjectPO; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; import com.njcn.cswarn.mapper.CsEquipmentAlarmPOMapper; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmCountVO; +import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; +import com.njcn.cswarn.pojo.po.CsEquipmentAlarmPO; +import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; import com.njcn.cswarn.service.CsEquipmentAlarmPOService; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; @@ -21,9 +23,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.njcn.cswarn.pojo.parm.CsEquipmentAlarmAddParm; -import com.njcn.cswarn.pojo.po.CsEquipmentAlarmPO; -import com.njcn.cswarn.pojo.vo.CsEquipmentAlarmVO; import java.util.List; import java.util.Map; diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java index bd996ac..9efb9ca 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsEventDetailPOServiceImpl.java @@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.cswarn.mapper.CsEventDetailPOMapper; import com.njcn.cswarn.pojo.parm.CsEventDetailParm; +import com.njcn.cswarn.pojo.po.CsEventDetailPO; +import com.njcn.cswarn.pojo.vo.CsEventDetailVO; import com.njcn.cswarn.service.CsEventDetailPOService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import com.njcn.cswarn.pojo.po.CsEventDetailPO; -import com.njcn.cswarn.pojo.vo.CsEventDetailVO; import java.util.List; diff --git a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java index 11470d5..c2f084e 100644 --- a/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java +++ b/cs-warn/cs-warn-boot/src/main/java/com/njcn/cswarn/service/impl/CsStatLimitRateDPOServiceImpl.java @@ -4,11 +4,11 @@ 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.cswarn.mapper.CsStatLimitRateDPOMapper; -import com.njcn.cswarn.service.CsStatLimitRateDPOService; -import org.springframework.stereotype.Service; import com.njcn.cswarn.pojo.parm.CsStatLimitRatePageParm; import com.njcn.cswarn.pojo.po.CsStatLimitRateDPO; import com.njcn.cswarn.pojo.vo.CsStatLimitRateDVO; +import com.njcn.cswarn.service.CsStatLimitRateDPOService; +import org.springframework.stereotype.Service; /** * diff --git a/cs-warn/cs-warn-boot/src/test/java/com/njcn/AppTest.java b/cs-warn/cs-warn-boot/src/test/java/com/njcn/AppTest.java index a7e14d2..17c8f16 100644 --- a/cs-warn/cs-warn-boot/src/test/java/com/njcn/AppTest.java +++ b/cs-warn/cs-warn-boot/src/test/java/com/njcn/AppTest.java @@ -1,9 +1,9 @@ package com.njcn; -import static org.junit.Assert.assertTrue; - import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * Unit test for simple App. */