Commit 2a1c27ab authored by wujipeng's avatar wujipeng
Browse files

基本模型搭建

parent a751099e
......@@ -55,7 +55,7 @@ public class MqttSubscriberClient {
String serialnumber = deviceData.getSerialnumber();
for (DataPoint dp : deviceData.getData()) {
DeviceEntity deviceEntity = new DeviceEntity();
deviceEntity.setDeviceID(deviceId);
deviceEntity.setDeviceId(deviceId);
deviceEntity.setSerialnumber(serialnumber);
deviceEntity.setTimestamp(dp.getTimestamp());
Fields fields = dp.getFields();
......@@ -76,6 +76,12 @@ public class MqttSubscriberClient {
deviceEntity.setTss(fields.getTss());
deviceEntity.setPt(fields.getPt());
deviceEntity.setPn05(fields.getPn05());
deviceEntity.setPh(fields.getPh());
deviceEntity.setCod(fields.getCod());
deviceEntity.setTn(fields.getTn());
deviceEntity.setCond(fields.getCond());
deviceEntity.setTp(fields.getTp());
deviceDao.insert(deviceEntity);
}
} catch (IOException e) {
......
package com.ruzhoukj.rx.controller;
import com.ruzhoukj.rx.common.R;
import com.ruzhoukj.rx.pojo.vo.DeviceVO;
import com.ruzhoukj.rx.service.EquipmentService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author wujipeng
* @version 1.0
*/
@RequestMapping("/api/")
@RestController
public class EquipmentController {
@Resource
private EquipmentService equipmentService;
@ApiOperation(value = "根据设备id查询最新的一条设备上报信息")
@GetMapping("/{deviceId}")
public R getEquipmentByDeviceId(@PathVariable String deviceId) {
return R.ok();
}
}
package com.ruzhoukj.rx.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @author wujipeng
* @version 1.0
*/
@Mapper
public interface EquipmentDao extends BaseMapper<EquipmentEntity> {
}
package com.ruzhoukj.rx.pojo.dto;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author wujipeng
* @version 1.0
* @create 2024-08-22 15:48
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class EquipmentDTO extends EquipmentEntity {
}
......@@ -18,7 +18,7 @@ public class DeviceEntity {
@Id
private String id;
private String deviceID;
private String deviceId;
private String serialnumber;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date timestamp;
......@@ -28,6 +28,13 @@ public class DeviceEntity {
private double q;
private double qa;
private double pqa;
private double ph;
private double cod;
private double tn;
private double cond;
private double tp;
private double nqa;
private double tss;
private double pt;
......
package com.ruzhoukj.rx.pojo.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author wujipeng
* @version 1.0
*/
@Data
@TableName("equipment")
public class EquipmentEntity {
@TableId(type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "污水厂名称")
@TableField("sewage_plant_name")
private String sewagePlantName;
@ApiModelProperty(value = "污水厂id")
@TableField("sewage_plant_id")
private Integer sewagePlantId;
@ApiModelProperty(value = "设备名称")
@TableField("device_name")
private String deviceName;
@ApiModelProperty(value = "设备id")
@TableField("device_id")
private String deviceId;
@ApiModelProperty(value = "序列号")
@TableField("serial_number")
private Integer serialNumber;
@ApiModelProperty(value = "经度")
@TableField("longitude")
private Double longitude;
@ApiModelProperty(value = "纬度")
@TableField("latitude")
private Double latitude;
@ApiModelProperty(value = "设备类型(1:液位 2:水质 3:流速)")
@TableField("type")
private Integer type;
@ApiModelProperty(value = "液位阀值")
@TableField("threshold_value")
private Double thresholdValue;
}
......@@ -17,6 +17,13 @@ public class Fields {
private double pt;
private double pn05;
private double zu;
private double ph;
private double cod;
private double tn;
private double cond;
private double tp;
private double zb;
private double vt;
private double svt;
......
package com.ruzhoukj.rx.pojo.vo;
import com.ruzhoukj.rx.pojo.entity.DeviceEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author wujipeng
* @version 1.0
* @create 2024-08-22 16:00
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DeviceVO extends DeviceEntity {
}
package com.ruzhoukj.rx.pojo.vo;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author wujipeng
* @version 1.0
* @create 2024-08-22 15:49
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class EquipmentVO extends EquipmentEntity {
}
package com.ruzhoukj.rx.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
/**
* @author wujipeng
* @version 1.0
*/
public interface EquipmentService extends IService<EquipmentEntity> {
}
package com.ruzhoukj.rx.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruzhoukj.rx.dao.EquipmentDao;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import com.ruzhoukj.rx.service.EquipmentService;
import org.springframework.stereotype.Service;
/**
* @author wujipeng
* @version 1.0
*/
@Service
public class EquipmentServiceImpl
extends ServiceImpl<EquipmentDao, EquipmentEntity> implements EquipmentService {
}
......@@ -6,7 +6,7 @@ spring:
username: root
password: ruzhoukj@2022
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.10.3:3307/ops?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.10.3:3307/radio_station_network?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
data:
mongodb:
database: device_data
......
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruzhoukj.rx.dao.EquipmentDao">
</mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment