Просмотр исходного кода

[智能电表][修改][相关数据表sql及实体]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
5bbc6315a2
7 измененных файлов: 697 добавлений и 1 удалений
  1. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql
  2. +128
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwBox.java
  3. +113
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java
  4. +107
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java
  5. +107
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java
  6. +113
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java
  7. +128
    -0
      mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java

+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V201906031540__ADD_BOX_METER_TABLE.sql Просмотреть файл

@@ -70,7 +70,7 @@ CREATE TABLE IF NOT EXISTS `kw_box_cmd_history` (
`imei` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '设备编号',
`iccid` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'SIM卡编号',
`cmd` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '命令类型',
`info` json DEFAULT NULL COMMENT '配置',
`info` json DEFAULT NULL COMMENT '信息',
`device_time` datetime NOT NULL COMMENT '设备命令上传记录时间',
`create_time` datetime NOT NULL COMMENT '创建时间',
`update_time` datetime NOT NULL COMMENT '更新时间',


+ 128
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwBox.java Просмотреть файл

@@ -0,0 +1,128 @@
package com.iformall.domain.po;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
* @author gongbiao
*/
@Table(name = "kw_box")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class KwBox extends BaseEntity {
@Id
protected Long id;
@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId;

@io.swagger.annotations.ApiModelProperty(value = "设备编号", name = "imei")
private String imei;

@io.swagger.annotations.ApiModelProperty(value = "SIM卡编号", name = "iccid")
private String iccid;

@io.swagger.annotations.ApiModelProperty(value = "位置", name = "place")
private String place;

@io.swagger.annotations.ApiModelProperty(value = "固件版本号", name = "fwVersion")
private String fw_version;

@io.swagger.annotations.ApiModelProperty(value = "硬件版本号", name = "hdVersion")
private String hd_version;

@io.swagger.annotations.ApiModelProperty(value = "注册状态0出厂已注册1", name = "status")
private Integer status;

@io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online")
private Integer online;

@io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config")
private String config;

@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "registerTime")
private Date registerTime;

@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime")
private Date lastOnlineTime;

@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;

@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC");
private String value;

Field(String value) {
this.value = value;
}

public String getValue() {
return value;
}

public void setCol(String value) {
this.value = value;
}

@Override
public String toString() {
return this.getValue();
}
}

public void setSortColumns(Field... fields) {
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns = sb.toString();
}

public void setSortColumns(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
}

+ 113
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwBoxCmdHistory.java Просмотреть файл

@@ -0,0 +1,113 @@
package com.iformall.domain.po;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
* @author gongbiao
*/
@Table(name = "kw_box_cmd_history")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class KwBoxCmdHistory extends BaseEntity {
@Id
protected Long id;
@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId;

@io.swagger.annotations.ApiModelProperty(value = "设备编号", name = "imei")
private String imei;

@io.swagger.annotations.ApiModelProperty(value = "SIM卡编号", name = "iccid")
private String iccid;

@io.swagger.annotations.ApiModelProperty(value = "'命令类型", name = "cmd")
private String cmd;

@io.swagger.annotations.ApiModelProperty(value = "'信息", name = "info")
private String info;

@io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime")
private Date deviceTime;

@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;

@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC");
private String value;

Field(String value) {
this.value = value;
}

public String getValue() {
return value;
}

public void setCol(String value) {
this.value = value;
}

@Override
public String toString() {
return this.getValue();
}
}

public void setSortColumns(Field... fields) {
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns = sb.toString();
}

public void setSortColumns(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
}

+ 107
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwBoxMeter.java Просмотреть файл

@@ -0,0 +1,107 @@
package com.iformall.domain.po;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
* @author gongbiao
*/
@Table(name = "kw_box_meter")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class KwBoxMeter extends BaseEntity {
@Id
protected Long id;
@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId;

@io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId")
private Long meterId;

@io.swagger.annotations.ApiModelProperty(value = "盒子ID", name = "boxId")
private Long boxId;

@io.swagger.annotations.ApiModelProperty(value = "状态1历史0在用", name = "status")
private Integer status;

@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;

@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC");
private String value;

Field(String value) {
this.value = value;
}

public String getValue() {
return value;
}

public void setCol(String value) {
this.value = value;
}

@Override
public String toString() {
return this.getValue();
}
}

public void setSortColumns(Field... fields) {
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns = sb.toString();
}

public void setSortColumns(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
}

+ 107
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwMerchantMeter.java Просмотреть файл

