fix mqtt http
chenshuichuan
2 years ago
parent
13e6ec043f
commit
86ac28ec4f
@ -1,59 +0,0 @@
|
||||
package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord;
|
||||
|
||||
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordRespVO;
|
||||
import cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo.MqttRecordSaveReqVO;
|
||||
import cn.iocoder.yudao.module.iot.dal.dataobject.mqttrecord.MqttRecordDO;
|
||||
import cn.iocoder.yudao.module.iot.service.mqttrecord.MqttRecordService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.validation.Valid;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
@Tag(name = "管理后台 - 数采记录")
|
||||
@RestController
|
||||
@RequestMapping("/iot/mqtt-server")
|
||||
@Validated
|
||||
public class MqttServerController {
|
||||
|
||||
@Resource
|
||||
private MqttRecordService mqttRecordService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建数采记录")
|
||||
public CommonResult<Long> createMqttRecord(@Valid @RequestBody MqttRecordSaveReqVO createReqVO) {
|
||||
return success(mqttRecordService.createMqttRecord(createReqVO));
|
||||
}
|
||||
|
||||
@PutMapping("/update")
|
||||
@Operation(summary = "更新数采记录")
|
||||
public CommonResult<Boolean> updateMqttRecord(@Valid @RequestBody MqttRecordSaveReqVO updateReqVO) {
|
||||
mqttRecordService.updateMqttRecord(updateReqVO);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@DeleteMapping("/delete")
|
||||
@Operation(summary = "删除数采记录")
|
||||
@Parameter(name = "id", description = "编号", required = true)
|
||||
public CommonResult<Boolean> deleteMqttRecord(@RequestParam("id") Long id) {
|
||||
mqttRecordService.deleteMqttRecord(id);
|
||||
return success(true);
|
||||
}
|
||||
|
||||
@GetMapping("/get")
|
||||
@Operation(summary = "获得数采记录")
|
||||
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
||||
public CommonResult<MqttRecordRespVO> getMqttRecord(@RequestParam("id") Long id) {
|
||||
MqttRecordDO mqttRecord = mqttRecordService.getMqttRecord(id);
|
||||
return success(BeanUtils.toBean(mqttRecord, MqttRecordRespVO.class));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo;
|
||||
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.springframework.lang.Nullable;
|
||||
|
||||
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class IoData {
|
||||
@Nullable
|
||||
private String u;
|
||||
private String v;
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Map;
|
||||
|
||||
// 同一的数据格式
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class MqttData {
|
||||
protected String deviceID;
|
||||
protected String gatewayID;
|
||||
protected Map<String,IoData> deviceData;
|
||||
protected LocalDateTime deviceDataTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package cn.iocoder.yudao.module.iot.controller.admin.mqttrecord.vo;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class MqttDataUtils {
|
||||
|
||||
public static MqttData parse(String entity){
|
||||
try {
|
||||
MqttData data = JSON.parseObject(entity, MqttData.class);
|
||||
return data;
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
public static MqttData parseMap(Map<String, Object> param){
|
||||
try {
|
||||
MqttData data = JSON.parseObject(JSON.toJSONString(param), MqttData.class);
|
||||
return data;
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
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.controller.admin.mqttrecord.vo.MqttRecordSaveReqVO;
|
||||
import cn.iocoder.yudao.module.iot.service.mqttrecord.MqttRecordService;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
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.Map;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
|
||||
@Tag(name = "管理后台 - 数采记录")
|
||||
@RestController
|
||||
@RequestMapping("/iot/mqtt-server")
|
||||
@Validated
|
||||
public class MqttServerController {
|
||||
|
||||
@Resource
|
||||
private MqttRecordService mqttRecordService;
|
||||
|
||||
@PostMapping("/createMap")
|
||||
@Operation(summary = "创建数采记录")
|
||||
public CommonResult<Boolean> createMap(@RequestBody Map<String, Object> 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);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue