From 413f6681796c0adaab4686095d799fa67009569a Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Tue, 21 Jan 2025 14:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=A3=85=E7=BD=AE=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=92=8C=E6=A3=80=E6=B5=8B=E8=AE=A1=E5=88=92=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {device => detection}/Readme.md | 7 ++- detection/pom.xml | 24 +++------ .../controller/PreDetectionController.java | 14 ++--- .../handler/SocketDevResponseService.java | 17 +++---- .../handler/SocketSourceResponseService.java | 7 ++- .../service/impl/DetectionServiceImpl.java | 14 ++--- .../service/impl/PreDetectionServiceImpl.java | 28 +++------- .../detection/util/socket/CnSocketUtil.java | 5 -- .../util/socket/FormalTestManager.java | 3 +- .../detection/util/socket/SocketManager.java | 6 +-- .../util/socket/XiNumberManager.java | 2 +- .../util/socket/cilent/NettyClient.java | 1 - .../socket/cilent/NettyDevClientHandler.java | 5 +- .../NettyServerChannelInitializer.java | 1 - .../socket/service/NettyServerHandler.java | 1 - .../util/socket/web/WebSocketInitializer.java | 2 - .../device/controller/PqDevController.java | 17 +++---- .../gather}/device/mapper/PqDevMapper.java | 8 +-- .../device/mapper/mapping/PqDevMapper.xml | 6 +-- .../device/pojo/constant/DevValidMessage.java | 0 .../device/pojo/enums/CheckResultEnum.java | 0 .../device/pojo/enums/CheckStateEnum.java | 0 .../gather/device/pojo/enums/CommonEnum.java | 0 .../pojo/enums/DevDocumentStateEnum.java | 0 .../device/pojo/enums/DevReportStateEnum.java | 0 .../device/pojo/enums/DevResponseEnum.java | 0 .../pojo/enums/FactorCheckResultEnum.java | 0 .../gather/device/pojo/enums/PatternEnum.java | 0 .../pojo/enums/PlanReportStateEnum.java | 0 .../pojo/enums/TimeCheckResultEnum.java | 0 .../gather}/device/pojo/param/PqDevParam.java | 4 +- .../njcn/gather}/device/pojo/po/PqDev.java | 2 +- .../gather}/device/pojo/vo/CNDevExcel.java | 2 +- .../gather}/device/pojo/vo/PqDevExcel.java | 4 +- .../njcn/gather}/device/pojo/vo/PqDevVO.java | 4 +- .../gather}/device/pojo/vo/PreDetection.java | 5 +- .../gather}/device/service/IPqDevService.java | 22 ++++---- .../device/service/impl/PqDevServiceImpl.java | 32 ++++++------ .../err/controller/PqErrSysController.java | 10 ++-- .../err/mapper/PqErrSysDtlsMapper.java | 4 +- .../gather}/err/mapper/PqErrSysMapper.java | 4 +- .../err/mapper/mapping/PqErrSysDtlsMapper.xml | 2 +- .../err/mapper/mapping/PqErrSysMapper.xml | 7 +++ .../err/pojo/param/PqErrSysDtlsParam.java | 2 +- .../gather}/err/pojo/param/PqErrSysParam.java | 2 +- .../njcn/gather}/err/pojo/po/PqErrSys.java | 2 +- .../gather}/err/pojo/po/PqErrSysDtls.java | 2 +- .../err/pojo/vo/ErrDtlsCheckDataVO.java | 4 +- .../gather}/err/pojo/vo/PqErrSysDtlsVO.java | 2 +- .../err/service/IPqErrSysDtlsService.java | 10 ++-- .../gather}/err/service/IPqErrSysService.java | 9 ++-- .../service/impl/PqErrSysDtlsServiceImpl.java | 20 ++++---- .../err/service/impl/PqErrSysServiceImpl.java | 16 +++--- .../controller/PqMonitorController.java | 4 +- .../monitor/mapper/PqMonitorMapper.java | 8 +-- .../mapper/mapping/PqMonitorMapper.xml | 4 +- .../monitor/pojo/param/PqMonitorParam.java | 2 +- .../gather}/monitor/pojo/po/PqMonitor.java | 2 +- .../monitor/pojo/vo/PqMonitorExcel.java | 2 +- .../monitor/service/IPqMonitorService.java | 9 ++-- .../service/impl/PqMonitorServiceImpl.java | 18 +++---- .../plan/controller/AdPlanController.java | 4 +- .../plan/mapper/AdPlanSourceMapper.java | 2 +- .../mapper/mapping/AdPlanSourceMapper.xml | 2 +- .../njcn/gather/plan/pojo/vo/AdPlanExcel.java | 4 +- .../plan/service/IAdPlanSourceService.java | 2 +- .../plan/service/impl/AdPlanServiceImpl.java | 20 ++++---- .../service/impl/AdPlanSourceServiceImpl.java | 2 +- .../service/impl/ReportServiceImpl.java | 16 +++--- .../result/controller/ResultController.java | 2 +- .../gather/result/pojo/vo/RawDataExcel.java | 2 +- .../service/impl/ResultServiceImpl.java | 16 +++--- .../script/controller/PqScriptController.java | 16 +++--- .../mapper/PqScriptCheckDataMapper.java | 4 +- .../script/mapper/PqScriptDtlsMapper.java | 4 +- .../gather}/script/mapper/PqScriptMapper.java | 4 +- .../mapping/PqScriptCheckDataMapper.xml | 2 +- .../mapper/mapping/PqScriptDtlsMapper.xml | 2 +- .../script/mapper/mapping/PqScriptMapper.xml | 2 +- .../script/pojo/enums/ResultUnitEnum.java | 2 +- .../pojo/param/PqScriptCheckDataParam.java | 2 +- .../script/pojo/param/PqScriptIssueParam.java | 2 +- .../script/pojo/param/PqScriptParam.java | 2 +- .../njcn/gather}/script/pojo/po/PqScript.java | 2 +- .../script/pojo/po/PqScriptCheckData.java | 2 +- .../gather}/script/pojo/po/PqScriptDtls.java | 2 +- .../gather}/script/pojo/po/SourceIssue.java | 2 +- .../script/pojo/vo/PqScriptCheckDataVO.java | 2 +- .../service/IPqScriptCheckDataService.java | 8 ++- .../script/service/IPqScriptDtlsService.java | 8 +-- .../script/service/IPqScriptService.java | 6 +-- .../impl/PqScriptCheckDataServiceImpl.java | 10 ++-- .../service/impl/PqScriptDtlsServiceImpl.java | 29 +++++------ .../service/impl/PqScriptServiceImpl.java | 12 ++--- .../gather}/script/util/ScriptDtlsDesc.java | 6 +-- .../source/controller/PqSourceController.java | 12 ++--- .../gather}/source/mapper/PqSourceMapper.java | 4 +- .../source/mapper/mapping/PqSourceMapper.xml | 2 +- .../source/pojo/param/PqSourceParam.java | 2 +- .../njcn/gather}/source/pojo/po/PqSource.java | 2 +- .../source/pojo/po/SourceInitialize.java | 2 +- .../gather}/source/pojo/po/SourceParam.java | 2 +- .../source/service/IPqSourceService.java | 10 ++-- .../service/impl/PqSourceServiceImpl.java | 18 +++---- .../type/controller/DevTypeController.java | 13 ++--- .../com/njcn/gather}/type/entity/DevType.java | 2 +- .../gather}/type/mapper/DevTypeMapper.java | 4 +- .../type/mapper/mapping/DevTypeMapper.xml | 2 +- .../gather}/type/service/IDevTypeService.java | 4 +- .../type/service/impl/DevTypeServiceImpl.java | 8 +-- .../com/njcn/gather}/util/DeviceUtil.java | 2 +- .../mapper/PqScriptCheckdataMapper.xml | 2 +- device/pom.xml | 51 ------------------- .../pojo/enums/TimeCheckResultEnum.java | 22 -------- .../mapping/PqScriptCheckDataMapper.xml | 7 --- entrance/pom.xml | 7 +-- entrance/src/main/resources/application.yml | 2 +- pom.xml | 1 - 118 files changed, 314 insertions(+), 458 deletions(-) rename {device => detection}/Readme.md (56%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/controller/PqDevController.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/mapper/PqDevMapper.java (69%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/mapper/mapping/PqDevMapper.xml (88%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/CheckResultEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/CheckStateEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/CommonEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/DevDocumentStateEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/DevReportStateEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/FactorCheckResultEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/PatternEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/PlanReportStateEnum.java (100%) rename {device => detection}/src/main/java/com/njcn/gather/device/pojo/enums/TimeCheckResultEnum.java (100%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/pojo/param/PqDevParam.java (98%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/pojo/po/PqDev.java (98%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/pojo/vo/CNDevExcel.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/pojo/vo/PqDevExcel.java (98%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/pojo/vo/PqDevVO.java (94%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/pojo/vo/PreDetection.java (94%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/service/IPqDevService.java (87%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/device/service/impl/PqDevServiceImpl.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/controller/PqErrSysController.java (95%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/mapper/PqErrSysDtlsMapper.java (64%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/mapper/PqErrSysMapper.java (63%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/mapper/mapping/PqErrSysDtlsMapper.xml (68%) create mode 100644 detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysMapper.xml rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/pojo/param/PqErrSysDtlsParam.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/pojo/param/PqErrSysParam.java (98%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/pojo/po/PqErrSys.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/pojo/po/PqErrSysDtls.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/pojo/vo/ErrDtlsCheckDataVO.java (82%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/pojo/vo/PqErrSysDtlsVO.java (91%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/service/IPqErrSysDtlsService.java (83%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/service/IPqErrSysService.java (87%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/service/impl/PqErrSysDtlsServiceImpl.java (89%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/err/service/impl/PqErrSysServiceImpl.java (95%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/controller/PqMonitorController.java (82%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/mapper/PqMonitorMapper.java (63%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/mapper/mapping/PqMonitorMapper.xml (70%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/pojo/param/PqMonitorParam.java (96%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/pojo/po/PqMonitor.java (94%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/pojo/vo/PqMonitorExcel.java (96%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/service/IPqMonitorService.java (82%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/monitor/service/impl/PqMonitorServiceImpl.java (77%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/controller/PqScriptController.java (93%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/mapper/PqScriptCheckDataMapper.java (65%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/mapper/PqScriptDtlsMapper.java (62%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/mapper/PqScriptMapper.java (85%) rename device/src/main/java/com/njcn/gather/device/script/mapper/mapping/PqScriptDtlsMapper.xml => detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptCheckDataMapper.xml (67%) rename device/src/main/java/com/njcn/gather/device/err/mapper/mapping/PqErrSysMapper.xml => detection/src/main/java/com/njcn/gather/script/mapper/mapping/PqScriptDtlsMapper.xml (72%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/mapper/mapping/PqScriptMapper.xml (86%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/enums/ResultUnitEnum.java (94%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/param/PqScriptCheckDataParam.java (89%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/param/PqScriptIssueParam.java (92%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/param/PqScriptParam.java (98%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/po/PqScript.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/po/PqScriptCheckData.java (96%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/po/PqScriptDtls.java (97%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/po/SourceIssue.java (99%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/pojo/vo/PqScriptCheckDataVO.java (92%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/service/IPqScriptCheckDataService.java (66%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/service/IPqScriptDtlsService.java (87%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/service/IPqScriptService.java (91%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/service/impl/PqScriptCheckDataServiceImpl.java (93%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/service/impl/PqScriptDtlsServiceImpl.java (95%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/service/impl/PqScriptServiceImpl.java (92%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/script/util/ScriptDtlsDesc.java (96%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/controller/PqSourceController.java (94%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/mapper/PqSourceMapper.java (62%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/mapper/mapping/PqSourceMapper.xml (68%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/pojo/param/PqSourceParam.java (98%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/pojo/po/PqSource.java (95%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/pojo/po/SourceInitialize.java (95%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/pojo/po/SourceParam.java (87%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/service/IPqSourceService.java (86%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/source/service/impl/PqSourceServiceImpl.java (94%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/type/controller/DevTypeController.java (73%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/type/entity/DevType.java (95%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/type/mapper/DevTypeMapper.java (68%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/type/mapper/mapping/DevTypeMapper.xml (69%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/type/service/IDevTypeService.java (75%) rename {device/src/main/java/com/njcn/gather/device => detection/src/main/java/com/njcn/gather}/type/service/impl/DevTypeServiceImpl.java (81%) rename {device/src/main/java/com/njcn/gather/device/device => detection/src/main/java/com/njcn/gather}/util/DeviceUtil.java (97%) rename {device => detection}/src/main/resources/mapper/PqScriptCheckdataMapper.xml (91%) delete mode 100644 device/pom.xml delete mode 100644 device/src/main/java/com/njcn/gather/device/device/pojo/enums/TimeCheckResultEnum.java delete mode 100644 device/src/main/java/com/njcn/gather/device/script/mapper/mapping/PqScriptCheckDataMapper.xml diff --git a/device/Readme.md b/detection/Readme.md similarity index 56% rename from device/Readme.md rename to detection/Readme.md index 440dbe1a..13345953 100644 --- a/device/Readme.md +++ b/detection/Readme.md @@ -1,6 +1,9 @@ #### 简介 设备模块主要包含以下功能： +* 检测计划管理 * 被检设备管理 -* 检测脚本管理 +* 被检设备下监测点管理 * 误差体系管理 -* 检测源管理 \ No newline at end of file +* 检测脚本管理 +* 检测源管理 +* 检测报告管理 diff --git a/detection/pom.xml b/detection/pom.xml index a2d0cfaa..e6be0098 100644 --- a/detection/pom.xml +++ b/detection/pom.xml @@ -8,10 +8,9 @@ CN_Gather 1.0.0 - detection - + com.njcn njcn-common @@ -29,20 +28,12 @@ spingboot2.3.12 2.3.12 - - - io.netty - netty-all - 4.1.68.Final - - com.njcn.gather - device + system 1.0.0 compile - com.alibaba fastjson @@ -54,22 +45,23 @@ 1.0.0 compile - - + + io.netty + netty-all + 4.1.68.Final + org.apache.poi poi-scratchpad 4.1.2 - org.apache.poi poi 4.1.2 - org.apache.poi @@ -82,7 +74,7 @@ poi-ooxml 4.1.2 - + \ No newline at end of file diff --git a/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java b/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java index 7311a41f..e8b41ea3 100644 --- a/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java +++ b/detection/src/main/java/com/njcn/gather/detection/controller/PreDetectionController.java @@ -1,20 +1,17 @@ package com.njcn.gather.detection.controller; -import com.alibaba.fastjson.JSON; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.gather.detection.pojo.param.PreDetectionParam; -import com.njcn.gather.detection.pojo.po.DevData; import com.njcn.gather.detection.service.PreDetectionService; import com.njcn.gather.detection.service.impl.DetectionServiceImpl; import com.njcn.gather.detection.util.socket.MsgUtil; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.device.service.IPqDevService; -import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam; -import com.njcn.gather.device.script.pojo.po.SourceIssue; -import com.njcn.gather.device.script.service.IPqScriptDtlsService; -import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.device.service.IPqDevService; +import com.njcn.gather.script.pojo.param.PqScriptIssueParam; +import com.njcn.gather.script.pojo.po.SourceIssue; +import com.njcn.gather.script.service.IPqScriptDtlsService; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.HttpResultUtil; import io.swagger.annotations.Api; @@ -24,7 +21,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index db212435..fbc22d18 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -15,14 +15,14 @@ import com.njcn.gather.detection.pojo.po.SourceCompareDev; import com.njcn.gather.detection.pojo.vo.*; import com.njcn.gather.detection.service.impl.DetectionServiceImpl; import com.njcn.gather.detection.util.socket.*; -import com.njcn.gather.device.device.pojo.po.PqDev; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.device.service.IPqDevService; -import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; -import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam; -import com.njcn.gather.device.script.pojo.po.SourceIssue; -import com.njcn.gather.device.script.service.IPqScriptCheckDataService; -import com.njcn.gather.device.script.service.IPqScriptDtlsService; +import com.njcn.gather.device.pojo.po.PqDev; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.device.service.IPqDevService; +import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; +import com.njcn.gather.script.pojo.param.PqScriptIssueParam; +import com.njcn.gather.script.pojo.po.SourceIssue; +import com.njcn.gather.script.service.IPqScriptCheckDataService; +import com.njcn.gather.script.service.IPqScriptDtlsService; import com.njcn.gather.plan.service.IAdPlanService; import com.njcn.gather.storage.pojo.param.StorageParam; import com.njcn.gather.storage.pojo.po.AdHarmonicResult; @@ -46,7 +46,6 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java index 9f464f4e..2653cb1d 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java @@ -16,10 +16,9 @@ import com.njcn.gather.detection.util.socket.SocketManager; import com.njcn.gather.detection.util.socket.WebServiceManager; import com.njcn.gather.detection.util.socket.cilent.NettyClient; import com.njcn.gather.detection.util.socket.cilent.NettyDevClientHandler; -import com.njcn.gather.detection.util.socket.web.WebSocketHandler; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.device.service.IPqDevService; -import com.njcn.gather.device.script.pojo.po.SourceIssue; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.device.service.IPqDevService; +import com.njcn.gather.script.pojo.po.SourceIssue; import com.njcn.gather.system.pojo.enums.DicDataEnum; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java index 1c247357..ffe45eed 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/DetectionServiceImpl.java @@ -11,13 +11,13 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.njcn.gather.detection.pojo.param.PreDetectionParam; import com.njcn.gather.detection.pojo.po.DevData; import com.njcn.gather.detection.pojo.vo.DetectionData; -import com.njcn.gather.device.err.pojo.param.PqErrSysParam; -import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; -import com.njcn.gather.device.err.pojo.vo.ErrDtlsCheckDataVO; -import com.njcn.gather.device.err.service.IPqErrSysDtlsService; -import com.njcn.gather.device.script.pojo.po.PqScriptCheckData; -import com.njcn.gather.device.script.pojo.po.SourceIssue; -import com.njcn.gather.device.script.service.IPqScriptCheckDataService; +import com.njcn.gather.err.pojo.param.PqErrSysParam; +import com.njcn.gather.err.pojo.po.PqErrSysDtls; +import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO; +import com.njcn.gather.err.service.IPqErrSysDtlsService; +import com.njcn.gather.script.pojo.po.PqScriptCheckData; +import com.njcn.gather.script.pojo.po.SourceIssue; +import com.njcn.gather.script.service.IPqScriptCheckDataService; import com.njcn.gather.storage.pojo.po.AdHarmonicResult; import com.njcn.gather.storage.pojo.po.AdNonHarmonicResult; import com.njcn.gather.storage.service.DetectionDataDealService; diff --git a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java index 6b73cb21..d71111ff 100644 --- a/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/detection/service/impl/PreDetectionServiceImpl.java @@ -3,50 +3,36 @@ package com.njcn.gather.detection.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.njcn.common.bean.CustomCacheUtil; -import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.gather.detection.handler.SocketDevResponseService; import com.njcn.gather.detection.handler.SocketSourceResponseService; import com.njcn.gather.detection.pojo.enums.DetectionResponseEnum; import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum; import com.njcn.gather.detection.pojo.param.PreDetectionParam; -import com.njcn.gather.detection.pojo.vo.SocketDataMsg; import com.njcn.gather.detection.pojo.vo.SocketMsg; import com.njcn.gather.detection.service.PreDetectionService; import com.njcn.gather.detection.util.socket.CnSocketUtil; import com.njcn.gather.detection.util.socket.FormalTestManager; -import com.njcn.gather.detection.util.socket.MsgUtil; import com.njcn.gather.detection.util.socket.SocketManager; import com.njcn.gather.detection.util.socket.cilent.NettyClient; import com.njcn.gather.detection.util.socket.cilent.NettySourceClientHandler; -import com.njcn.gather.device.device.service.IPqDevService; -import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; -import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam; -import com.njcn.gather.device.script.pojo.po.PqScriptCheckData; -import com.njcn.gather.device.script.pojo.po.PqScriptDtls; -import com.njcn.gather.device.script.pojo.po.SourceIssue; -import com.njcn.gather.device.script.service.IPqScriptCheckDataService; -import com.njcn.gather.device.script.service.IPqScriptDtlsService; -import com.njcn.gather.device.source.pojo.po.PqSource; -import com.njcn.gather.device.source.pojo.po.SourceInitialize; -import com.njcn.gather.device.source.service.IPqSourceService; +import com.njcn.gather.device.service.IPqDevService; +import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; +import com.njcn.gather.script.pojo.po.SourceIssue; +import com.njcn.gather.script.service.IPqScriptCheckDataService; +import com.njcn.gather.script.service.IPqScriptDtlsService; +import com.njcn.gather.source.pojo.po.SourceInitialize; +import com.njcn.gather.source.service.IPqSourceService; import com.njcn.gather.plan.pojo.po.AdPlan; import com.njcn.gather.plan.pojo.po.AdPlanSource; import com.njcn.gather.plan.service.IAdPlanService; import com.njcn.gather.plan.service.IAdPlanSourceService; -import com.njcn.gather.storage.pojo.param.StorageParam; -import com.njcn.gather.storage.service.AdHarmonicService; import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum; -import com.njcn.gather.system.dictionary.pojo.po.DictTree; import com.njcn.gather.system.dictionary.service.IDictDataService; import io.netty.channel.Channel; -import io.netty.channel.ChannelFutureListener; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java index 3584e054..52763701 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/CnSocketUtil.java @@ -4,13 +4,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum; import com.njcn.gather.detection.pojo.param.PreDetectionParam; -import com.njcn.gather.detection.pojo.vo.CoefficientVO; import com.njcn.gather.detection.pojo.vo.SocketMsg; import com.njcn.gather.detection.pojo.vo.WebSocketVO; -import com.njcn.gather.detection.util.socket.web.WebSocketHandler; -import org.apache.poi.ss.formula.functions.T; - -import java.util.Objects; /** * @Author: cdf diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java index 846fba2e..93a8603a 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/FormalTestManager.java @@ -1,7 +1,6 @@ package com.njcn.gather.detection.util.socket; -import com.njcn.gather.detection.pojo.vo.DevLineTestResult; -import com.njcn.gather.device.device.pojo.vo.PreDetection; +import com.njcn.gather.device.pojo.vo.PreDetection; import java.util.ArrayList; import java.util.HashMap; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/SocketManager.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/SocketManager.java index 39990131..dd1c9d7b 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/SocketManager.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/SocketManager.java @@ -1,13 +1,11 @@ package com.njcn.gather.detection.util.socket; import cn.hutool.core.util.ObjectUtil; -import com.njcn.gather.detection.pojo.dto.DevXiNumData; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.script.pojo.po.SourceIssue; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.script.pojo.po.SourceIssue; import io.netty.channel.Channel; import io.netty.channel.nio.NioEventLoopGroup; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/XiNumberManager.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/XiNumberManager.java index 99ee6167..23489bf6 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/XiNumberManager.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/XiNumberManager.java @@ -2,7 +2,7 @@ package com.njcn.gather.detection.util.socket; import com.njcn.gather.detection.pojo.dto.DevXiNumData; import com.njcn.gather.detection.pojo.vo.CoefficientVO; -import com.njcn.gather.device.script.pojo.po.SourceIssue; +import com.njcn.gather.script.pojo.po.SourceIssue; import java.util.ArrayList; import java.util.List; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java index 33a6577f..024207cd 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyClient.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON; import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum; import com.njcn.gather.detection.pojo.param.PreDetectionParam; import com.njcn.gather.detection.pojo.vo.SocketDataMsg; -import com.njcn.gather.detection.pojo.vo.WebSocketVO; import com.njcn.gather.detection.util.socket.CnSocketUtil; import com.njcn.gather.detection.util.socket.SocketManager; import com.njcn.gather.detection.util.socket.WebServiceManager; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java index 4d70aa93..a55d1ca9 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/cilent/NettyDevClientHandler.java @@ -6,11 +6,10 @@ import com.njcn.gather.detection.handler.SocketDevResponseService; import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum; import com.njcn.gather.detection.pojo.param.PreDetectionParam; import com.njcn.gather.detection.pojo.vo.DevLineTestResult; -import com.njcn.gather.detection.pojo.vo.SocketMsg; import com.njcn.gather.detection.pojo.vo.WebSocketVO; import com.njcn.gather.detection.util.socket.*; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.script.pojo.po.SourceIssue; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.script.pojo.po.SourceIssue; import com.njcn.gather.system.pojo.enums.DicDataEnum; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerChannelInitializer.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerChannelInitializer.java index 3599d0ed..c218c64b 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerChannelInitializer.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerChannelInitializer.java @@ -1,6 +1,5 @@ package com.njcn.gather.detection.util.socket.service; -import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelInitializer; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.string.StringDecoder; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerHandler.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerHandler.java index b3c93ae3..a86202d6 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerHandler.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/service/NettyServerHandler.java @@ -2,7 +2,6 @@ package com.njcn.gather.detection.util.socket.service; import com.alibaba.fastjson.JSONObject; import io.netty.channel.Channel; -import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; diff --git a/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketInitializer.java b/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketInitializer.java index 6058f624..64e9c9b7 100644 --- a/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketInitializer.java +++ b/detection/src/main/java/com/njcn/gather/detection/util/socket/web/WebSocketInitializer.java @@ -11,8 +11,6 @@ import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.stream.ChunkedWriteHandler; import io.netty.handler.timeout.IdleStateHandler; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; diff --git a/device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java b/detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java rename to detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java index ee40bc4a..7cd5b9bb 100644 --- a/device/src/main/java/com/njcn/gather/device/device/controller/PqDevController.java +++ b/detection/src/main/java/com/njcn/gather/device/controller/PqDevController.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.device.controller; +package com.njcn.gather.device.controller; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; @@ -14,13 +14,13 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; -import com.njcn.gather.device.device.pojo.param.PqDevParam; -import com.njcn.gather.device.device.pojo.po.PqDev; -import com.njcn.gather.device.device.pojo.vo.CNDevExcel; -import com.njcn.gather.device.device.pojo.vo.PqDevExcel; -import com.njcn.gather.device.device.pojo.vo.PqDevVO; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.device.service.IPqDevService; +import com.njcn.gather.device.pojo.param.PqDevParam; +import com.njcn.gather.device.pojo.po.PqDev; +import com.njcn.gather.device.pojo.vo.CNDevExcel; +import com.njcn.gather.device.pojo.vo.PqDevExcel; +import com.njcn.gather.device.pojo.vo.PqDevVO; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.device.service.IPqDevService; import com.njcn.gather.device.pojo.enums.DevResponseEnum; import com.njcn.gather.device.pojo.enums.PatternEnum; import com.njcn.gather.system.dictionary.pojo.po.DictData; @@ -42,7 +42,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/device/src/main/java/com/njcn/gather/device/device/mapper/PqDevMapper.java b/detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java similarity index 69% rename from device/src/main/java/com/njcn/gather/device/device/mapper/PqDevMapper.java rename to detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java index 762381dc..f11672e5 100644 --- a/device/src/main/java/com/njcn/gather/device/device/mapper/PqDevMapper.java +++ b/detection/src/main/java/com/njcn/gather/device/mapper/PqDevMapper.java @@ -1,8 +1,8 @@ -package com.njcn.gather.device.device.mapper; +package com.njcn.gather.device.mapper; import com.github.yulichang.base.MPJBaseMapper; -import com.njcn.gather.device.device.pojo.po.PqDev; -import com.njcn.gather.device.device.pojo.vo.PreDetection; +import com.njcn.gather.device.pojo.po.PqDev; +import com.njcn.gather.device.pojo.vo.PreDetection; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,7 +16,7 @@ public interface PqDevMapper extends MPJBaseMapper { /** * 根据装置id集合获取装置信息 * @param devIds 装置id - * @return: java.util.List + * @return: java.util.List * @Author: wr * @Date: 2024/12/12 11:46 */ diff --git a/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml b/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml similarity index 88% rename from device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml rename to detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml index a08c1253..02ec89f1 100644 --- a/device/src/main/java/com/njcn/gather/device/device/mapper/mapping/PqDevMapper.xml +++ b/detection/src/main/java/com/njcn/gather/device/mapper/mapping/PqDevMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -19,7 +19,7 @@ diff --git a/device/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java b/detection/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java rename to detection/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/CheckResultEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/CheckResultEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/CheckResultEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/CheckResultEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/CheckStateEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/CheckStateEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/CheckStateEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/CheckStateEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/CommonEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/CommonEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/CommonEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/CommonEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/DevDocumentStateEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevDocumentStateEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/DevDocumentStateEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/DevDocumentStateEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/DevReportStateEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevReportStateEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/DevReportStateEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/DevReportStateEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/FactorCheckResultEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/FactorCheckResultEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/FactorCheckResultEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/FactorCheckResultEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/PatternEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/PatternEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/PatternEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/PatternEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/PlanReportStateEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/PlanReportStateEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/PlanReportStateEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/PlanReportStateEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/pojo/enums/TimeCheckResultEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/TimeCheckResultEnum.java similarity index 100% rename from device/src/main/java/com/njcn/gather/device/pojo/enums/TimeCheckResultEnum.java rename to detection/src/main/java/com/njcn/gather/device/pojo/enums/TimeCheckResultEnum.java diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java b/detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java similarity index 98% rename from device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java rename to detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java index ab1406d6..0142680d 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/param/PqDevParam.java @@ -1,7 +1,7 @@ -package com.njcn.gather.device.device.pojo.param; +package com.njcn.gather.device.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.gather.device.monitor.pojo.param.PqMonitorParam; +import com.njcn.gather.monitor.pojo.param.PqMonitorParam; import com.njcn.gather.device.pojo.constant.DevValidMessage; import com.njcn.web.pojo.annotation.DateTimeStrValid; import com.njcn.web.pojo.param.BaseParam; diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java b/detection/src/main/java/com/njcn/gather/device/pojo/po/PqDev.java similarity index 98% rename from device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java rename to detection/src/main/java/com/njcn/gather/device/pojo/po/PqDev.java index 6eeecd57..ac35aedc 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/po/PqDev.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/po/PqDev.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.device.pojo.po; +package com.njcn.gather.device.pojo.po; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldStrategy; diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/CNDevExcel.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/device/pojo/vo/CNDevExcel.java rename to detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java index 24fa3fcd..53af3be2 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/CNDevExcel.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.device.pojo.vo; +package com.njcn.gather.device.pojo.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import com.njcn.common.pojo.constant.PatternRegex; diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevExcel.java similarity index 98% rename from device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java rename to detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevExcel.java index 1db1cdec..a2f536fd 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevExcel.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevExcel.java @@ -1,9 +1,9 @@ -package com.njcn.gather.device.device.pojo.vo; +package com.njcn.gather.device.pojo.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import cn.afterturn.easypoi.excel.annotation.ExcelCollection; import com.njcn.common.pojo.constant.PatternRegex; -import com.njcn.gather.device.monitor.pojo.vo.PqMonitorExcel; +import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel; import com.njcn.gather.device.pojo.constant.DevValidMessage; import com.njcn.web.pojo.annotation.DateTimeStrValid; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java similarity index 94% rename from device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java rename to detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java index a6211a1e..08d20a8d 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PqDevVO.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java @@ -1,11 +1,11 @@ -package com.njcn.gather.device.device.pojo.vo; +package com.njcn.gather.device.pojo.vo; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; -import com.njcn.gather.device.monitor.pojo.po.PqMonitor; +import com.njcn.gather.monitor.pojo.po.PqMonitor; import lombok.Data; import java.time.LocalDate; diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java similarity index 94% rename from device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java rename to detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java index 05209f62..1949c254 100644 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/vo/PreDetection.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/PreDetection.java @@ -1,9 +1,8 @@ -package com.njcn.gather.device.device.pojo.vo; +package com.njcn.gather.device.pojo.vo; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.njcn.gather.device.device.util.DeviceUtil; +import com.njcn.gather.util.DeviceUtil; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/device/src/main/java/com/njcn/gather/device/device/service/IPqDevService.java b/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java similarity index 87% rename from device/src/main/java/com/njcn/gather/device/device/service/IPqDevService.java rename to detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java index 2e61d651..8d8ae4b5 100644 --- a/device/src/main/java/com/njcn/gather/device/device/service/IPqDevService.java +++ b/detection/src/main/java/com/njcn/gather/device/service/IPqDevService.java @@ -1,18 +1,16 @@ -package com.njcn.gather.device.device.service; +package com.njcn.gather.device.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.device.pojo.enums.TimeCheckResultEnum; -import com.njcn.gather.device.device.pojo.param.PqDevParam; -import com.njcn.gather.device.device.pojo.po.PqDev; -import com.njcn.gather.device.device.pojo.vo.CNDevExcel; -import com.njcn.gather.device.device.pojo.vo.PqDevExcel; -import com.njcn.gather.device.device.pojo.vo.PqDevVO; -import com.njcn.gather.device.device.pojo.vo.PreDetection; +import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum; +import com.njcn.gather.device.pojo.param.PqDevParam; +import com.njcn.gather.device.pojo.po.PqDev; +import com.njcn.gather.device.pojo.vo.CNDevExcel; +import com.njcn.gather.device.pojo.vo.PqDevExcel; +import com.njcn.gather.device.pojo.vo.PqDevVO; +import com.njcn.gather.device.pojo.vo.PreDetection; import org.apache.ibatis.annotations.Param; -import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -162,7 +160,7 @@ public interface IPqDevService extends IService { * 获取装置信息和装置下监测点信息 * * @param devIds - * @return: java.util.List + * @return: java.util.List * @Author: wr * @Date: 2024/12/12 15:50 */ @@ -208,5 +206,5 @@ public interface IPqDevService extends IService { * @param cnDevExcelList 灿能二楼设备数据列表 * @param patternId 模式Id */ - void importCNDev(List cnDevExcelList,String patternId); + void importCNDev(List cnDevExcelList, String patternId); } diff --git a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java rename to detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index 80285bc3..9e298c93 100644 --- a/device/src/main/java/com/njcn/gather/device/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.device.service.impl; +package com.njcn.gather.device.service.impl; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.hutool.core.bean.BeanUtil; @@ -16,22 +16,21 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.poi.PullDown; import com.njcn.db.mybatisplus.constant.DbConstant; -import com.njcn.gather.device.device.mapper.PqDevMapper; -import com.njcn.gather.device.device.pojo.enums.TimeCheckResultEnum; -import com.njcn.gather.device.device.pojo.param.PqDevParam; -import com.njcn.gather.device.device.pojo.po.PqDev; -import com.njcn.gather.device.device.pojo.vo.CNDevExcel; -import com.njcn.gather.device.device.pojo.vo.PqDevExcel; -import com.njcn.gather.device.device.pojo.vo.PqDevVO; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.device.service.IPqDevService; -import com.njcn.gather.device.device.util.DeviceUtil; -import com.njcn.gather.device.monitor.pojo.po.PqMonitor; -import com.njcn.gather.device.monitor.pojo.vo.PqMonitorExcel; -import com.njcn.gather.device.monitor.service.IPqMonitorService; +import com.njcn.gather.device.mapper.PqDevMapper; +import com.njcn.gather.device.pojo.enums.TimeCheckResultEnum; +import com.njcn.gather.device.pojo.param.PqDevParam; +import com.njcn.gather.device.pojo.po.PqDev; +import com.njcn.gather.device.pojo.vo.CNDevExcel; +import com.njcn.gather.device.pojo.vo.PqDevExcel; +import com.njcn.gather.device.pojo.vo.PqDevVO; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.device.service.IPqDevService; +import com.njcn.gather.monitor.pojo.po.PqMonitor; +import com.njcn.gather.monitor.pojo.vo.PqMonitorExcel; +import com.njcn.gather.monitor.service.IPqMonitorService; import com.njcn.gather.device.pojo.enums.*; -import com.njcn.gather.device.type.entity.DevType; -import com.njcn.gather.device.type.service.IDevTypeService; +import com.njcn.gather.type.entity.DevType; +import com.njcn.gather.type.service.IDevTypeService; import com.njcn.gather.storage.service.DetectionDataDealService; import com.njcn.gather.system.config.pojo.po.SysTestConfig; import com.njcn.gather.system.config.service.ISysTestConfigService; @@ -39,6 +38,7 @@ import com.njcn.gather.system.dictionary.pojo.po.DictData; import com.njcn.gather.system.dictionary.pojo.po.DictType; import com.njcn.gather.system.dictionary.service.IDictDataService; import com.njcn.gather.system.dictionary.service.IDictTypeService; +import com.njcn.gather.util.DeviceUtil; import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.ExcelUtil; import lombok.RequiredArgsConstructor; diff --git a/device/src/main/java/com/njcn/gather/device/err/controller/PqErrSysController.java b/detection/src/main/java/com/njcn/gather/err/controller/PqErrSysController.java similarity index 95% rename from device/src/main/java/com/njcn/gather/device/err/controller/PqErrSysController.java rename to detection/src/main/java/com/njcn/gather/err/controller/PqErrSysController.java index b4bd9c21..2aa63d36 100644 --- a/device/src/main/java/com/njcn/gather/device/err/controller/PqErrSysController.java +++ b/detection/src/main/java/com/njcn/gather/err/controller/PqErrSysController.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.err.controller; +package com.njcn.gather.err.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -7,10 +7,10 @@ import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; -import com.njcn.gather.device.err.pojo.param.PqErrSysParam; -import com.njcn.gather.device.err.pojo.po.PqErrSys; -import com.njcn.gather.device.err.pojo.vo.PqErrSysDtlsVO; -import com.njcn.gather.device.err.service.IPqErrSysService; +import com.njcn.gather.err.pojo.param.PqErrSysParam; +import com.njcn.gather.err.pojo.po.PqErrSys; +import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO; +import com.njcn.gather.err.service.IPqErrSysService; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.HttpResultUtil; import io.swagger.annotations.Api; diff --git a/device/src/main/java/com/njcn/gather/device/err/mapper/PqErrSysDtlsMapper.java b/detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysDtlsMapper.java similarity index 64% rename from device/src/main/java/com/njcn/gather/device/err/mapper/PqErrSysDtlsMapper.java rename to detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysDtlsMapper.java index 91e5c1ca..9a570179 100644 --- a/device/src/main/java/com/njcn/gather/device/err/mapper/PqErrSysDtlsMapper.java +++ b/detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysDtlsMapper.java @@ -1,7 +1,7 @@ -package com.njcn.gather.device.err.mapper; +package com.njcn.gather.err.mapper; import com.github.yulichang.base.MPJBaseMapper; -import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; +import com.njcn.gather.err.pojo.po.PqErrSysDtls; /** * @author caozehui diff --git a/device/src/main/java/com/njcn/gather/device/err/mapper/PqErrSysMapper.java b/detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysMapper.java similarity index 63% rename from device/src/main/java/com/njcn/gather/device/err/mapper/PqErrSysMapper.java rename to detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysMapper.java index 7e2dbb85..f9d64486 100644 --- a/device/src/main/java/com/njcn/gather/device/err/mapper/PqErrSysMapper.java +++ b/detection/src/main/java/com/njcn/gather/err/mapper/PqErrSysMapper.java @@ -1,7 +1,7 @@ -package com.njcn.gather.device.err.mapper; +package com.njcn.gather.err.mapper; import com.github.yulichang.base.MPJBaseMapper; -import com.njcn.gather.device.err.pojo.po.PqErrSys; +import com.njcn.gather.err.pojo.po.PqErrSys; /** * @author caozehui diff --git a/device/src/main/java/com/njcn/gather/device/err/mapper/mapping/PqErrSysDtlsMapper.xml b/detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysDtlsMapper.xml similarity index 68% rename from device/src/main/java/com/njcn/gather/device/err/mapper/mapping/PqErrSysDtlsMapper.xml rename to detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysDtlsMapper.xml index 258950a1..08c39c5f 100644 --- a/device/src/main/java/com/njcn/gather/device/err/mapper/mapping/PqErrSysDtlsMapper.xml +++ b/detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysDtlsMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysMapper.xml b/detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysMapper.xml new file mode 100644 index 00000000..05d7b039 --- /dev/null +++ b/detection/src/main/java/com/njcn/gather/err/mapper/mapping/PqErrSysMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/param/PqErrSysDtlsParam.java b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/err/pojo/param/PqErrSysDtlsParam.java rename to detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java index 33594eea..6df06024 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/param/PqErrSysDtlsParam.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.err.pojo.param; +package com.njcn.gather.err.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.gather.device.pojo.constant.DevValidMessage; diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/param/PqErrSysParam.java b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java similarity index 98% rename from device/src/main/java/com/njcn/gather/device/err/pojo/param/PqErrSysParam.java rename to detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java index bdb8c783..f12e5e25 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/param/PqErrSysParam.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.err.pojo.param; +package com.njcn.gather.err.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.gather.device.pojo.constant.DevValidMessage; diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSys.java b/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSys.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSys.java rename to detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSys.java index 0258250b..0814e921 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSys.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSys.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.err.pojo.po; +package com.njcn.gather.err.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java b/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java rename to detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java index 1c901178..62a411b3 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/po/PqErrSysDtls.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.err.pojo.po; +package com.njcn.gather.err.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/vo/ErrDtlsCheckDataVO.java b/detection/src/main/java/com/njcn/gather/err/pojo/vo/ErrDtlsCheckDataVO.java similarity index 82% rename from device/src/main/java/com/njcn/gather/device/err/pojo/vo/ErrDtlsCheckDataVO.java rename to detection/src/main/java/com/njcn/gather/err/pojo/vo/ErrDtlsCheckDataVO.java index 46ed8090..d46967f8 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/vo/ErrDtlsCheckDataVO.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/vo/ErrDtlsCheckDataVO.java @@ -1,6 +1,6 @@ -package com.njcn.gather.device.err.pojo.vo; +package com.njcn.gather.err.pojo.vo; -import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; +import com.njcn.gather.err.pojo.po.PqErrSysDtls; import lombok.Data; import java.io.Serializable; diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/vo/PqErrSysDtlsVO.java b/detection/src/main/java/com/njcn/gather/err/pojo/vo/PqErrSysDtlsVO.java similarity index 91% rename from device/src/main/java/com/njcn/gather/device/err/pojo/vo/PqErrSysDtlsVO.java rename to detection/src/main/java/com/njcn/gather/err/pojo/vo/PqErrSysDtlsVO.java index 15bf8370..25e649d8 100644 --- a/device/src/main/java/com/njcn/gather/device/err/pojo/vo/PqErrSysDtlsVO.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/vo/PqErrSysDtlsVO.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.err.pojo.vo; +package com.njcn.gather.err.pojo.vo; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/err/service/IPqErrSysDtlsService.java b/detection/src/main/java/com/njcn/gather/err/service/IPqErrSysDtlsService.java similarity index 83% rename from device/src/main/java/com/njcn/gather/device/err/service/IPqErrSysDtlsService.java rename to detection/src/main/java/com/njcn/gather/err/service/IPqErrSysDtlsService.java index 06bf0ddb..d805f8bb 100644 --- a/device/src/main/java/com/njcn/gather/device/err/service/IPqErrSysDtlsService.java +++ b/detection/src/main/java/com/njcn/gather/err/service/IPqErrSysDtlsService.java @@ -1,10 +1,10 @@ -package com.njcn.gather.device.err.service; +package com.njcn.gather.err.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.err.pojo.param.PqErrSysDtlsParam; -import com.njcn.gather.device.err.pojo.param.PqErrSysParam; -import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; -import com.njcn.gather.device.err.pojo.vo.ErrDtlsCheckDataVO; +import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam; +import com.njcn.gather.err.pojo.param.PqErrSysParam; +import com.njcn.gather.err.pojo.po.PqErrSysDtls; +import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO; import java.util.List; diff --git a/device/src/main/java/com/njcn/gather/device/err/service/IPqErrSysService.java b/detection/src/main/java/com/njcn/gather/err/service/IPqErrSysService.java similarity index 87% rename from device/src/main/java/com/njcn/gather/device/err/service/IPqErrSysService.java rename to detection/src/main/java/com/njcn/gather/err/service/IPqErrSysService.java index 948c272c..2caa408e 100644 --- a/device/src/main/java/com/njcn/gather/device/err/service/IPqErrSysService.java +++ b/detection/src/main/java/com/njcn/gather/err/service/IPqErrSysService.java @@ -1,11 +1,10 @@ -package com.njcn.gather.device.err.service; +package com.njcn.gather.err.service; -import cn.hutool.core.date.StopWatch; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.err.pojo.param.PqErrSysParam; -import com.njcn.gather.device.err.pojo.po.PqErrSys; -import com.njcn.gather.device.err.pojo.vo.PqErrSysDtlsVO; +import com.njcn.gather.err.pojo.param.PqErrSysParam; +import com.njcn.gather.err.pojo.po.PqErrSys; +import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO; import java.util.List; import java.util.Map; diff --git a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java similarity index 89% rename from device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java rename to detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java index 8407e79a..6d6fa515 100644 --- a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysDtlsServiceImpl.java @@ -1,18 +1,18 @@ -package com.njcn.gather.device.err.service.impl; +package com.njcn.gather.err.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.njcn.gather.device.err.mapper.PqErrSysDtlsMapper; -import com.njcn.gather.device.err.pojo.param.PqErrSysDtlsParam; -import com.njcn.gather.device.err.pojo.param.PqErrSysParam; -import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; -import com.njcn.gather.device.err.pojo.vo.ErrDtlsCheckDataVO; -import com.njcn.gather.device.err.service.IPqErrSysDtlsService; -import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; -import com.njcn.gather.device.script.pojo.po.PqScriptCheckData; -import com.njcn.gather.device.script.service.IPqScriptCheckDataService; +import com.njcn.gather.err.mapper.PqErrSysDtlsMapper; +import com.njcn.gather.err.pojo.param.PqErrSysDtlsParam; +import com.njcn.gather.err.pojo.param.PqErrSysParam; +import com.njcn.gather.err.pojo.po.PqErrSysDtls; +import com.njcn.gather.err.pojo.vo.ErrDtlsCheckDataVO; +import com.njcn.gather.err.service.IPqErrSysDtlsService; +import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; +import com.njcn.gather.script.pojo.po.PqScriptCheckData; +import com.njcn.gather.script.service.IPqScriptCheckDataService; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysServiceImpl.java b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java similarity index 95% rename from device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysServiceImpl.java rename to detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java index dceae889..5409b403 100644 --- a/device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/err/service/impl/PqErrSysServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.err.service.impl; +package com.njcn.gather.err.service.impl; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.ObjectUtil; @@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.gather.device.err.mapper.PqErrSysMapper; -import com.njcn.gather.device.err.pojo.param.PqErrSysParam; -import com.njcn.gather.device.err.pojo.po.PqErrSys; -import com.njcn.gather.device.err.pojo.po.PqErrSysDtls; -import com.njcn.gather.device.err.pojo.vo.PqErrSysDtlsVO; -import com.njcn.gather.device.err.service.IPqErrSysDtlsService; -import com.njcn.gather.device.err.service.IPqErrSysService; +import com.njcn.gather.err.mapper.PqErrSysMapper; +import com.njcn.gather.err.pojo.param.PqErrSysParam; +import com.njcn.gather.err.pojo.po.PqErrSys; +import com.njcn.gather.err.pojo.po.PqErrSysDtls; +import com.njcn.gather.err.pojo.vo.PqErrSysDtlsVO; +import com.njcn.gather.err.service.IPqErrSysDtlsService; +import com.njcn.gather.err.service.IPqErrSysService; import com.njcn.gather.device.pojo.enums.DevResponseEnum; import com.njcn.gather.system.dictionary.pojo.po.DictData; import com.njcn.gather.system.dictionary.pojo.po.DictTree; diff --git a/device/src/main/java/com/njcn/gather/device/monitor/controller/PqMonitorController.java b/detection/src/main/java/com/njcn/gather/monitor/controller/PqMonitorController.java similarity index 82% rename from device/src/main/java/com/njcn/gather/device/monitor/controller/PqMonitorController.java rename to detection/src/main/java/com/njcn/gather/monitor/controller/PqMonitorController.java index 8cb20721..8aab986c 100644 --- a/device/src/main/java/com/njcn/gather/device/monitor/controller/PqMonitorController.java +++ b/detection/src/main/java/com/njcn/gather/monitor/controller/PqMonitorController.java @@ -1,6 +1,6 @@ -package com.njcn.gather.device.monitor.controller; +package com.njcn.gather.monitor.controller; -import com.njcn.gather.device.monitor.service.IPqMonitorService; +import com.njcn.gather.monitor.service.IPqMonitorService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; diff --git a/device/src/main/java/com/njcn/gather/device/monitor/mapper/PqMonitorMapper.java b/detection/src/main/java/com/njcn/gather/monitor/mapper/PqMonitorMapper.java similarity index 63% rename from device/src/main/java/com/njcn/gather/device/monitor/mapper/PqMonitorMapper.java rename to detection/src/main/java/com/njcn/gather/monitor/mapper/PqMonitorMapper.java index 6814776f..5597e611 100644 --- a/device/src/main/java/com/njcn/gather/device/monitor/mapper/PqMonitorMapper.java +++ b/detection/src/main/java/com/njcn/gather/monitor/mapper/PqMonitorMapper.java @@ -1,8 +1,8 @@ -package com.njcn.gather.device.monitor.mapper; +package com.njcn.gather.monitor.mapper; import com.github.yulichang.base.MPJBaseMapper; -import com.njcn.gather.device.device.pojo.vo.PreDetection; -import com.njcn.gather.device.monitor.pojo.po.PqMonitor; +import com.njcn.gather.device.pojo.vo.PreDetection; +import com.njcn.gather.monitor.pojo.po.PqMonitor; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,7 +16,7 @@ public interface PqMonitorMapper extends MPJBaseMapper { /** * 根据终端id获取监测点集合 * @param devId - * @return: java.util.List + * @return: java.util.List * @Author: wr * @Date: 2024/12/12 13:15 */ diff --git a/device/src/main/java/com/njcn/gather/device/monitor/mapper/mapping/PqMonitorMapper.xml b/detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml similarity index 70% rename from device/src/main/java/com/njcn/gather/device/monitor/mapper/mapping/PqMonitorMapper.xml rename to detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml index 56f9e3e2..c7b2f766 100644 --- a/device/src/main/java/com/njcn/gather/device/monitor/mapper/mapping/PqMonitorMapper.xml +++ b/detection/src/main/java/com/njcn/gather/monitor/mapper/mapping/PqMonitorMapper.xml @@ -1,9 +1,9 @@ - + + diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/enums/ResultUnitEnum.java b/detection/src/main/java/com/njcn/gather/script/pojo/enums/ResultUnitEnum.java similarity index 94% rename from device/src/main/java/com/njcn/gather/device/script/pojo/enums/ResultUnitEnum.java rename to detection/src/main/java/com/njcn/gather/script/pojo/enums/ResultUnitEnum.java index 386bfe1f..07237129 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/enums/ResultUnitEnum.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/enums/ResultUnitEnum.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.enums; +package com.njcn.gather.script.pojo.enums; import lombok.Getter; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptCheckDataParam.java similarity index 89% rename from device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java rename to detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptCheckDataParam.java index 84be2a78..c16198d3 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptCheckDataParam.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptCheckDataParam.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.param; +package com.njcn.gather.script.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptIssueParam.java b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java similarity index 92% rename from device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptIssueParam.java rename to detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java index 7304a165..eda404dd 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptIssueParam.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptIssueParam.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.param; +package com.njcn.gather.script.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptParam.java b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java similarity index 98% rename from device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptParam.java rename to detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java index fc68c57d..ad79d9c2 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/param/PqScriptParam.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/param/PqScriptParam.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.param; +package com.njcn.gather.script.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.gather.device.pojo.constant.DevValidMessage; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScript.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScript.java rename to detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java index cc092cc2..24f568d8 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScript.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScript.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.po; +package com.njcn.gather.script.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptCheckData.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java similarity index 96% rename from device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptCheckData.java rename to detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java index 6f0f0b24..44fee7fb 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptCheckData.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptCheckData.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.po; +package com.njcn.gather.script.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptDtls.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptDtls.java rename to detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java index 097b6350..203e87fc 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptDtls.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/PqScriptDtls.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.po; +package com.njcn.gather.script.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java b/detection/src/main/java/com/njcn/gather/script/pojo/po/SourceIssue.java similarity index 99% rename from device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java rename to detection/src/main/java/com/njcn/gather/script/pojo/po/SourceIssue.java index a5bbe36d..d20098af 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/po/SourceIssue.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/po/SourceIssue.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.po; +package com.njcn.gather.script.pojo.po; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/script/pojo/vo/PqScriptCheckDataVO.java b/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java similarity index 92% rename from device/src/main/java/com/njcn/gather/device/script/pojo/vo/PqScriptCheckDataVO.java rename to detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java index 01af1f8f..d8c918b1 100644 --- a/device/src/main/java/com/njcn/gather/device/script/pojo/vo/PqScriptCheckDataVO.java +++ b/detection/src/main/java/com/njcn/gather/script/pojo/vo/PqScriptCheckDataVO.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.pojo.vo; +package com.njcn.gather.script.pojo.vo; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/script/service/IPqScriptCheckDataService.java b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java similarity index 66% rename from device/src/main/java/com/njcn/gather/device/script/service/IPqScriptCheckDataService.java rename to detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java index e616d743..234c8059 100644 --- a/device/src/main/java/com/njcn/gather/device/script/service/IPqScriptCheckDataService.java +++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptCheckDataService.java @@ -1,10 +1,8 @@ -package com.njcn.gather.device.script.service; +package com.njcn.gather.script.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; -import com.njcn.gather.device.script.pojo.po.PqScriptCheckData; -import com.njcn.gather.device.script.pojo.vo.PqScriptCheckDataVO; -import com.njcn.gather.system.dictionary.pojo.po.DictTree; +import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; +import com.njcn.gather.script.pojo.po.PqScriptCheckData; import java.util.List; import java.util.Map; diff --git a/device/src/main/java/com/njcn/gather/device/script/service/IPqScriptDtlsService.java b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java similarity index 87% rename from device/src/main/java/com/njcn/gather/device/script/service/IPqScriptDtlsService.java rename to detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java index cddd847c..bd8f0b55 100644 --- a/device/src/main/java/com/njcn/gather/device/script/service/IPqScriptDtlsService.java +++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptDtlsService.java @@ -1,9 +1,9 @@ -package com.njcn.gather.device.script.service; +package com.njcn.gather.script.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam; -import com.njcn.gather.device.script.pojo.po.PqScriptDtls; -import com.njcn.gather.device.script.pojo.po.SourceIssue; +import com.njcn.gather.script.pojo.param.PqScriptIssueParam; +import com.njcn.gather.script.pojo.po.PqScriptDtls; +import com.njcn.gather.script.pojo.po.SourceIssue; import java.util.List; diff --git a/device/src/main/java/com/njcn/gather/device/script/service/IPqScriptService.java b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java similarity index 91% rename from device/src/main/java/com/njcn/gather/device/script/service/IPqScriptService.java rename to detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java index d70d6e98..384db305 100644 --- a/device/src/main/java/com/njcn/gather/device/script/service/IPqScriptService.java +++ b/detection/src/main/java/com/njcn/gather/script/service/IPqScriptService.java @@ -1,9 +1,9 @@ -package com.njcn.gather.device.script.service; +package com.njcn.gather.script.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.script.pojo.param.PqScriptParam; -import com.njcn.gather.device.script.pojo.po.PqScript; +import com.njcn.gather.script.pojo.param.PqScriptParam; +import com.njcn.gather.script.pojo.po.PqScript; import java.util.List; import java.util.Map; diff --git a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptCheckDataServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java similarity index 93% rename from device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptCheckDataServiceImpl.java rename to detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java index 4c331eb8..eaaea80c 100644 --- a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptCheckDataServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptCheckDataServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.service.impl; +package com.njcn.gather.script.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.njcn.common.pojo.enums.common.DataStateEnum; -import com.njcn.gather.device.script.mapper.PqScriptCheckDataMapper; -import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; -import com.njcn.gather.device.script.pojo.po.PqScriptCheckData; -import com.njcn.gather.device.script.service.IPqScriptCheckDataService; +import com.njcn.gather.script.mapper.PqScriptCheckDataMapper; +import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; +import com.njcn.gather.script.pojo.po.PqScriptCheckData; +import com.njcn.gather.script.service.IPqScriptCheckDataService; import com.njcn.gather.system.dictionary.mapper.DictTreeMapper; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import lombok.RequiredArgsConstructor; diff --git a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java similarity index 95% rename from device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java rename to detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java index 51148063..8df1b0ee 100644 --- a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.service.impl; +package com.njcn.gather.script.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.NumberUtil; @@ -7,20 +7,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.njcn.common.pojo.enums.common.DataStateEnum; -import com.njcn.gather.device.device.pojo.po.PqDev; -import com.njcn.gather.device.device.service.IPqDevService; +import com.njcn.gather.device.pojo.po.PqDev; +import com.njcn.gather.device.service.IPqDevService; import com.njcn.gather.device.pojo.enums.CommonEnum; -import com.njcn.gather.device.script.mapper.PqScriptDtlsMapper; -import com.njcn.gather.device.script.mapper.PqScriptMapper; -import com.njcn.gather.device.script.pojo.param.PqScriptCheckDataParam; -import com.njcn.gather.device.script.pojo.param.PqScriptIssueParam; -import com.njcn.gather.device.script.pojo.po.PqScript; -import com.njcn.gather.device.script.pojo.po.PqScriptCheckData; -import com.njcn.gather.device.script.pojo.po.PqScriptDtls; -import com.njcn.gather.device.script.pojo.po.SourceIssue; -import com.njcn.gather.device.script.service.IPqScriptCheckDataService; -import com.njcn.gather.device.script.service.IPqScriptDtlsService; -import com.njcn.gather.device.script.util.ScriptDtlsDesc; +import com.njcn.gather.script.mapper.PqScriptDtlsMapper; +import com.njcn.gather.script.mapper.PqScriptMapper; +import com.njcn.gather.script.pojo.param.PqScriptCheckDataParam; +import com.njcn.gather.script.pojo.param.PqScriptIssueParam; +import com.njcn.gather.script.pojo.po.PqScript; +import com.njcn.gather.script.pojo.po.PqScriptCheckData; +import com.njcn.gather.script.pojo.po.PqScriptDtls; +import com.njcn.gather.script.pojo.po.SourceIssue; +import com.njcn.gather.script.service.IPqScriptCheckDataService; +import com.njcn.gather.script.service.IPqScriptDtlsService; +import com.njcn.gather.script.util.ScriptDtlsDesc; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,7 +31,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @author caozehui diff --git a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java similarity index 92% rename from device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptServiceImpl.java rename to detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java index d9563289..0c50d16f 100644 --- a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.script.service.impl; +package com.njcn.gather.script.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; -import com.njcn.gather.device.script.mapper.PqScriptMapper; -import com.njcn.gather.device.script.pojo.param.PqScriptParam; -import com.njcn.gather.device.script.pojo.po.PqScript; -import com.njcn.gather.device.script.service.IPqScriptDtlsService; -import com.njcn.gather.device.script.service.IPqScriptService; +import com.njcn.gather.script.mapper.PqScriptMapper; +import com.njcn.gather.script.pojo.param.PqScriptParam; +import com.njcn.gather.script.pojo.po.PqScript; +import com.njcn.gather.script.service.IPqScriptDtlsService; +import com.njcn.gather.script.service.IPqScriptService; import com.njcn.web.factory.PageFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/device/src/main/java/com/njcn/gather/device/script/util/ScriptDtlsDesc.java b/detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java similarity index 96% rename from device/src/main/java/com/njcn/gather/device/script/util/ScriptDtlsDesc.java rename to detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java index 53913c2f..95b159d4 100644 --- a/device/src/main/java/com/njcn/gather/device/script/util/ScriptDtlsDesc.java +++ b/detection/src/main/java/com/njcn/gather/script/util/ScriptDtlsDesc.java @@ -1,9 +1,9 @@ -package com.njcn.gather.device.script.util; +package com.njcn.gather.script.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.njcn.gather.device.script.pojo.enums.ResultUnitEnum; -import com.njcn.gather.device.script.pojo.po.PqScriptDtls; +import com.njcn.gather.script.pojo.enums.ResultUnitEnum; +import com.njcn.gather.script.pojo.po.PqScriptDtls; import java.util.Comparator; import java.util.LinkedHashMap; diff --git a/device/src/main/java/com/njcn/gather/device/source/controller/PqSourceController.java b/detection/src/main/java/com/njcn/gather/source/controller/PqSourceController.java similarity index 94% rename from device/src/main/java/com/njcn/gather/device/source/controller/PqSourceController.java rename to detection/src/main/java/com/njcn/gather/source/controller/PqSourceController.java index 80f59c9f..08159d51 100644 --- a/device/src/main/java/com/njcn/gather/device/source/controller/PqSourceController.java +++ b/detection/src/main/java/com/njcn/gather/source/controller/PqSourceController.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.source.controller; +package com.njcn.gather.source.controller; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -8,11 +8,11 @@ import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.LogUtil; -import com.njcn.gather.device.source.pojo.param.PqSourceParam; -import com.njcn.gather.device.source.pojo.po.PqSource; -import com.njcn.gather.device.source.pojo.po.SourceInitialize; -import com.njcn.gather.device.source.pojo.po.SourceParam; -import com.njcn.gather.device.source.service.IPqSourceService; +import com.njcn.gather.source.pojo.param.PqSourceParam; +import com.njcn.gather.source.pojo.po.PqSource; +import com.njcn.gather.source.pojo.po.SourceInitialize; +import com.njcn.gather.source.pojo.po.SourceParam; +import com.njcn.gather.source.service.IPqSourceService; import com.njcn.web.controller.BaseController; import com.njcn.web.utils.HttpResultUtil; import io.swagger.annotations.Api; diff --git a/device/src/main/java/com/njcn/gather/device/source/mapper/PqSourceMapper.java b/detection/src/main/java/com/njcn/gather/source/mapper/PqSourceMapper.java similarity index 62% rename from device/src/main/java/com/njcn/gather/device/source/mapper/PqSourceMapper.java rename to detection/src/main/java/com/njcn/gather/source/mapper/PqSourceMapper.java index 628ac1f8..8472c18c 100644 --- a/device/src/main/java/com/njcn/gather/device/source/mapper/PqSourceMapper.java +++ b/detection/src/main/java/com/njcn/gather/source/mapper/PqSourceMapper.java @@ -1,7 +1,7 @@ -package com.njcn.gather.device.source.mapper; +package com.njcn.gather.source.mapper; import com.github.yulichang.base.MPJBaseMapper; -import com.njcn.gather.device.source.pojo.po.PqSource; +import com.njcn.gather.source.pojo.po.PqSource; /** * @author caozehui diff --git a/device/src/main/java/com/njcn/gather/device/source/mapper/mapping/PqSourceMapper.xml b/detection/src/main/java/com/njcn/gather/source/mapper/mapping/PqSourceMapper.xml similarity index 68% rename from device/src/main/java/com/njcn/gather/device/source/mapper/mapping/PqSourceMapper.xml rename to detection/src/main/java/com/njcn/gather/source/mapper/mapping/PqSourceMapper.xml index 7c04d1c0..29e91a51 100644 --- a/device/src/main/java/com/njcn/gather/device/source/mapper/mapping/PqSourceMapper.xml +++ b/detection/src/main/java/com/njcn/gather/source/mapper/mapping/PqSourceMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/device/src/main/java/com/njcn/gather/device/source/pojo/param/PqSourceParam.java b/detection/src/main/java/com/njcn/gather/source/pojo/param/PqSourceParam.java similarity index 98% rename from device/src/main/java/com/njcn/gather/device/source/pojo/param/PqSourceParam.java rename to detection/src/main/java/com/njcn/gather/source/pojo/param/PqSourceParam.java index 779d0d67..bd5f88c8 100644 --- a/device/src/main/java/com/njcn/gather/device/source/pojo/param/PqSourceParam.java +++ b/detection/src/main/java/com/njcn/gather/source/pojo/param/PqSourceParam.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.source.pojo.param; +package com.njcn.gather.source.pojo.param; import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.gather.device.pojo.constant.DevValidMessage; diff --git a/device/src/main/java/com/njcn/gather/device/source/pojo/po/PqSource.java b/detection/src/main/java/com/njcn/gather/source/pojo/po/PqSource.java similarity index 95% rename from device/src/main/java/com/njcn/gather/device/source/pojo/po/PqSource.java rename to detection/src/main/java/com/njcn/gather/source/pojo/po/PqSource.java index 24f19577..b08ca723 100644 --- a/device/src/main/java/com/njcn/gather/device/source/pojo/po/PqSource.java +++ b/detection/src/main/java/com/njcn/gather/source/pojo/po/PqSource.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.source.pojo.po; +package com.njcn.gather.source.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.mybatisplus.bo.BaseEntity; diff --git a/device/src/main/java/com/njcn/gather/device/source/pojo/po/SourceInitialize.java b/detection/src/main/java/com/njcn/gather/source/pojo/po/SourceInitialize.java similarity index 95% rename from device/src/main/java/com/njcn/gather/device/source/pojo/po/SourceInitialize.java rename to detection/src/main/java/com/njcn/gather/source/pojo/po/SourceInitialize.java index 13c66fd7..694ccb5d 100644 --- a/device/src/main/java/com/njcn/gather/device/source/pojo/po/SourceInitialize.java +++ b/detection/src/main/java/com/njcn/gather/source/pojo/po/SourceInitialize.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.source.pojo.po; +package com.njcn.gather.source.pojo.po; import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/source/pojo/po/SourceParam.java b/detection/src/main/java/com/njcn/gather/source/pojo/po/SourceParam.java similarity index 87% rename from device/src/main/java/com/njcn/gather/device/source/pojo/po/SourceParam.java rename to detection/src/main/java/com/njcn/gather/source/pojo/po/SourceParam.java index f3b347dd..b2b8eae5 100644 --- a/device/src/main/java/com/njcn/gather/device/source/pojo/po/SourceParam.java +++ b/detection/src/main/java/com/njcn/gather/source/pojo/po/SourceParam.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.source.pojo.po; +package com.njcn.gather.source.pojo.po; import lombok.Data; diff --git a/device/src/main/java/com/njcn/gather/device/source/service/IPqSourceService.java b/detection/src/main/java/com/njcn/gather/source/service/IPqSourceService.java similarity index 86% rename from device/src/main/java/com/njcn/gather/device/source/service/IPqSourceService.java rename to detection/src/main/java/com/njcn/gather/source/service/IPqSourceService.java index 72a93cba..bd9f4fbe 100644 --- a/device/src/main/java/com/njcn/gather/device/source/service/IPqSourceService.java +++ b/detection/src/main/java/com/njcn/gather/source/service/IPqSourceService.java @@ -1,11 +1,11 @@ -package com.njcn.gather.device.source.service; +package com.njcn.gather.source.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.source.pojo.param.PqSourceParam; -import com.njcn.gather.device.source.pojo.po.PqSource; -import com.njcn.gather.device.source.pojo.po.SourceInitialize; -import com.njcn.gather.device.source.pojo.po.SourceParam; +import com.njcn.gather.source.pojo.param.PqSourceParam; +import com.njcn.gather.source.pojo.po.PqSource; +import com.njcn.gather.source.pojo.po.SourceInitialize; +import com.njcn.gather.source.pojo.po.SourceParam; import java.util.List; import java.util.Map; diff --git a/device/src/main/java/com/njcn/gather/device/source/service/impl/PqSourceServiceImpl.java b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java similarity index 94% rename from device/src/main/java/com/njcn/gather/device/source/service/impl/PqSourceServiceImpl.java rename to detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java index 89e400e9..c75f4099 100644 --- a/device/src/main/java/com/njcn/gather/device/source/service/impl/PqSourceServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.source.service.impl; +package com.njcn.gather.source.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -12,14 +12,14 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.gather.device.pojo.enums.CommonEnum; import com.njcn.gather.device.pojo.enums.DevResponseEnum; -import com.njcn.gather.device.source.mapper.PqSourceMapper; -import com.njcn.gather.device.source.pojo.param.PqSourceParam; -import com.njcn.gather.device.source.pojo.po.PqSource; -import com.njcn.gather.device.source.pojo.po.SourceInitialize; -import com.njcn.gather.device.source.pojo.po.SourceParam; -import com.njcn.gather.device.source.service.IPqSourceService; -import com.njcn.gather.device.type.entity.DevType; -import com.njcn.gather.device.type.service.IDevTypeService; +import com.njcn.gather.source.mapper.PqSourceMapper; +import com.njcn.gather.source.pojo.param.PqSourceParam; +import com.njcn.gather.source.pojo.po.PqSource; +import com.njcn.gather.source.pojo.po.SourceInitialize; +import com.njcn.gather.source.pojo.po.SourceParam; +import com.njcn.gather.source.service.IPqSourceService; +import com.njcn.gather.type.entity.DevType; +import com.njcn.gather.type.service.IDevTypeService; import com.njcn.gather.system.dictionary.pojo.po.DictData; import com.njcn.gather.system.dictionary.service.IDictDataService; import com.njcn.web.factory.PageFactory; diff --git a/device/src/main/java/com/njcn/gather/device/type/controller/DevTypeController.java b/detection/src/main/java/com/njcn/gather/type/controller/DevTypeController.java similarity index 73% rename from device/src/main/java/com/njcn/gather/device/type/controller/DevTypeController.java rename to detection/src/main/java/com/njcn/gather/type/controller/DevTypeController.java index ba7fffd1..15e596cd 100644 --- a/device/src/main/java/com/njcn/gather/device/type/controller/DevTypeController.java +++ b/detection/src/main/java/com/njcn/gather/type/controller/DevTypeController.java @@ -1,26 +1,19 @@ -package com.njcn.gather.device.type.controller; +package com.njcn.gather.type.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.LogUtil; -import com.njcn.gather.device.type.entity.DevType; -import com.njcn.gather.device.type.service.IDevTypeService; -import com.njcn.gather.system.dictionary.pojo.param.DictDataParam; -import com.njcn.gather.system.dictionary.pojo.po.DictData; -import com.njcn.gather.system.dictionary.service.IDictDataService; +import com.njcn.gather.type.entity.DevType; +import com.njcn.gather.type.service.IDevTypeService; import com.njcn.web.utils.HttpResultUtil; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; 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; diff --git a/device/src/main/java/com/njcn/gather/device/type/entity/DevType.java b/detection/src/main/java/com/njcn/gather/type/entity/DevType.java similarity index 95% rename from device/src/main/java/com/njcn/gather/device/type/entity/DevType.java rename to detection/src/main/java/com/njcn/gather/type/entity/DevType.java index fdd8fa28..3e8d0274 100644 --- a/device/src/main/java/com/njcn/gather/device/type/entity/DevType.java +++ b/detection/src/main/java/com/njcn/gather/type/entity/DevType.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.type.entity; +package com.njcn.gather.type.entity; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/device/src/main/java/com/njcn/gather/device/type/mapper/DevTypeMapper.java b/detection/src/main/java/com/njcn/gather/type/mapper/DevTypeMapper.java similarity index 68% rename from device/src/main/java/com/njcn/gather/device/type/mapper/DevTypeMapper.java rename to detection/src/main/java/com/njcn/gather/type/mapper/DevTypeMapper.java index 8bb72349..66494326 100644 --- a/device/src/main/java/com/njcn/gather/device/type/mapper/DevTypeMapper.java +++ b/detection/src/main/java/com/njcn/gather/type/mapper/DevTypeMapper.java @@ -1,8 +1,8 @@ -package com.njcn.gather.device.type.mapper; +package com.njcn.gather.type.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.gather.device.type.entity.DevType; +import com.njcn.gather.type.entity.DevType; /** *

diff --git a/device/src/main/java/com/njcn/gather/device/type/mapper/mapping/DevTypeMapper.xml b/detection/src/main/java/com/njcn/gather/type/mapper/mapping/DevTypeMapper.xml similarity index 69% rename from device/src/main/java/com/njcn/gather/device/type/mapper/mapping/DevTypeMapper.xml rename to detection/src/main/java/com/njcn/gather/type/mapper/mapping/DevTypeMapper.xml index 2c0fe0ee..459ba18b 100644 --- a/device/src/main/java/com/njcn/gather/device/type/mapper/mapping/DevTypeMapper.xml +++ b/detection/src/main/java/com/njcn/gather/type/mapper/mapping/DevTypeMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/device/src/main/java/com/njcn/gather/device/type/service/IDevTypeService.java b/detection/src/main/java/com/njcn/gather/type/service/IDevTypeService.java similarity index 75% rename from device/src/main/java/com/njcn/gather/device/type/service/IDevTypeService.java rename to detection/src/main/java/com/njcn/gather/type/service/IDevTypeService.java index 767ba4ac..021279b3 100644 --- a/device/src/main/java/com/njcn/gather/device/type/service/IDevTypeService.java +++ b/detection/src/main/java/com/njcn/gather/type/service/IDevTypeService.java @@ -1,7 +1,7 @@ -package com.njcn.gather.device.type.service; +package com.njcn.gather.type.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.gather.device.type.entity.DevType; +import com.njcn.gather.type.entity.DevType; import java.util.List; diff --git a/device/src/main/java/com/njcn/gather/device/type/service/impl/DevTypeServiceImpl.java b/detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java similarity index 81% rename from device/src/main/java/com/njcn/gather/device/type/service/impl/DevTypeServiceImpl.java rename to detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java index 1e2757bd..d8bda016 100644 --- a/device/src/main/java/com/njcn/gather/device/type/service/impl/DevTypeServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/type/service/impl/DevTypeServiceImpl.java @@ -1,11 +1,11 @@ -package com.njcn.gather.device.type.service.impl; +package com.njcn.gather.type.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.enums.common.DataStateEnum; -import com.njcn.gather.device.type.entity.DevType; -import com.njcn.gather.device.type.mapper.DevTypeMapper; -import com.njcn.gather.device.type.service.IDevTypeService; +import com.njcn.gather.type.entity.DevType; +import com.njcn.gather.type.mapper.DevTypeMapper; +import com.njcn.gather.type.service.IDevTypeService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/device/src/main/java/com/njcn/gather/device/device/util/DeviceUtil.java b/detection/src/main/java/com/njcn/gather/util/DeviceUtil.java similarity index 97% rename from device/src/main/java/com/njcn/gather/device/device/util/DeviceUtil.java rename to detection/src/main/java/com/njcn/gather/util/DeviceUtil.java index 9a6fba40..999baceb 100644 --- a/device/src/main/java/com/njcn/gather/device/device/util/DeviceUtil.java +++ b/detection/src/main/java/com/njcn/gather/util/DeviceUtil.java @@ -1,4 +1,4 @@ -package com.njcn.gather.device.device.util; +package com.njcn.gather.util; import com.njcn.common.utils.sm.Sm4Utils; import com.njcn.common.utils.sm.ThreeDesUtil; diff --git a/device/src/main/resources/mapper/PqScriptCheckdataMapper.xml b/detection/src/main/resources/mapper/PqScriptCheckdataMapper.xml similarity index 91% rename from device/src/main/resources/mapper/PqScriptCheckdataMapper.xml rename to detection/src/main/resources/mapper/PqScriptCheckdataMapper.xml index a044cb84..7439171f 100644 --- a/device/src/main/resources/mapper/PqScriptCheckdataMapper.xml +++ b/detection/src/main/resources/mapper/PqScriptCheckdataMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/device/pom.xml b/device/pom.xml deleted file mode 100644 index eeaf245c..00000000 --- a/device/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - com.njcn.gather - CN_Gather - 1.0.0 - - device - - - - com.njcn - njcn-common - 0.0.1 - - - - com.njcn - mybatis-plus - 0.0.1 - - - - com.njcn - spingboot2.3.12 - 2.3.12 - - - com.njcn.gather - system - 1.0.0 - compile - - - com.alibaba - fastjson - 1.2.83 - - - com.njcn.gather - storage - 1.0.0 - compile - - - - - \ No newline at end of file diff --git a/device/src/main/java/com/njcn/gather/device/device/pojo/enums/TimeCheckResultEnum.java b/device/src/main/java/com/njcn/gather/device/device/pojo/enums/TimeCheckResultEnum.java deleted file mode 100644 index 40e16e24..00000000 --- a/device/src/main/java/com/njcn/gather/device/device/pojo/enums/TimeCheckResultEnum.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.njcn.gather.device.device.pojo.enums; - -import lombok.Getter; - -/** - * @author caozehui - * @data 2024-12-11 - */ -@Getter -public enum TimeCheckResultEnum { - UNQUALIFY(0, "不合格"), - QUALIFY(1, "合格"), - UNKNOWN(2, "/"); - - private Integer value; - private String msg; - - TimeCheckResultEnum(Integer value, String msg) { - this.value = value; - this.msg = msg; - } -} diff --git a/device/src/main/java/com/njcn/gather/device/script/mapper/mapping/PqScriptCheckDataMapper.xml b/device/src/main/java/com/njcn/gather/device/script/mapper/mapping/PqScriptCheckDataMapper.xml deleted file mode 100644 index 6b86ac06..00000000 --- a/device/src/main/java/com/njcn/gather/device/script/mapper/mapping/PqScriptCheckDataMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/entrance/pom.xml b/entrance/pom.xml index 8122c169..c1e8c29e 100644 --- a/entrance/pom.xml +++ b/entrance/pom.xml @@ -18,7 +18,7 @@ com.njcn.gather - device + detection 1.0.0 @@ -26,11 +26,6 @@ user 1.0.0 - - com.njcn.gather - detection - 1.0.0 - com.njcn.gather diff --git a/entrance/src/main/resources/application.yml b/entrance/src/main/resources/application.yml index b4260152..767c8e52 100644 --- a/entrance/src/main/resources/application.yml +++ b/entrance/src/main/resources/application.yml @@ -6,7 +6,7 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.1.24:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT + url: jdbc:mysql://127.0.0.1:13306/pqs9100?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=CTT username: root password: njcnpqs #初始化建立物理连接的个数、最小、最大连接数 diff --git a/pom.xml b/pom.xml index 5dc61f56..087a5c42 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,6 @@ entrance system user - device detection storage