Commit 8e3facb1 authored by wujipeng's avatar wujipeng
Browse files

优化

parent 39d51189
package com.ruzhoukj.rx.pojo.dto; package com.ruzhoukj.rx.pojo.dto;
import com.ruzhoukj.rx.pojo.entity.EquipmentEntity; import com.ruzhoukj.rx.pojo.entity.EquipmentEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -13,4 +15,6 @@ import lombok.EqualsAndHashCode; ...@@ -13,4 +15,6 @@ import lombok.EqualsAndHashCode;
@Data @Data
public class EquipmentDTO extends EquipmentEntity { public class EquipmentDTO extends EquipmentEntity {
@ApiModelProperty(value = "设备名称或路名")
private String name;
} }
package com.ruzhoukj.rx.pojo.entity; package com.ruzhoukj.rx.pojo.entity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
...@@ -17,11 +18,16 @@ import java.util.Date; ...@@ -17,11 +18,16 @@ import java.util.Date;
public class DeviceEntity { public class DeviceEntity {
@Id @Id
@ApiModelProperty(value = "主键id")
private String id; private String id;
@ApiModelProperty(value = "设备id")
private String deviceId; private String deviceId;
@ApiModelProperty(value = "序列号")
private String serialnumber; private String serialnumber;
@ApiModelProperty(value = "上报时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date timestamp; private Date timestamp;
private double zu; private double zu;
private double zb; private double zb;
private double vj; private double vj;
...@@ -29,12 +35,10 @@ public class DeviceEntity { ...@@ -29,12 +35,10 @@ public class DeviceEntity {
private double qa; private double qa;
private double pqa; private double pqa;
private double ph; private double ph;
private double cod; private double cod;
private double tn; private double tn;
private double cond; private double cond;
private double tp; private double tp;
private double nqa; private double nqa;
private double tss; private double tss;
private double pt; private double pt;
......
...@@ -27,7 +27,7 @@ public class EquipmentEntity { ...@@ -27,7 +27,7 @@ public class EquipmentEntity {
@ApiModelProperty(value = "污水厂id") @ApiModelProperty(value = "污水厂id")
@TableField("sewage_plant_id") @TableField("sewage_plant_id")
private Integer sewagePlantId; private String sewagePlantId;
@ApiModelProperty(value = "设备名称") @ApiModelProperty(value = "设备名称")
@TableField("device_name") @TableField("device_name")
...@@ -39,7 +39,7 @@ public class EquipmentEntity { ...@@ -39,7 +39,7 @@ public class EquipmentEntity {
@ApiModelProperty(value = "序列号") @ApiModelProperty(value = "序列号")
@TableField("serial_number") @TableField("serial_number")
private Integer serialNumber; private String serialNumber;
@ApiModelProperty(value = "经度") @ApiModelProperty(value = "经度")
@TableField("longitude") @TableField("longitude")
......
...@@ -37,11 +37,10 @@ ...@@ -37,11 +37,10 @@
from from
equipment equipment
<where> <where>
<if test="section != null and section != ''"> <if test="name != null and name != ''">
section like concat('%', #{section}, '%') section like concat('%', #{name}, '%')
</if> or
<if test="deviceName != null and deviceName != ''"> device_name like concat('%', #{name}, '%')
and device_name like concat('%', #{deviceName}, '%')
</if> </if>
</where> </where>
</select> </select>
......
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