From 88243f1c03b4d4cd8a95a6c4c88ee2a92289081b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=BD=E5=B4=BD?= <307957357@qq.com>
Date: Thu, 7 Aug 2025 11:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=A7=E8=B5=9B23=E5=B9=B4?=
=?UTF-8?q?=E4=B8=BA24=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/codeStyles/Project.xml | 7 ++
.idea/codeStyles/codeStyleConfig.xml | 5 ++
.idea/compiler.xml | 2 +
.idea/misc.xml | 3 +-
.../demo/controller/TSJBController.java | 4 +-
.../demo/controller/ZFJCController.java | 8 +--
.../demo/controller/ZHZSController.java | 8 +--
.../demo/service/impl/CjjcServiceImpl.java | 2 +-
.../demo/service/impl/ZhzsServiceImpl.java | 8 +--
src/main/resources/application-dev.yml | 67 ++++++++++++++++---
10 files changed, 88 insertions(+), 26 deletions(-)
create mode 100644 .idea/codeStyles/Project.xml
create mode 100644 .idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..919ce1f
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 46ffa79..b585113 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,12 +7,14 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 082388b..b88d68e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -16,7 +16,6 @@
-
-
+
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/controller/TSJBController.java b/src/main/java/com/example/demo/controller/TSJBController.java
index 11747c3..09628fc 100644
--- a/src/main/java/com/example/demo/controller/TSJBController.java
+++ b/src/main/java/com/example/demo/controller/TSJBController.java
@@ -177,8 +177,8 @@ public class TSJBController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
- String start = "2023/" + startMonth + "/1";
- String end = "2023/" + endMonth + "/31";
+ String start = "2024/" + startMonth + "/1";
+ String end = "2024/" + endMonth + "/31";
return tsjbDataService.getTouSuLvDaPingStreet(start, end, hj, szqx,street,littlemonth);
}
diff --git a/src/main/java/com/example/demo/controller/ZFJCController.java b/src/main/java/com/example/demo/controller/ZFJCController.java
index b328552..3cf6c9e 100644
--- a/src/main/java/com/example/demo/controller/ZFJCController.java
+++ b/src/main/java/com/example/demo/controller/ZFJCController.java
@@ -77,8 +77,8 @@ public class ZFJCController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
- String start = "2022/" + startMonth + "/1";
- String end = "2022/" + endMonth + "/31";
+ String start = "2024/" + startMonth + "/1";
+ String end = "2024/" + endMonth + "/31";
return zfjcDataService.getWenTiLvDaPing(hj, szqx, start, end);
}
@@ -106,8 +106,8 @@ public class ZFJCController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
- String start = "2023/" + startMonth + "/1";
- String end = "2023/" + endMonth + "/31";
+ String start = "2024/" + startMonth + "/1";
+ String end = "2024/" + endMonth + "/31";
return zfjcDataService.getWenTiLvDaPingStreetDasai(hj, szqx, start, end,street,littlemonth);
}
diff --git a/src/main/java/com/example/demo/controller/ZHZSController.java b/src/main/java/com/example/demo/controller/ZHZSController.java
index 24678ed..848e1fe 100644
--- a/src/main/java/com/example/demo/controller/ZHZSController.java
+++ b/src/main/java/com/example/demo/controller/ZHZSController.java
@@ -76,8 +76,8 @@ public class ZHZSController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
- String start = "2023/" + startMonth + "/1";
- String end = "2023/" + endMonth + "/31";
+ String start = "2024/" + startMonth + "/1";
+ String end = "2024/" + endMonth + "/31";
DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null;
LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, dateString) : null;
@@ -113,8 +113,8 @@ public class ZHZSController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用
- String start = "2022/" + startMonth + "/1";
- String end = "2022/" + endMonth + "/31";
+ String start = "2024/" + startMonth + "/1";
+ String end = "2024/" + endMonth + "/31";
DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null;
LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, dateString) : null;
diff --git a/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java b/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
index f3813c5..6c12740 100644
--- a/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
+++ b/src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
@@ -685,7 +685,7 @@ public class CjjcServiceImpl implements CjjcService {
@Override
public ZR> getTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street) {
- String year = "2023";
+ String year = "2024";
MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(year, month, month, TimeUtil.FORMAT_1);
LocalDate startDataTime = timeByMonth.getStartDataTime();
LocalDate endDataTime = timeByMonth.getEndDataTime();
diff --git a/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java b/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java
index e99ecab..d1013a1 100644
--- a/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java
+++ b/src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java
@@ -250,7 +250,7 @@ public class ZhzsServiceImpl implements ZhzsService {
public List getCountyMapScore(String hj, String szqx, LocalDate startTime, LocalDate endTime) {
//默认2023
- String year = "2023";
+ String year = "2024";
String month = startTime.getMonthValue() + "";
//信息追溯 hj
@@ -402,7 +402,7 @@ public class ZhzsServiceImpl implements ZhzsService {
public List getCountyMapScoreDasai(String hj, String szqx, LocalDate startTime, LocalDate endTime) {
//默认2023
- String year = "2022";
+ String year = "2024";
String month = startTime.getMonthValue() + "";
//信息追溯 hj
@@ -558,7 +558,7 @@ public class ZhzsServiceImpl implements ZhzsService {
}
//默认2023
- String year = "2023";
+ String year = "2024";
//信息追溯 hj
List xxzsVoJie = zcqyService.getScoreByStreetQuery(hj, szqx, endTime);
@@ -1134,7 +1134,7 @@ public class ZhzsServiceImpl implements ZhzsService {
for (String street : streetListInit) {
for (int month = 1; month <= 5; month++) {
String monthStr = month + "";
- String yearStr = 2023 + "";
+ String yearStr = 2024 + "";
MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(yearStr, monthStr, monthStr, TimeUtil.FORMAT_1);
this.setZhzsAllFenzi(timeByMonth.getStartDataTime(), timeByMonth.getEndDataTime(), monthStr, szqx, street, hj, now);
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 64a6fd7..ff96325 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -10,21 +10,70 @@ spring:
primary: db1
strict: false
datasource:
- db1:
- url: jdbc:dm://localhost:5236?clobAsString=true
- username: BL
- password: asd159159
- driver-class-name: dm.jdbc.driver.DmDriver
+
+ # 250623szk注释换下面两个db
+ # db1:
+ # url: jdbc:dm://localhost:5236?clobAsString=true
+ # username: BL
+ # password: asd159159
+ # driver-class-name: dm.jdbc.driver.DmDriver
+ # # db2:
+ # # url: jdbc:clickhouse://192.168.1.128:8123
+ # # username: default
+ # # password: ""
+ # # driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
# db2:
- # url: jdbc:clickhouse://192.168.1.128:8123
+ # url: jdbc:clickhouse://192.168.1.128:8124
# username: default
- # password: ""
+ # password: default
# driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
+
+
+ # db1:
+ # # url: jdbc:dm://localhost:5236?clobAsString=true
+ # url: jdbc:dm://192.168.0.165:5236?clobAsString=true
+ # username: BL
+ # # password: asd159159
+ # password: 123456
+ # driver-class-name: dm.jdbc.driver.DmDriver
+ # # db2:
+ # # url: jdbc:clickhouse://192.168.1.128:8123
+ # # username: default
+ # # password: ""
+ # # driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
+ # db2:
+ # # url: jdbc:clickhouse://192.168.1.128:8124
+ # url: jdbc:clickhouse://192.168.0.149:9888
+ # username: default
+ # # password: default
+ # password: ""
+ # driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
+
+ db1:
+ # url: jdbc:dm://localhost:5236?clobAsString=true
+ url: jdbc:dm://localhost:5236?clobAsString=true
+ # username: BL
+ username: SYSDBA
+ # password: asd159159
+ password: Admin@123
+ driver-class-name: dm.jdbc.driver.DmDriver
+ # db2:
+ # url: jdbc:clickhouse://192.168.1.128:8123
+ # username: default
+ # password: ""
+ # driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
db2:
- url: jdbc:clickhouse://192.168.1.128:8124
+ # url: jdbc:clickhouse://192.168.1.128:8124
+ # url: jdbc:clickhouse://127.0.0.1:8123
+ url: jdbc:clickhouse://192.168.0.151:9888
username: default
- password: default
+ # password: default
+ password: ""
driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
+
+
+
+
hikari:
connection-timeout: 120000
jackson: