From f9b02681a0459c00d27b430f2f1ea41d1bd63462 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Wed, 24 Jul 2024 16:40:59 +0800 Subject: [PATCH] add mqtt data --- .../module/iot/enums/ErrorCodeConstants.java | 1 + .../MqttDataRecordController.java | 95 ++++++++++++ .../vo/MqttDataRecordPageReqVO.java | 35 +++++ .../vo/MqttDataRecordRespVO.java | 40 +++++ .../vo/MqttDataRecordSaveReqVO.java | 24 +++ .../mqttdatarecord/MqttDataRecordDO.java | 46 ++++++ .../mqttdatarecord/MqttDataRecordMapper.java | 30 ++++ .../mqttdatarecord/MqttDataRecordService.java | 55 +++++++ .../MqttDataRecordServiceImpl.java | 74 +++++++++ .../mqttdatarecord/MqttDataRecordMapper.xml | 12 ++ .../MqttDataRecordServiceImplTest.java | 146 ++++++++++++++++++ .../src/test/resources/sql/clean.sql | 5 +- .../src/test/resources/sql/create_tables.sql | 12 ++ .../controller/admin/mqtt/MqttDataSaveVO.java | 19 +++ .../admin/mqtt/MqttServerDataController.java | 68 ++++++++ .../src/main/resources/application.yaml | 1 + 16 files changed, 662 insertions(+), 1 deletion(-) create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordPageReqVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordRespVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordSaveReqVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttdatarecord/MqttDataRecordDO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttdatarecord/MqttDataRecordMapper.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordService.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImpl.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/mqttdatarecord/MqttDataRecordMapper.xml create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImplTest.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttDataSaveVO.java create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttServerDataController.java diff --git a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java index 6c0b2e2474..4a1d273a87 100644 --- a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java +++ b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java @@ -27,5 +27,6 @@ public interface ErrorCodeConstants { ErrorCode FRPC_PROXY_SERVER_NOT_EXISTS = new ErrorCode(1_003_000_000, "GoView 项目不存在"); ErrorCode FRPS_SERVER_NOT_EXISTS = new ErrorCode(1_003_000_000, "GoView 项目不存在"); ErrorCode FEEDBACK_NOT_EXISTS = new ErrorCode(1_003_000_001, "用户反馈不存在"); + ErrorCode MQTT_DATA_RECORD_NOT_EXISTS = new ErrorCode(1_003_000_003, "设备数据记录不存在"); } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java new file mode 100644 index 0000000000..79b44f88a8 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/MqttDataRecordController.java @@ -0,0 +1,95 @@ +package cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord; + +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.validation.constraints.*; +import javax.validation.*; +import javax.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.mqttdatarecord.MqttDataRecordDO; +import cn.iocoder.yudao.module.iot.service.mqttdatarecord.MqttDataRecordService; + +@Tag(name = "管理后台 - 设备数据记录") +@RestController +@RequestMapping("/iot/mqtt-data-record") +@Validated +public class MqttDataRecordController { + + @Resource + private MqttDataRecordService mqttDataRecordService; + + @PostMapping("/create") + @Operation(summary = "创建设备数据记录") + @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:create')") + public CommonResult createMqttDataRecord(@Valid @RequestBody MqttDataRecordSaveReqVO createReqVO) { + return success(mqttDataRecordService.createMqttDataRecord(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新设备数据记录") + @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:update')") + public CommonResult updateMqttDataRecord(@Valid @RequestBody MqttDataRecordSaveReqVO updateReqVO) { + mqttDataRecordService.updateMqttDataRecord(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除设备数据记录") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:delete')") + public CommonResult deleteMqttDataRecord(@RequestParam("id") Long id) { + mqttDataRecordService.deleteMqttDataRecord(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得设备数据记录") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:query')") + public CommonResult getMqttDataRecord(@RequestParam("id") Long id) { + MqttDataRecordDO mqttDataRecord = mqttDataRecordService.getMqttDataRecord(id); + return success(BeanUtils.toBean(mqttDataRecord, MqttDataRecordRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得设备数据记录分页") + @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:query')") + public CommonResult> getMqttDataRecordPage(@Valid MqttDataRecordPageReqVO pageReqVO) { + PageResult pageResult = mqttDataRecordService.getMqttDataRecordPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MqttDataRecordRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出设备数据记录 Excel") + @PreAuthorize("@ss.hasPermission('iot:mqtt-data-record:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportMqttDataRecordExcel(@Valid MqttDataRecordPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = mqttDataRecordService.getMqttDataRecordPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "设备数据记录.xls", "数据", MqttDataRecordRespVO.class, + BeanUtils.toBean(list, MqttDataRecordRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordPageReqVO.java new file mode 100644 index 0000000000..df1e29cb93 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordPageReqVO.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 设备数据记录分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class MqttDataRecordPageReqVO extends PageParam { + + @Schema(description = "设备", example = "赵六") + private String deviceName; + + @Schema(description = "属性") + private String attribute; + + @Schema(description = "属性值") + private String attrValue; + + @Schema(description = "设备时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] deviceTime; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordRespVO.java new file mode 100644 index 0000000000..7c25e8e4cc --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordRespVO.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 设备数据记录 Response VO") +@Data +@ExcelIgnoreUnannotated +public class MqttDataRecordRespVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9202") + @ExcelProperty("ID") + private Long id; + + @Schema(description = "设备", example = "赵六") + @ExcelProperty("设备") + private String deviceName; + + @Schema(description = "属性") + @ExcelProperty("属性") + private String attribute; + + @Schema(description = "属性值") + @ExcelProperty("属性值") + private String attrValue; + + @Schema(description = "设备时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("设备时间") + private LocalDateTime deviceTime; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordSaveReqVO.java new file mode 100644 index 0000000000..85c6b02a9a --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/mqttdatarecord/vo/MqttDataRecordSaveReqVO.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 设备数据记录新增/修改 Request VO") +@Data +public class MqttDataRecordSaveReqVO { + + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "9202") + private Long id; + + @Schema(description = "设备", example = "赵六") + private String deviceName; + + @Schema(description = "属性") + private String attribute; + + @Schema(description = "属性值") + private String attrValue; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttdatarecord/MqttDataRecordDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttdatarecord/MqttDataRecordDO.java new file mode 100644 index 0000000000..8cb6835e6a --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/mqttdatarecord/MqttDataRecordDO.java @@ -0,0 +1,46 @@ +package cn.iocoder.yudao.module.iot.dal.dataobject.mqttdatarecord; + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +import java.time.LocalDateTime; + +/** + * 设备数据记录 DO + * + * @author 内蒙必硕 + */ +@TableName("iot_mqtt_data_record") +@KeySequence("iot_mqtt_data_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class MqttDataRecordDO{ + + /** + * ID + */ + @TableId + private Long id; + /** + * 设备 + */ + private String deviceName; + /** + * 属性 + */ + private String attribute; + /** + * 属性值 + */ + private String attrValue; + /** + * 设备时间 + */ + private LocalDateTime deviceTime; + private LocalDateTime createTime; +} \ No newline at end of file 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 new file mode 100644 index 0000000000..f7b20cc274 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/mqttdatarecord/MqttDataRecordMapper.java @@ -0,0 +1,30 @@ +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.module.iot.dal.dataobject.mqttdatarecord.MqttDataRecordDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.*; + +/** + * 设备数据记录 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface MqttDataRecordMapper extends BaseMapperX { + + default PageResult selectPage(MqttDataRecordPageReqVO reqVO) { + return selectPage(reqVO, 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)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordService.java new file mode 100644 index 0000000000..ce8227cd69 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordService.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.iot.service.mqttdatarecord; + +import java.util.*; +import javax.validation.*; +import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.mqttdatarecord.MqttDataRecordDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +/** + * 设备数据记录 Service 接口 + * + * @author 内蒙必硕 + */ +public interface MqttDataRecordService { + + /** + * 创建设备数据记录 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createMqttDataRecord(@Valid MqttDataRecordSaveReqVO createReqVO); + + /** + * 更新设备数据记录 + * + * @param updateReqVO 更新信息 + */ + void updateMqttDataRecord(@Valid MqttDataRecordSaveReqVO updateReqVO); + + /** + * 删除设备数据记录 + * + * @param id 编号 + */ + void deleteMqttDataRecord(Long id); + + /** + * 获得设备数据记录 + * + * @param id 编号 + * @return 设备数据记录 + */ + MqttDataRecordDO getMqttDataRecord(Long id); + + /** + * 获得设备数据记录分页 + * + * @param pageReqVO 分页查询 + * @return 设备数据记录分页 + */ + PageResult getMqttDataRecordPage(MqttDataRecordPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImpl.java new file mode 100644 index 0000000000..5e31d0ca92 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImpl.java @@ -0,0 +1,74 @@ +package cn.iocoder.yudao.module.iot.service.mqttdatarecord; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.mqttdatarecord.MqttDataRecordDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.iot.dal.mysql.mqttdatarecord.MqttDataRecordMapper; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; + +/** + * 设备数据记录 Service 实现类 + * + * @author 内蒙必硕 + */ +@Service +@Validated +public class MqttDataRecordServiceImpl implements MqttDataRecordService { + + @Resource + private MqttDataRecordMapper mqttDataRecordMapper; + + @Override + public Long createMqttDataRecord(MqttDataRecordSaveReqVO createReqVO) { + // 插入 + MqttDataRecordDO mqttDataRecord = BeanUtils.toBean(createReqVO, MqttDataRecordDO.class); + mqttDataRecordMapper.insert(mqttDataRecord); + // 返回 + return mqttDataRecord.getId(); + } + + @Override + public void updateMqttDataRecord(MqttDataRecordSaveReqVO updateReqVO) { + // 校验存在 + validateMqttDataRecordExists(updateReqVO.getId()); + // 更新 + MqttDataRecordDO updateObj = BeanUtils.toBean(updateReqVO, MqttDataRecordDO.class); + mqttDataRecordMapper.updateById(updateObj); + } + + @Override + public void deleteMqttDataRecord(Long id) { + // 校验存在 + validateMqttDataRecordExists(id); + // 删除 + mqttDataRecordMapper.deleteById(id); + } + + private void validateMqttDataRecordExists(Long id) { + if (mqttDataRecordMapper.selectById(id) == null) { + throw exception(MQTT_DATA_RECORD_NOT_EXISTS); + } + } + + @Override + public MqttDataRecordDO getMqttDataRecord(Long id) { + return mqttDataRecordMapper.selectById(id); + } + + @Override + public PageResult getMqttDataRecordPage(MqttDataRecordPageReqVO pageReqVO) { + return mqttDataRecordMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/mqttdatarecord/MqttDataRecordMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/mqttdatarecord/MqttDataRecordMapper.xml new file mode 100644 index 0000000000..947a87d85f --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/mqttdatarecord/MqttDataRecordMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImplTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImplTest.java new file mode 100644 index 0000000000..bf5c4b76ff --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/mqttdatarecord/MqttDataRecordServiceImplTest.java @@ -0,0 +1,146 @@ +package cn.iocoder.yudao.module.iot.service.mqttdatarecord; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + +import javax.annotation.Resource; + +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; + +import cn.iocoder.yudao.module.iot.controller.admin.mqttdatarecord.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.mqttdatarecord.MqttDataRecordDO; +import cn.iocoder.yudao.module.iot.dal.mysql.mqttdatarecord.MqttDataRecordMapper; +import cn.iocoder.yudao.framework.common.pojo.PageResult; + +import javax.annotation.Resource; +import org.springframework.context.annotation.Import; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*; +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link MqttDataRecordServiceImpl} 的单元测试类 + * + * @author 内蒙必硕 + */ +@Import(MqttDataRecordServiceImpl.class) +public class MqttDataRecordServiceImplTest extends BaseDbUnitTest { + + @Resource + private MqttDataRecordServiceImpl mqttDataRecordService; + + @Resource + private MqttDataRecordMapper mqttDataRecordMapper; + + @Test + public void testCreateMqttDataRecord_success() { + // 准备参数 + MqttDataRecordSaveReqVO createReqVO = randomPojo(MqttDataRecordSaveReqVO.class).setId(null); + + // 调用 + Long mqttDataRecordId = mqttDataRecordService.createMqttDataRecord(createReqVO); + // 断言 + assertNotNull(mqttDataRecordId); + // 校验记录的属性是否正确 + MqttDataRecordDO mqttDataRecord = mqttDataRecordMapper.selectById(mqttDataRecordId); + assertPojoEquals(createReqVO, mqttDataRecord, "id"); + } + + @Test + public void testUpdateMqttDataRecord_success() { + // mock 数据 + MqttDataRecordDO dbMqttDataRecord = randomPojo(MqttDataRecordDO.class); + mqttDataRecordMapper.insert(dbMqttDataRecord);// @Sql: 先插入出一条存在的数据 + // 准备参数 + MqttDataRecordSaveReqVO updateReqVO = randomPojo(MqttDataRecordSaveReqVO.class, o -> { + o.setId(dbMqttDataRecord.getId()); // 设置更新的 ID + }); + + // 调用 + mqttDataRecordService.updateMqttDataRecord(updateReqVO); + // 校验是否更新正确 + MqttDataRecordDO mqttDataRecord = mqttDataRecordMapper.selectById(updateReqVO.getId()); // 获取最新的 + assertPojoEquals(updateReqVO, mqttDataRecord); + } + + @Test + public void testUpdateMqttDataRecord_notExists() { + // 准备参数 + MqttDataRecordSaveReqVO updateReqVO = randomPojo(MqttDataRecordSaveReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> mqttDataRecordService.updateMqttDataRecord(updateReqVO), MQTT_DATA_RECORD_NOT_EXISTS); + } + + @Test + public void testDeleteMqttDataRecord_success() { + // mock 数据 + MqttDataRecordDO dbMqttDataRecord = randomPojo(MqttDataRecordDO.class); + mqttDataRecordMapper.insert(dbMqttDataRecord);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbMqttDataRecord.getId(); + + // 调用 + mqttDataRecordService.deleteMqttDataRecord(id); + // 校验数据不存在了 + assertNull(mqttDataRecordMapper.selectById(id)); + } + + @Test + public void testDeleteMqttDataRecord_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> mqttDataRecordService.deleteMqttDataRecord(id), MQTT_DATA_RECORD_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetMqttDataRecordPage() { + // mock 数据 + MqttDataRecordDO dbMqttDataRecord = randomPojo(MqttDataRecordDO.class, o -> { // 等会查询到 + o.setDeviceName(null); + o.setAttribute(null); + o.setAttrValue(null); + o.setDeviceTime(null); + o.setCreateTime(null); + }); + mqttDataRecordMapper.insert(dbMqttDataRecord); + // 测试 deviceName 不匹配 + mqttDataRecordMapper.insert(cloneIgnoreId(dbMqttDataRecord, o -> o.setDeviceName(null))); + // 测试 attribute 不匹配 + mqttDataRecordMapper.insert(cloneIgnoreId(dbMqttDataRecord, o -> o.setAttribute(null))); + // 测试 attrValue 不匹配 + mqttDataRecordMapper.insert(cloneIgnoreId(dbMqttDataRecord, o -> o.setAttrValue(null))); + // 测试 deviceTime 不匹配 + mqttDataRecordMapper.insert(cloneIgnoreId(dbMqttDataRecord, o -> o.setDeviceTime(null))); + // 测试 createTime 不匹配 + mqttDataRecordMapper.insert(cloneIgnoreId(dbMqttDataRecord, o -> o.setCreateTime(null))); + // 准备参数 + MqttDataRecordPageReqVO reqVO = new MqttDataRecordPageReqVO(); + reqVO.setDeviceName(null); + reqVO.setAttribute(null); + reqVO.setAttrValue(null); + reqVO.setDeviceTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = mqttDataRecordService.getMqttDataRecordPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbMqttDataRecord, pageResult.getList().get(0)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql index 1dc51f6d79..4e34a441ad 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql @@ -33,4 +33,7 @@ DELETE FROM "iot_frpc_proxy_server"; -- 将该删表 SQL 语句，添加到 yudao-module-iot-biz 模块的 test/resources/sql/clean.sql 文件里 -DELETE FROM "iot_feedback"; \ No newline at end of file +DELETE FROM "iot_feedback"; + +-- 将该删表 SQL 语句，添加到 yudao-module-iot-biz 模块的 test/resources/sql/clean.sql 文件里 +DELETE FROM "iot_mqtt_data_record"; \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql index ca91dbec7a..4cffce270b 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql @@ -290,3 +290,15 @@ CREATE TABLE IF NOT EXISTS "iot_feedback" "tenant_id" bigint NOT NULL, PRIMARY KEY ("id") ) COMMENT '用户反馈'; + +CREATE TABLE IF NOT EXISTS "iot_mqtt_data_record" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "device_name" varchar, + "attribute" varchar, + "attr_value" varchar, + "device_time" varchar NOT NULL, + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY ("id") +) COMMENT '设备数据记录'; + diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttDataSaveVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttDataSaveVO.java new file mode 100644 index 0000000000..6ea14461a5 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttDataSaveVO.java @@ -0,0 +1,19 @@ +package cn.iocoder.yudao.module.mes.controller.admin.mqtt; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.ToString; + +import java.util.Map; + +@Schema(description = "管理后台 - 设备数据 VO") +@Data +@ToString(callSuper = true) +public class MqttDataSaveVO { + + @Schema(description = "主题", example = "赵六") + private String topic; + @Schema(description = "数据", example = "赵六") + private Map payload; + +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttServerDataController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttServerDataController.java new file mode 100644 index 0000000000..6de072f466 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/mqtt/MqttServerDataController.java @@ -0,0 +1,68 @@ +package cn.iocoder.yudao.module.mes.controller.admin.mqtt; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttData; +import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttDataUtils; +import cn.iocoder.yudao.module.iot.dal.dataobject.mqttdatarecord.MqttDataRecordDO; +import cn.iocoder.yudao.module.iot.dal.mysql.mqttdatarecord.MqttDataRecordMapper; +import cn.iocoder.yudao.module.iot.service.mqttdatarecord.MqttDataRecordService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.commons.lang3.StringUtils; +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; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +@Tag(name = "管理后台 - 数采记录") +@RestController +@RequestMapping("/iot/mqtt-server") +@Validated +public class MqttServerDataController { + + @Resource + private MqttDataRecordService mqttDataRecordService; + @Resource + private MqttDataRecordMapper mqttDataRecordMapper; + + @PostMapping("/create") + @Operation(summary = "创建设备数据记录") + public CommonResult createMqttDataRecord(@RequestBody MqttDataSaveVO saveVO) { + System.out.println(saveVO.toString()); + if(StringUtils.isNotEmpty(saveVO.getTopic()) && saveVO.getPayload()!=null){ + List list = new ArrayList<>(); + for (String key: saveVO.getPayload().keySet()) { + MqttDataRecordDO recordDO = new MqttDataRecordDO().setDeviceName(saveVO.getTopic()) + .setAttribute(key).setAttrValue(saveVO.getPayload().get(key)); + list.add(recordDO); + } + if(list.size()>0){ + mqttDataRecordMapper.insertBatch(list); + } + } + return success(1L); + } + + @PostMapping("/createMap2") + @Operation(summary = "创建数采记录") + public CommonResult createMap(@RequestBody Map param) { + MqttData mqttData = MqttDataUtils.parseMap(param); +// if(mqttData!=null){ +// MqttRecordSaveReqVO createReqVO = new MqttRecordSaveReqVO(); +// createReqVO.setDeviceCode(mqttData.getDeviceID()); +// createReqVO.setGatewayCode(mqttData.getGatewayID()); +// createReqVO.setDeviceDataTime(mqttData.getDeviceDataTime()); +// createReqVO.setDeviceData(JSON.toJSONString(param)); +// mqttRecordService.createMqttRecord(createReqVO); +// } + return success(true); + } +} \ No newline at end of file diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 3425909c02..327a344410 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -242,6 +242,7 @@ yudao: - tmp_report_data_income - iot_gateway - iot_mqtt_record + - iot_mqtt_data_record - mes_view_task_product_summary - mes_view_report_plan_summary - mes_view_report_user_date_summary