From 26d80c565b8dca1ee6812097f4c80077653f337c Mon Sep 17 00:00:00 2001 From: chenyuan <1154693969@qq.com> Date: Thu, 1 Aug 2024 17:51:56 +0800 Subject: [PATCH] add mqtt data --- .../mqttdatarecord/MqttDataRecordMapper.java | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttdatarecord/MqttDataRecordMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttdatarecord/MqttDataRecordMapper.java index f7b20cc27..bf905e060 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttdatarecord/MqttDataRecordMapper.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttdatarecord/MqttDataRecordMapper.java @@ -1,13 +1,15 @@ package cn.iocoder.yudao.module.iot.dal.mysql.mqttdatarecord; -import java.util.*; - import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.MqttDataRecordPageReqVO; import cn.iocoder.yudao.module.iot.dal.dataobject.mqttdatarecord.MqttDataRecordDO; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Mapper; -import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.*; + +import java.util.List; /** * 设备数据记录 Mapper @@ -27,4 +29,38 @@ public interface MqttDataRecordMapper extends BaseMapperX { .orderByDesc(MqttDataRecordDO::getId)); } + default List select(MqttDataRecordPageReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .eqIfPresent(MqttDataRecordDO::getDeviceName, reqVO.getDeviceName()) + .eqIfPresent(MqttDataRecordDO::getAttribute, reqVO.getAttribute()) + .eqIfPresent(MqttDataRecordDO::getAttrValue, reqVO.getAttrValue()) + .betweenIfPresent(MqttDataRecordDO::getDeviceTime, reqVO.getDeviceTime()) + .betweenIfPresent(MqttDataRecordDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(MqttDataRecordDO::getId)); + } + default MqttDataRecordDO selectLastOne(MqttDataRecordPageReqVO reqVO) { + return selectOne(new QueryWrapper() + .eq(StringUtils.isNotBlank(reqVO.getDeviceName()),"device_name", reqVO.getDeviceName()) + .eq(StringUtils.isNotBlank(reqVO.getAttribute()),"attribute", reqVO.getAttribute()) + .orderByDesc("id") + .last("limit 1")); + } + default Long selectSum(MqttDataRecordPageReqVO reqVO) { + // SQL sum 查询 +// List> result = selectMaps(new QueryWrapper() +// .select("SUM(attr_value) AS sumCount") +// .eq(StringUtils.isNotBlank(reqVO.getDeviceName()),"device_name", reqVO.getDeviceName()) +// .eq(StringUtils.isNotBlank(reqVO.getAttribute()),"attribute", reqVO.getAttribute()) +// ); +// // 获得数量 +// if (CollUtil.isEmpty(result)) { +// return 0L; +// } +// return MapUtil.getLong(result.get(0), "sumCount", 0L); + List list = select(reqVO); + if(list!=null && list.size()>0){ + + + return 0L; + } } \ No newline at end of file