Commit d34943ec authored by wangjinjing's avatar wangjinjing

重新提交

parent 6ca54bf1
...@@ -2,7 +2,6 @@ package com.cx.cn.cxquartz; ...@@ -2,7 +2,6 @@ package com.cx.cn.cxquartz;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
......
...@@ -51,11 +51,6 @@ public class DateUtils { ...@@ -51,11 +51,6 @@ public class DateUtils {
return new DateTime(date).toString(YMD_HMS); return new DateTime(date).toString(YMD_HMS);
} }
public static String formatDateTime(DateTime date){
return date.toString(YMD_HMS);
}
public static String formatDateToNoSign(Date date){ public static String formatDateToNoSign(Date date){
return new DateTime(date).toString(YMDHMS); return new DateTime(date).toString(YMDHMS);
} }
...@@ -67,10 +62,7 @@ public class DateUtils { ...@@ -67,10 +62,7 @@ public class DateUtils {
private static String formatCurrDateByType(DateTimeFormatter dateTimeFormatter){ private static String formatCurrDateByType(DateTimeFormatter dateTimeFormatter){
return DateTime.now().toString(dateTimeFormatter); return DateTime.now().toString(dateTimeFormatter);
} }
public static DateTime getNowDate(){
return DateTime.now();
}
public static Date addMinutes(Date date, int minutes) { public static Date addMinutes(Date date, int minutes) {
return new DateTime(date).plusMinutes(minutes).toDate(); return new DateTime(date).plusMinutes(minutes).toDate();
} }
......
...@@ -147,7 +147,7 @@ public class FileTransferManager { ...@@ -147,7 +147,7 @@ public class FileTransferManager {
GoalStructureParam param = new GoalStructureParam(); GoalStructureParam param = new GoalStructureParam();
param.setOutput(new Output(1, 1, -1, 3)); param.setOutput(new Output(1, 1, -1, 3));
param.setModel(model); param.setModel(model);
param.setApiout("0");////打开1400标准输出,默认可以不填 param.setApiout("1");////打开1400标准输出,默认可以不填
List<ImageList> list = new ArrayList<>(); List<ImageList> list = new ArrayList<>();
getImageList("1",roiarray, base64Encoder, list, transferRecord.getImg1path()); getImageList("1",roiarray, base64Encoder, list, transferRecord.getImg1path());
getImageList("2", roiarray,base64Encoder, list, transferRecord.getImg2path()); getImageList("2", roiarray,base64Encoder, list, transferRecord.getImg2path());
......
...@@ -2,7 +2,6 @@ package com.cx.cn.cxquartz.vo; ...@@ -2,7 +2,6 @@ package com.cx.cn.cxquartz.vo;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import org.joda.time.DateTime;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -18,6 +17,7 @@ import java.util.Date; ...@@ -18,6 +17,7 @@ import java.util.Date;
public class TraffpictureParam extends Traffpicture { public class TraffpictureParam extends Traffpicture {
private static final long serialVersionUID=1L; private static final long serialVersionUID=1L;
@JsonIgnore @JsonIgnore
private Long recordid; private Long recordid;
@JsonIgnore @JsonIgnore
...@@ -37,7 +37,7 @@ public class TraffpictureParam extends Traffpicture { ...@@ -37,7 +37,7 @@ public class TraffpictureParam extends Traffpicture {
@JsonIgnore @JsonIgnore
private String creator; private String creator;
@JsonIgnore @JsonIgnore
private DateTime createtime; private Date createtime;
@JsonIgnore @JsonIgnore
private String updator; private String updator;
@JsonIgnore @JsonIgnore
...@@ -156,11 +156,11 @@ public class TraffpictureParam extends Traffpicture { ...@@ -156,11 +156,11 @@ public class TraffpictureParam extends Traffpicture {
this.creator = creator; this.creator = creator;
} }
public DateTime getCreatetime() { public Date getCreatetime() {
return createtime; return createtime;
} }
public void setCreatetime(DateTime createtime) { public void setCreatetime(Date createtime) {
this.createtime = createtime; this.createtime = createtime;
} }
......
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
* Copyright 2021 json.cn * Copyright 2021 json.cn
*/ */
package com.cx.cn.cxquartz.vo; package com.cx.cn.cxquartz.vo;
/**
* Auto-generated: 2021-04-28 19:16:46
*
* @author json.cn (i@json.cn)
* @website http://www.json.cn/java2pojo/
*/
public class UpperBoundingBox { public class UpperBoundingBox {
private int x; private int x;
......
...@@ -37,18 +37,8 @@ spring: ...@@ -37,18 +37,8 @@ spring:
cache: false cache: false
enabled: true enabled: true
encoding: UTF-8 encoding: UTF-8
mode : HTML mode: HTML
redis:
host: 172.16.24.153
port: 6379
timeout: 300
# password:
pool:
minIdle: 1
maxIdle: 10
maxWait : -1
maxActive: 8
#logging: #logging:
# level: # level:
# root: # root:
......
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