@@ -0,0 +1,107 @@
package com.iformall.domain.po;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
* @author gongbiao
*/
@Table(name = "kw_merchant_meter")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class KwMerchantMeter extends BaseEntity {
@Id
protected Long id;
@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId;

@io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId")
private Long meterId;

@io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId")
private Long merchantId;

@io.swagger.annotations.ApiModelProperty(value = "状态1历史0在用", name = "status")
private Integer status;

@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;

@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC");
private String value;

Field(String value) {
this.value = value;
}

public String getValue() {
return value;
}

public void setCol(String value) {
this.value = value;
}

@Override
public String toString() {
return this.getValue();
}
}

public void setSortColumns(Field... fields) {
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns = sb.toString();
}

public void setSortColumns(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
}

+ 113
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwMeterData.java Просмотреть файл

@@ -0,0 +1,113 @@
package com.iformall.domain.po;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
* @author gongbiao
*/
@Table(name = "kw_meter_data")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class KwMeterData extends BaseEntity {
@Id
protected Long id;
@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId;

@io.swagger.annotations.ApiModelProperty(value = "电表ID", name = "meterId")
private Long meterId;

@io.swagger.annotations.ApiModelProperty(value = "盒子ID", name = "boxId")
private Long boxId;

@io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address")
private String address;

@io.swagger.annotations.ApiModelProperty(value = "度数", name = "result")
private String result;

@io.swagger.annotations.ApiModelProperty(value = "设备命令上传记录时间", name = "deviceTime")
private Date deviceTime;

@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;

@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC");
private String value;

Field(String value) {
this.value = value;
}

public String getValue() {
return value;
}

public void setCol(String value) {
this.value = value;
}

@Override
public String toString() {
return this.getValue();
}
}

public void setSortColumns(Field... fields) {
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns = sb.toString();
}

public void setSortColumns(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
}

+ 128
- 0
mallinkService/src/main/java/com/iformall/domain/po/KwMeters.java Просмотреть файл

@@ -0,0 +1,128 @@
package com.iformall.domain.po;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
* @author gongbiao
*/
@Table(name = "kw_meters")
@Data
@ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true)
public class KwMeters extends BaseEntity {
@Id
protected Long id;
@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;

@Override
public String getSortColumns() {
super.setSortColumns(this.sortColumns);
return super.getSortColumns();
}

@io.swagger.annotations.ApiModelProperty(value = "tenantId", name = "tenantId")
private String tenantId;

@io.swagger.annotations.ApiModelProperty(value = "电表编号", name = "address")
private String address;

@io.swagger.annotations.ApiModelProperty(value = "品牌", name = "brand")
private String brand;

@io.swagger.annotations.ApiModelProperty(value = "型号", name = "model")
private String model;

@io.swagger.annotations.ApiModelProperty(value = "位置", name = "place")
private String place;

@io.swagger.annotations.ApiModelProperty(value = "协议(0,97协议)(1,07协议)", name = "protocol")
private Integer protocol;

@io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate")
private Integer bandrate;

@io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "online")
private Integer online;

@io.swagger.annotations.ApiModelProperty(value = "配置信息", name = "config")
private String config;

@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "registerTime")
private Date registerTime;

@io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "lastOnlineTime")
private Date lastOnlineTime;

@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime;

@io.swagger.annotations.ApiModelProperty(value = "修改时间", name = "updateTime")
private Date updateTime;

public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), CreateTime_ASC("`create_time` ASC"), CreateTime_DESC("`create_time` DESC"), UpdateTime_ASC("`update_time` ASC"), UpdateTime_DESC("`update_time` DESC");
private String value;

Field(String value) {
this.value = value;
}

public String getValue() {
return value;
}

public void setCol(String value) {
this.value = value;
}

@Override
public String toString() {
return this.getValue();
}
}

public void setSortColumns(Field... fields) {
if (fields == null || fields.length == 0) {
return;
}
for (int k = 0; k < fields.length; k++) {
if (fields[k] == null) {
return;
}
}
StringBuilder sb = new StringBuilder(fields[0].toString());
for (int k = 1; k < fields.length; k++) {
sb.append(",");
sb.append(fields[k].toString());
}
this.sortColumns = sb.toString();
}

public void setSortColumns(String sortColumns) {
if (sortColumns == null || "".equals(sortColumns.trim())) {
return;
}
if (sortColumns.contains(",")) {
String[] cols = sortColumns.split(",");
List<Field> fList = new ArrayList();
for (int k = 0; k < cols.length; k++) {
fList.add(Field.valueOf(cols[k]));
}
this.setSortColumns(fList.toArray(new Field[fList.size()]));
} else {
this.setSortColumns(Field.valueOf(sortColumns));
}
}
}

Загрузка…
Отмена
Сохранить