修改了添加火点信息的功能,添加了火点图片路径和卫星影像路径的字段

This commit is contained in:
DESKTOP-G8BCEP0\HP 2021-09-22 11:50:07 +08:00
parent aebf765b42
commit 3457f446db
4 changed files with 68 additions and 5 deletions

View File

@ -85,10 +85,22 @@ public class FirePointEntity implements Serializable {
@Column(length = 32, columnDefinition = "varchar(32)") @Column(length = 32, columnDefinition = "varchar(32)")
private String fireType; private String fireType;
/**
* 当前火点的图片
*/
private String fireImage;
/**
* 卫星影像图片
*/
private String satelliteImage;
public FirePointEntity() { public FirePointEntity() {
} }
public FirePointEntity(Integer id, String fireCode, double longitude, double latitude, String countyCode, String countyName, String satelliteTime, String satelliteType, String landType, String addTime, String confidence, String firePointAddress, String fireType) { public FirePointEntity(Integer id, String fireCode, double longitude, double latitude, String countyCode, String countyName, String satelliteTime, String satelliteType, String landType, String addTime, String confidence, String firePointAddress, String fireType, String fireImage, String satelliteImage) {
this.id = id; this.id = id;
this.fireCode = fireCode; this.fireCode = fireCode;
this.longitude = longitude; this.longitude = longitude;
@ -102,6 +114,8 @@ public class FirePointEntity implements Serializable {
this.confidence = confidence; this.confidence = confidence;
this.firePointAddress = firePointAddress; this.firePointAddress = firePointAddress;
this.fireType = fireType; this.fireType = fireType;
this.fireImage = fireImage;
this.satelliteImage = satelliteImage;
} }
public Integer getId() { public Integer getId() {
@ -208,6 +222,22 @@ public class FirePointEntity implements Serializable {
this.fireType = fireType; this.fireType = fireType;
} }
public String getFireImage() {
return fireImage;
}
public void setFireImage(String fireImage) {
this.fireImage = fireImage;
}
public String getSatelliteImage() {
return satelliteImage;
}
public void setSatelliteImage(String satelliteImage) {
this.satelliteImage = satelliteImage;
}
@Override @Override
public String toString() { public String toString() {
return "FirePointEntity{" + return "FirePointEntity{" +
@ -224,6 +254,8 @@ public class FirePointEntity implements Serializable {
", confidence='" + confidence + '\'' + ", confidence='" + confidence + '\'' +
", firePointAddress='" + firePointAddress + '\'' + ", firePointAddress='" + firePointAddress + '\'' +
", fireType='" + fireType + '\'' + ", fireType='" + fireType + '\'' +
", fireImage='" + fireImage + '\'' +
", satelliteImage='" + satelliteImage + '\'' +
'}'; '}';
} }
} }

View File

@ -51,10 +51,20 @@ public class FirePointQo {
*/ */
private String confidence; private String confidence;
/**
* 当前火点的图片
*/
private String fireImage;
/**
* 卫星影像图片
*/
private String satelliteImage;
public FirePointQo() { public FirePointQo() {
} }
public FirePointQo(String fireCode, Integer countyCode, String countyName, Integer satelliteTimeTs, Double longitude, Double latitude, String satelliteType, String landtype, String confidence) { public FirePointQo(String fireCode, Integer countyCode, String countyName, Integer satelliteTimeTs, Double longitude, Double latitude, String satelliteType, String landtype, String confidence, String fireImage, String satelliteImage) {
this.fireCode = fireCode; this.fireCode = fireCode;
this.countyCode = countyCode; this.countyCode = countyCode;
this.countyName = countyName; this.countyName = countyName;
@ -64,6 +74,8 @@ public class FirePointQo {
this.satelliteType = satelliteType; this.satelliteType = satelliteType;
this.landtype = landtype; this.landtype = landtype;
this.confidence = confidence; this.confidence = confidence;
this.fireImage = fireImage;
this.satelliteImage = satelliteImage;
} }
public String getFireCode() { public String getFireCode() {
@ -138,18 +150,36 @@ public class FirePointQo {
this.confidence = confidence; this.confidence = confidence;
} }
public String getFireImage() {
return fireImage;
}
public void setFireImage(String fireImage) {
this.fireImage = fireImage;
}
public String getSatelliteImage() {
return satelliteImage;
}
public void setSatelliteImage(String satelliteImage) {
this.satelliteImage = satelliteImage;
}
@Override @Override
public String toString() { public String toString() {
return "FirePointQo{" + return "FirePointQo{" +
"fireCode='" + fireCode + '\'' + "fireCode='" + fireCode + '\'' +
", countyCode='" + countyCode + '\'' + ", countyCode=" + countyCode +
", countyName='" + countyName + '\'' + ", countyName='" + countyName + '\'' +
", satelliteTimeTs=" + satelliteTimeTs + ", satelliteTimeTs=" + satelliteTimeTs +
", longitude=" + longitude + ", longitude=" + longitude +
", latitude=" + latitude + ", latitude=" + latitude +
", satelliteType='" + satelliteType + '\'' + ", satelliteType='" + satelliteType + '\'' +
", landType='" + landtype + '\'' + ", landtype='" + landtype + '\'' +
", confidence='" + confidence + '\'' + ", confidence='" + confidence + '\'' +
", fireImage='" + fireImage + '\'' +
", satelliteImage='" + satelliteImage + '\'' +
'}'; '}';
} }
} }

View File

@ -86,6 +86,8 @@ public class FirePointServiceImpl implements FirePointService {
firePointEntity.setConfidence(firePointQo.getConfidence()); firePointEntity.setConfidence(firePointQo.getConfidence());
firePointEntity.setAddTime(DateTimeUtil.dateTimeToString(LocalDateTime.now())); firePointEntity.setAddTime(DateTimeUtil.dateTimeToString(LocalDateTime.now()));
firePointEntity.setFireType("0"); firePointEntity.setFireType("0");
firePointEntity.setFireImage(firePointQo.getFireImage());
firePointEntity.setSatelliteImage(firePointQo.getSatelliteImage());
log.info("-------发现新火点"); log.info("-------发现新火点");
/*log.info("---------------开始进行实时通讯,将检测到的火点传给前端"); /*log.info("---------------开始进行实时通讯,将检测到的火点传给前端");
Map map = new HashMap(3); Map map = new HashMap(3);

View File

@ -227,7 +227,6 @@ public class FileUtil {
} }
public static boolean checkFileSize(Long len, int size, String unit) { public static boolean checkFileSize(Long len, int size, String unit) {
// long len = file.length();
double fileSize = 0; double fileSize = 0;
if ("B".equals(unit.toUpperCase())) { if ("B".equals(unit.toUpperCase())) {
fileSize = (double) len; fileSize = (double) len;