liuchengqian/fire_point
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
liuchengqian 2023-03-06 11:34:47 +08:00
parent 9aa39ddc1c
commit 06acc1588a
2 changed files with 242 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java
View File

@ -21,21 +21,9 @@ public class FirePointOrdinaryEntity implements Serializable {
/** /**
* 火点编码 * 火点编码
*/ */
@Column(length = 32, unique = true, columnDefinition = "varchar(32)") @Column(length = 64, unique = true, columnDefinition = "varchar(64)")
private String fireCode; private String fireCode;
/**
* 省市区的编码
*/
@Column(length = 32, columnDefinition = "varchar(32)")
private String countyCode;
/**
* 省市区的名称
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String countyName;
/** /**
* 卫星监测的时间 * 卫星监测的时间
*/ */
@ -82,18 +70,6 @@ public class FirePointOrdinaryEntity implements Serializable {
@Column(length = 512, columnDefinition = "varchar(512)") @Column(length = 512, columnDefinition = "varchar(512)")
private String satelliteImage; private String satelliteImage;
/**
* 乡镇街道的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String townCode;
/**
* 乡镇街道的名字
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String townName;
/** /**
* 添加的时间 * 添加的时间
*/ */
@ -112,6 +88,54 @@ public class FirePointOrdinaryEntity implements Serializable {
@Column(length = 1024, columnDefinition = "varchar(1024)") @Column(length = 1024, columnDefinition = "varchar(1024)")
private String remark; private String remark;
/**
* 省的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String proCode;
/**
* 省的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String proName;
/**
* 市的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String cityCode;
/**
* 市的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String cityName;
/**
* 区县的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String countyCode;
/**
* 区县的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String countyName;
/**
* 乡镇街道的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String townCode;
/**
* 乡镇街道的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String townName;
public FirePointOrdinaryEntity() { public FirePointOrdinaryEntity() {
} }
@ -131,22 +155,6 @@ public class FirePointOrdinaryEntity implements Serializable {
this.fireCode = fireCode; this.fireCode = fireCode;
} }
public String getCountyCode() {
return countyCode;
}
public void setCountyCode(String countyCode) {
this.countyCode = countyCode;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public String getSatelliteTime() { public String getSatelliteTime() {
return satelliteTime; return satelliteTime;
} }
@ -211,22 +219,6 @@ public class FirePointOrdinaryEntity implements Serializable {
this.satelliteImage = satelliteImage; this.satelliteImage = satelliteImage;
} }
public String getTownCode() {
return townCode;
}
public void setTownCode(String townCode) {
this.townCode = townCode;
}
public String getTownName() {
return townName;
}
public void setTownName(String townName) {
this.townName = townName;
}
public String getAddTime() { public String getAddTime() {
return addTime; return addTime;
} }
@ -251,13 +243,75 @@ public class FirePointOrdinaryEntity implements Serializable {
this.remark = remark; this.remark = remark;
} }
public String getProCode() {
return proCode;
}
public void setProCode(String proCode) {
this.proCode = proCode;
}
public String getProName() {
return proName;
}
public void setProName(String proName) {
this.proName = proName;
}
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCountyCode() {
return countyCode;
}
public void setCountyCode(String countyCode) {
this.countyCode = countyCode;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public String getTownCode() {
return townCode;
}
public void setTownCode(String townCode) {
this.townCode = townCode;
}
public String getTownName() {
return townName;
}
public void setTownName(String townName) {
this.townName = townName;
}
@Override @Override
public String toString() { public String toString() {
return "FirePointOrdinaryEntity{" + return "FirePointOrdinaryEntity{" +
"id=" + id + "id=" + id +
", fireCode='" + fireCode + '\'' + ", fireCode='" + fireCode + '\'' +
", countyCode='" + countyCode + '\'' +
", countyName='" + countyName + '\'' +
", satelliteTime='" + satelliteTime + '\'' + ", satelliteTime='" + satelliteTime + '\'' +
", longitude=" + longitude + ", longitude=" + longitude +
", latitude=" + latitude + ", latitude=" + latitude +
@ -266,11 +320,17 @@ public class FirePointOrdinaryEntity implements Serializable {
", confidence='" + confidence + '\'' + ", confidence='" + confidence + '\'' +
", fireImage='" + fireImage + '\'' + ", fireImage='" + fireImage + '\'' +
", satelliteImage='" + satelliteImage + '\'' + ", satelliteImage='" + satelliteImage + '\'' +
", townCode='" + townCode + '\'' +
", townName='" + townName + '\'' +
", addTime='" + addTime + '\'' + ", addTime='" + addTime + '\'' +
", firePointAddress='" + firePointAddress + '\'' + ", firePointAddress='" + firePointAddress + '\'' +
", remark='" + remark + '\'' + ", remark='" + remark + '\'' +
", proCode='" + proCode + '\'' +
", proName='" + proName + '\'' +
", cityCode='" + cityCode + '\'' +
", cityName='" + cityName + '\'' +
", countyCode='" + countyCode + '\'' +
", countyName='" + countyName + '\'' +
", townCode='" + townCode + '\'' +
", townName='" + townName + '\'' +
'}'; '}';
} }
} }

182
src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java
View File

@ -21,21 +21,9 @@ public class FirePointPreciseEntity implements Serializable {
/** /**
* 火点编码 * 火点编码
*/ */
@Column(length = 32, unique = true, columnDefinition = "varchar(32)") @Column(length = 64, unique = true, columnDefinition = "varchar(64)")
private String fireCode; private String fireCode;
/**
* 省市区的编码
*/
@Column(length = 32, columnDefinition = "varchar(32)")
private String countyCode;
/**
* 省市区的名称
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String countyName;
/** /**
* 卫星监测的时间 * 卫星监测的时间
*/ */
@ -82,18 +70,6 @@ public class FirePointPreciseEntity implements Serializable {
@Column(length = 512, columnDefinition = "varchar(512)") @Column(length = 512, columnDefinition = "varchar(512)")
private String satelliteImage; private String satelliteImage;
/**
* 乡镇街道的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String townCode;
/**
* 乡镇街道的名字
*/
@Column(length = 85, columnDefinition = "varchar(85)")
private String townName;
/** /**
* 添加的时间 * 添加的时间
*/ */
@ -112,6 +88,54 @@ public class FirePointPreciseEntity implements Serializable {
@Column(length = 1024, columnDefinition = "varchar(1024)") @Column(length = 1024, columnDefinition = "varchar(1024)")
private String remark; private String remark;
/**
* 省的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String proCode;
/**
* 省的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String proName;
/**
* 市的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String cityCode;
/**
* 市的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String cityName;
/**
* 区县的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String countyCode;
/**
* 区县的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String countyName;
/**
* 乡镇街道的编码
*/
@Column(length = 64, columnDefinition = "varchar(64)")
private String townCode;
/**
* 乡镇街道的名称
*/
@Column(length = 128, columnDefinition = "varchar(128)")
private String townName;
public FirePointPreciseEntity() { public FirePointPreciseEntity() {
} }
@ -131,22 +155,6 @@ public class FirePointPreciseEntity implements Serializable {
this.fireCode = fireCode; this.fireCode = fireCode;
} }
public String getCountyCode() {
return countyCode;
}
public void setCountyCode(String countyCode) {
this.countyCode = countyCode;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public String getSatelliteTime() { public String getSatelliteTime() {
return satelliteTime; return satelliteTime;
} }
@ -211,22 +219,6 @@ public class FirePointPreciseEntity implements Serializable {
this.satelliteImage = satelliteImage; this.satelliteImage = satelliteImage;
} }
public String getTownCode() {
return townCode;
}
public void setTownCode(String townCode) {
this.townCode = townCode;
}
public String getTownName() {
return townName;
}
public void setTownName(String townName) {
this.townName = townName;
}
public String getAddTime() { public String getAddTime() {
return addTime; return addTime;
} }
@ -251,13 +243,75 @@ public class FirePointPreciseEntity implements Serializable {
this.remark = remark; this.remark = remark;
} }
public String getProCode() {
return proCode;
}
public void setProCode(String proCode) {
this.proCode = proCode;
}
public String getProName() {
return proName;
}
public void setProName(String proName) {
this.proName = proName;
}
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
public String getCityName() {
return cityName;
}
public void setCityName(String cityName) {
this.cityName = cityName;
}
public String getCountyCode() {
return countyCode;
}
public void setCountyCode(String countyCode) {
this.countyCode = countyCode;
}
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public String getTownCode() {
return townCode;
}
public void setTownCode(String townCode) {
this.townCode = townCode;
}
public String getTownName() {
return townName;
}
public void setTownName(String townName) {
this.townName = townName;
}
@Override @Override
public String toString() { public String toString() {
return "FirePointPreciseEntity{" + return "FirePointPreciseEntity{" +
"id=" + id + "id=" + id +
", fireCode='" + fireCode + '\'' + ", fireCode='" + fireCode + '\'' +
", countyCode='" + countyCode + '\'' +
", countyName='" + countyName + '\'' +
", satelliteTime='" + satelliteTime + '\'' + ", satelliteTime='" + satelliteTime + '\'' +
", longitude=" + longitude + ", longitude=" + longitude +
", latitude=" + latitude + ", latitude=" + latitude +
@ -266,11 +320,17 @@ public class FirePointPreciseEntity implements Serializable {
", confidence='" + confidence + '\'' + ", confidence='" + confidence + '\'' +
", fireImage='" + fireImage + '\'' + ", fireImage='" + fireImage + '\'' +
", satelliteImage='" + satelliteImage + '\'' + ", satelliteImage='" + satelliteImage + '\'' +
", townCode='" + townCode + '\'' +
", townName='" + townName + '\'' +
", addTime='" + addTime + '\'' + ", addTime='" + addTime + '\'' +
", firePointAddress='" + firePointAddress + '\'' + ", firePointAddress='" + firePointAddress + '\'' +
", remark='" + remark + '\'' + ", remark='" + remark + '\'' +
", proCode='" + proCode + '\'' +
", proName='" + proName + '\'' +
", cityCode='" + cityCode + '\'' +
", cityName='" + cityName + '\'' +
", countyCode='" + countyCode + '\'' +
", countyName='" + countyName + '\'' +
", townCode='" + townCode + '\'' +
", townName='" + townName + '\'' +
'}'; '}';
} }
} }