From 004de8f3079ecc66af864a37e44ef952bf0cade0 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 20 Jan 2026 16:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../access/handler/MqttMessageHandler.java | 10 +++-- .../njcn/access/mapper/OverlimitMapper.java | 42 +++++++++---------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java index 8d7045e..4ddbe96 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java @@ -15,7 +15,6 @@ import com.github.tocrhz.mqtt.publisher.MqttPublisher; import com.njcn.access.enums.AccessEnum; import com.njcn.access.enums.AccessResponseEnum; import com.njcn.access.enums.TypeEnum; -import com.njcn.access.mapper.OverlimitMapper; import com.njcn.access.pojo.RspDataDto; import com.njcn.access.pojo.dto.*; import com.njcn.access.pojo.dto.file.FileDto; @@ -34,6 +33,7 @@ import com.njcn.csdevice.api.*; import com.njcn.csdevice.pojo.dto.PqsCommunicateDto; import com.njcn.csdevice.pojo.param.CsLineParam; import com.njcn.csdevice.pojo.po.*; +import com.njcn.device.biz.mapper.OverLimitWlMapper; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.mq.message.AppAutoDataMessage; @@ -69,6 +69,8 @@ import java.util.stream.Collectors; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +; + /** * @author hongawen * @version 1.0.0 @@ -96,7 +98,7 @@ public class MqttMessageHandler { private final CsLineFeignClient csLineFeignClient; private final DevCapacityFeignClient devCapacityFeignClient; private final EquipmentFeignClient equipmentFeignClient; - private final OverlimitMapper overlimitMapper; + private final OverLimitWlMapper overLimitWlMapper; private final ChannelObjectUtil channelObjectUtil; private final WaveFeignClient waveFeignClient; private final RtFeignClient rtFeignClient; @@ -468,8 +470,8 @@ public class MqttMessageHandler { //生成监测点限值 Overlimit overlimit = COverlimitUtil.globalAssemble(item.getVolGrade().floatValue(),10f,10f,10f,0,0); overlimit.setId(nDid.concat(item.getClDid().toString())); - overlimitMapper.deleteById(nDid.concat(item.getClDid().toString())); - overlimitMapper.insert(overlimit); + overLimitWlMapper.deleteById(nDid.concat(item.getClDid().toString())); + overLimitWlMapper.insert(overlimit); } /** diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/mapper/OverlimitMapper.java b/iot-access/access-boot/src/main/java/com/njcn/access/mapper/OverlimitMapper.java index 610eb86..872903e 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/mapper/OverlimitMapper.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/mapper/OverlimitMapper.java @@ -1,21 +1,21 @@ -package com.njcn.access.mapper; - - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.biz.pojo.po.Overlimit; -import org.apache.ibatis.annotations.Mapper; - - -/** - *
- * Mapper 接口 - *
- * - * @author xy - */ -@DS("sjzx") -@Mapper -public interface OverlimitMapper extends BaseMapper+// * Mapper 接口 +// *
+// * +// * @author xy +// */ +//@DS("sjzx") +//@Mapper +//public interface OverlimitMapper extends BaseMapper