From 133163fb85f409b12dab65d5aa3edb7a776a8c29 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 20 三月 2024 14:30:15 +0800
Subject: [PATCH] 优化上报数据的更新时间
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java | 2
src/main/resources/application-pro5348.yml | 56 ++++++++++++++++++
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 83 ++++++++++++++-------------
3 files changed, 99 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
index 0159564..4e2a138 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
@@ -84,7 +84,7 @@
apiData.setSpjksbid(sysData.getId());
}
- apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*100) + "," + Math.round(sysData.getPosY()*1000) + ")");
+ apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*1000) + "," + Math.round(sysData.getPosY()*1000) + ")");
apiData.setBz(sysData.getRemark());
//瑙嗛鐩戞帶绫诲瀷鍜岀偣浣嶇被鍨�
apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx())?"3":sysData.getSpjklx());
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index a854bbd..9f79872 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -23,6 +23,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -308,48 +309,48 @@
if (Constant.API_CODE_1101.equals(inteId)) {
Gd2022Api1101 api1101 = new Gd2022Api1101();
BeanUtils.copyProperties(data, api1101);
- api1101.setZhgxsj(new Date());
+ api1101.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1101);
}
if (Constant.API_CODE_1102.equals(inteId)) {
Gd2022Api1102 api1102 = new Gd2022Api1102();
BeanUtils.copyProperties(data, api1102);
- api1102.setZhgxsj(new Date());
+ api1102.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1102);
}
if (Constant.API_CODE_1103.equals(inteId)) {
Gd2022Api1103 api1103 = new Gd2022Api1103();
BeanUtils.copyProperties(data, api1103);
changeObject(api1103);
- api1103.setZhgxsj(new Date());
+ api1103.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1103);
}
if (Constant.API_CODE_1104.equals(inteId)) {
Gd2022Api1104 api1104 = new Gd2022Api1104();
BeanUtils.copyProperties(data, api1104);
changeObject(api1104);
- api1104.setZhgxsj(new Date());
+ api1104.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1104);
}
if (Constant.API_CODE_1105.equals(inteId)) {
Gd2022Api1105 api1105 = new Gd2022Api1105();
BeanUtils.copyProperties(data, api1105);
- api1105.setZhgxsj(new Date());
+ api1105.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1105);
}
if (Constant.API_CODE_1106.equals(inteId)) {
Api1106 api1106 = (Api1106) data;
- api1106.setZhgxsj(new Date());
+ api1106.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1106);
}
if (Constant.API_CODE_1107.equals(inteId)) {
Api1107 api1107 = (Api1107) data;
- api1107.setZhgxsj(new Date());
+ api1107.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1107);
}
if (Constant.API_CODE_1108.equals(inteId)) {
Api1108 api1108 = (Api1108) data;
- api1108.setZhgxsj(new Date());
+ api1108.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1108);
}
if (Constant.API_CODE_1109.equals(inteId)) {
@@ -365,12 +366,12 @@
System.out.println((String) responseDto.getData());
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
- api1109.setZhgxsj(new Date());
+ api1109.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1109);
}
if (Constant.API_CODE_1110.equals(inteId)) {
Api1110 api1110 = (Api1110) data;
- api1110.setZhgxsj(new Date());
+ api1110.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1110);
}
if (Constant.API_CODE_1111.equals(inteId)) {
@@ -384,52 +385,52 @@
if(null != api1101List && api1101List.size() > 0){
api1111.setDwmc(api1101List.get(0).getDwmc());
}
- api1111.setZhgxsj(new Date());
+ api1111.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1111);
}
if (Constant.API_CODE_1112.equals(inteId)) {
Api1112 api1112 = (Api1112) data;
- api1112.setZhgxsj(new Date());
+ api1112.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1112);
}
if (Constant.API_CODE_1113.equals(inteId)) {
Api1113 api1113 = (Api1113) data;
- api1113.setZhgxsj(new Date());
+ api1113.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1113);
}
if (Constant.API_CODE_1201.equals(inteId)) {
Api1201 apiData = (Api1201) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1202.equals(inteId)) {
Api1202 apiData = (Api1202) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1203.equals(inteId)) {
Api1203 apiData = (Api1203) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1204.equals(inteId)) {
Api1204 apiData = (Api1204) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1205.equals(inteId)) {
Api1205 apiData = (Api1205) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1206.equals(inteId)) {
Api1206 apiData = (Api1206) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1207.equals(inteId)) {
Api1207 apiData = (Api1207) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1208.equals(inteId)) {
@@ -446,13 +447,13 @@
}
if (Constant.API_CODE_1209.equals(inteId)) {
Api1209 apiData = (Api1209) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1210.equals(inteId)) {
Gd2022Api1210 api1210 = new Gd2022Api1210();
BeanUtils.copyProperties(data, api1210);
- api1210.setZhgxsj(new Date());
+ api1210.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1210);
}
if (Constant.API_CODE_1211.equals(inteId)) {
@@ -462,37 +463,37 @@
}
if (Constant.API_CODE_1212.equals(inteId)) {
Api1212 apiData = (Api1212) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1301.equals(inteId)) {
Api1301 apiData = (Api1301) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1302.equals(inteId)) {
Api1302 apiData = (Api1302) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1303.equals(inteId)) {
Api1303 apiData = (Api1303) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1304.equals(inteId)) {
Api1304 apiData = (Api1304) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1305.equals(inteId)) {
Api1305 apiData = (Api1305) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1306.equals(inteId)) {
Api1306 apiData = (Api1306) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1307.equals(inteId)) {
@@ -507,7 +508,7 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1307.getWjdz());
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
- api1307.setZhgxsj(new Date());
+ api1307.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1307);
}
if (Constant.API_CODE_1308.equals(inteId)) {
@@ -522,28 +523,28 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1308.getWjdz());
//璁剧疆涓婁紶鏂囦欢id
api1308.setFileStorageId((String) responseDto.getData());
- api1308.setZhgxsj(new Date());
+ api1308.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1308);
}
if (Constant.API_CODE_1309.equals(inteId)) {
Api1309 apiData = (Api1309) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1310.equals(inteId)) {
Gd2022Api1310 api1310 = new Gd2022Api1310();
BeanUtils.copyProperties(data, api1310);
- api1310.setZhgxsj(new Date());
+ api1310.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1310);
}
if (Constant.API_CODE_1401.equals(inteId)) {
Api1401 apiData = (Api1401) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1402.equals(inteId)) {
Api1402 apiData = (Api1402) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1403.equals(inteId)) {
@@ -564,7 +565,7 @@
if(null!= gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())){
lcsl += gd2022Api1404.getLhsl();
}
- gd2022Api1404.setZhgxsj(new Date());
+ gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
dtls.add(gd2022Api1404);
}
}
@@ -575,7 +576,7 @@
GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
//璁剧疆涓婁紶鏂囦欢id
api1403.setFileStorageId((String) responseDto.getData());
- api1403.setZhgxsj(new Date());
+ api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1403);
}
if (Constant.API_CODE_1404.equals(inteId)) {
@@ -584,7 +585,7 @@
}
if (Constant.API_CODE_1405.equals(inteId)) {
Api1405 apiData = (Api1405) data;
- apiData.setZhgxsj(new Date());
+ apiData.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(apiData);
}
return JSON.toJSONString(data);
@@ -600,7 +601,7 @@
gdFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("03");
gdFinanceDto.setCzbz(api1503.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
paddingData(gdFinanceDto, list, 2, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
@@ -652,7 +653,7 @@
gdFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("02");
gdFinanceDto.setCzbz(api1502.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
paddingData(gdFinanceDto, list, 2, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
@@ -705,7 +706,7 @@
gdFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
gdFinanceDto.setBbm("01");
gdFinanceDto.setCzbz(api1501.getCzbz());
- gdFinanceDto.setZhgxsj(DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
+ gdFinanceDto.setZhgxsj(DateFormatUtils.format(DateUtils.addSeconds(new Date(), -10), "yyyy-MM-dd HH:mm:ss"));
paddingData(gdFinanceDto, list, 1, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
paddingData(gdFinanceDto, list, 2, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
diff --git a/src/main/resources/application-pro5348.yml b/src/main/resources/application-pro5348.yml
new file mode 100644
index 0000000..fc074ea
--- /dev/null
+++ b/src/main/resources/application-pro5348.yml
@@ -0,0 +1,56 @@
+########################## 骞夸笢姹曞ご娼崡 ##########################
+server:
+ port: 8090
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: Fzzy@#$%5432..K
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: Fzzy@#$%5432..K
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 1
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5348
+ file-path: D:/IGDS-API/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3