微调
This commit is contained in:
@@ -15,7 +15,6 @@ import com.github.tocrhz.mqtt.publisher.MqttPublisher;
|
|||||||
import com.njcn.access.enums.AccessEnum;
|
import com.njcn.access.enums.AccessEnum;
|
||||||
import com.njcn.access.enums.AccessResponseEnum;
|
import com.njcn.access.enums.AccessResponseEnum;
|
||||||
import com.njcn.access.enums.TypeEnum;
|
import com.njcn.access.enums.TypeEnum;
|
||||||
import com.njcn.access.mapper.OverlimitMapper;
|
|
||||||
import com.njcn.access.pojo.RspDataDto;
|
import com.njcn.access.pojo.RspDataDto;
|
||||||
import com.njcn.access.pojo.dto.*;
|
import com.njcn.access.pojo.dto.*;
|
||||||
import com.njcn.access.pojo.dto.file.FileDto;
|
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.dto.PqsCommunicateDto;
|
||||||
import com.njcn.csdevice.pojo.param.CsLineParam;
|
import com.njcn.csdevice.pojo.param.CsLineParam;
|
||||||
import com.njcn.csdevice.pojo.po.*;
|
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.pojo.po.Overlimit;
|
||||||
import com.njcn.device.biz.utils.COverlimitUtil;
|
import com.njcn.device.biz.utils.COverlimitUtil;
|
||||||
import com.njcn.mq.message.AppAutoDataMessage;
|
import com.njcn.mq.message.AppAutoDataMessage;
|
||||||
@@ -69,6 +69,8 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
|
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
|
||||||
|
|
||||||
|
;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author hongawen
|
* @author hongawen
|
||||||
* @version 1.0.0
|
* @version 1.0.0
|
||||||
@@ -96,7 +98,7 @@ public class MqttMessageHandler {
|
|||||||
private final CsLineFeignClient csLineFeignClient;
|
private final CsLineFeignClient csLineFeignClient;
|
||||||
private final DevCapacityFeignClient devCapacityFeignClient;
|
private final DevCapacityFeignClient devCapacityFeignClient;
|
||||||
private final EquipmentFeignClient equipmentFeignClient;
|
private final EquipmentFeignClient equipmentFeignClient;
|
||||||
private final OverlimitMapper overlimitMapper;
|
private final OverLimitWlMapper overLimitWlMapper;
|
||||||
private final ChannelObjectUtil channelObjectUtil;
|
private final ChannelObjectUtil channelObjectUtil;
|
||||||
private final WaveFeignClient waveFeignClient;
|
private final WaveFeignClient waveFeignClient;
|
||||||
private final RtFeignClient rtFeignClient;
|
private final RtFeignClient rtFeignClient;
|
||||||
@@ -468,8 +470,8 @@ public class MqttMessageHandler {
|
|||||||
//生成监测点限值
|
//生成监测点限值
|
||||||
Overlimit overlimit = COverlimitUtil.globalAssemble(item.getVolGrade().floatValue(),10f,10f,10f,0,0);
|
Overlimit overlimit = COverlimitUtil.globalAssemble(item.getVolGrade().floatValue(),10f,10f,10f,0,0);
|
||||||
overlimit.setId(nDid.concat(item.getClDid().toString()));
|
overlimit.setId(nDid.concat(item.getClDid().toString()));
|
||||||
overlimitMapper.deleteById(nDid.concat(item.getClDid().toString()));
|
overLimitWlMapper.deleteById(nDid.concat(item.getClDid().toString()));
|
||||||
overlimitMapper.insert(overlimit);
|
overLimitWlMapper.insert(overlimit);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
package com.njcn.access.mapper;
|
//package com.njcn.access.mapper;
|
||||||
|
//
|
||||||
|
//
|
||||||
import com.baomidou.dynamic.datasource.annotation.DS;
|
//import com.baomidou.dynamic.datasource.annotation.DS;
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
//import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.njcn.device.biz.pojo.po.Overlimit;
|
//import com.njcn.device.biz.pojo.po.Overlimit;
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
//import org.apache.ibatis.annotations.Mapper;
|
||||||
|
//
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* <p>
|
// * <p>
|
||||||
* Mapper 接口
|
// * Mapper 接口
|
||||||
* </p>
|
// * </p>
|
||||||
*
|
// *
|
||||||
* @author xy
|
// * @author xy
|
||||||
*/
|
// */
|
||||||
@DS("sjzx")
|
//@DS("sjzx")
|
||||||
@Mapper
|
//@Mapper
|
||||||
public interface OverlimitMapper extends BaseMapper<Overlimit> {
|
//public interface OverlimitMapper extends BaseMapper<Overlimit> {
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
|
|||||||
Reference in New Issue
Block a user