From f5e134b19435e3a0c5341348795649e260cc351e Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 21 May 2026 15:00:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B8=85=E6=B4=97=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8C=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/controller/ReasonableRangeController.java | 4 ++-- .../com/njcn/device/pq/mapper/ReasonableRangeMapper.java | 2 +- .../com/njcn/device/pq/service/ReasonableRangeService.java | 7 ++++--- .../device/pq/service/impl/ReasonableRangeServiceImpl.java | 7 ++++--- .../common/service/impl/TerminalBaseServiceImpl.java | 2 ++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ReasonableRangeController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ReasonableRangeController.java index 4027f0d50..b7345e50d 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ReasonableRangeController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ReasonableRangeController.java @@ -6,14 +6,14 @@ package com.njcn.device.pq.controller; * @Description: 异常告警数据指标范围 */ +import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto; +import com.njcn.algorithm.pojo.param.DataCleanParam; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.dataProcess.param.DataCleanParam; -import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto; import com.njcn.device.pq.service.ReasonableRangeService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ReasonableRangeMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ReasonableRangeMapper.java index 7017196cf..c8c886f89 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ReasonableRangeMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/ReasonableRangeMapper.java @@ -1,7 +1,7 @@ package com.njcn.device.pq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.dataProcess.pojo.po.PqReasonableRange; +import com.njcn.algorithm.pojo.po.PqReasonableRange; /** *

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ReasonableRangeService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ReasonableRangeService.java index 332229065..d25879676 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ReasonableRangeService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ReasonableRangeService.java @@ -1,9 +1,10 @@ package com.njcn.device.pq.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.dataProcess.param.DataCleanParam; -import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto; -import com.njcn.dataProcess.pojo.po.PqReasonableRange; +import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto; +import com.njcn.algorithm.pojo.param.DataCleanParam; +import com.njcn.algorithm.pojo.po.PqReasonableRange; + import java.util.List; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ReasonableRangeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ReasonableRangeServiceImpl.java index c70d0e44c..4427570a6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ReasonableRangeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ReasonableRangeServiceImpl.java @@ -3,10 +3,11 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.dataProcess.param.DataCleanParam; -import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto; -import com.njcn.dataProcess.pojo.po.PqReasonableRange; +import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto; +import com.njcn.algorithm.pojo.param.DataCleanParam; +import com.njcn.algorithm.pojo.po.PqReasonableRange; import com.njcn.device.pq.mapper.ReasonableRangeMapper; import com.njcn.device.pq.service.ReasonableRangeService; import org.springframework.beans.BeanUtils; diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java index 9870dcfca..51ed88197 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java @@ -2884,6 +2884,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple device.setUpdateTime(LocalDateTime.now()); device.setElectroplate(0); device.setOnTime(1); + //处理装置识别码秘钥 + coderM3d(device, false); deviceMapper.insert(device); //分配前置进程 nodeDeviceService.oneKeyDistribution(node.getId());