Jack/buliang
1
0
Fork 0
forked from zhuyuchen/buliang
Code Pull Requests Activity

更新大赛23年为24年

Browse Source
This commit is contained in:
崽崽 2025-08-07 11:10:20 +08:00
parent a721c3fb66
commit 88243f1c03
10 changed files with 88 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/codeStyles/Project.xml generated Normal file
View File

@ -0,0 +1,7 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<ScalaCodeStyleSettings>
<option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
</ScalaCodeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml generated Normal file
View File

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>

2
.idea/compiler.xml generated
View File

@ -7,12 +7,14 @@
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="buliang" />
<module name="buliangfanying" /> <module name="buliangfanying" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
</component> </component>
<component name="JavacSettings"> <component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE"> <option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="buliang" options="-parameters" />
<module name="buliangfanying" options="-parameters" /> <module name="buliangfanying" options="-parameters" />
</option> </option>
</component> </component>

3
.idea/misc.xml generated
View File

@ -16,7 +16,6 @@
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
</list> </list>
</option> </option>
<option name="workspaceImportForciblyTurnedOn" value="true" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project> </project>

4
src/main/java/com/example/demo/controller/TSJBController.java
View File

@ -177,8 +177,8 @@ public class TSJBController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month; String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month; String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用 //开始时间不用
String start = "2023/" + startMonth + "/1"; String start = "2024/" + startMonth + "/1";
String end = "2023/" + endMonth + "/31"; String end = "2024/" + endMonth + "/31";
return tsjbDataService.getTouSuLvDaPingStreet(start, end, hj, szqx,street,littlemonth); return tsjbDataService.getTouSuLvDaPingStreet(start, end, hj, szqx,street,littlemonth);
} }

8
src/main/java/com/example/demo/controller/ZFJCController.java
View File

@ -77,8 +77,8 @@ public class ZFJCController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month; String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month; String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用 //开始时间不用
String start = "2022/" + startMonth + "/1"; String start = "2024/" + startMonth + "/1";
String end = "2022/" + endMonth + "/31"; String end = "2024/" + endMonth + "/31";
return zfjcDataService.getWenTiLvDaPing(hj, szqx, start, end); return zfjcDataService.getWenTiLvDaPing(hj, szqx, start, end);
} }
@ -106,8 +106,8 @@ public class ZFJCController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month; String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month; String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用 //开始时间不用
String start = "2023/" + startMonth + "/1"; String start = "2024/" + startMonth + "/1";
String end = "2023/" + endMonth + "/31"; String end = "2024/" + endMonth + "/31";
return zfjcDataService.getWenTiLvDaPingStreetDasai(hj, szqx, start, end,street,littlemonth); return zfjcDataService.getWenTiLvDaPingStreetDasai(hj, szqx, start, end,street,littlemonth);
} }

8
src/main/java/com/example/demo/controller/ZHZSController.java
View File

@ -76,8 +76,8 @@ public class ZHZSController {
String startMonth = ObjectUtils.isEmpty(month) ? "1" : month; String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month; String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用 //开始时间不用
String start = "2023/" + startMonth + "/1"; String start = "2024/" + startMonth + "/1";
String end = "2023/" + endMonth + "/31"; String end = "2024/" + endMonth + "/31";
DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d"); DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null; LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null;
LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, 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 startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
String endMonth = ObjectUtils.isEmpty(month) ? "12" : month; String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
//开始时间不用 //开始时间不用
String start = "2022/" + startMonth + "/1"; String start = "2024/" + startMonth + "/1";
String end = "2022/" + endMonth + "/31"; String end = "2024/" + endMonth + "/31";
DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d"); DateTimeFormatter dateString = DateTimeFormatter.ofPattern("yyyy/M/d");
LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null; LocalDate startTime = !ObjectUtils.isEmpty(start) ? LocalDate.parse(start, dateString) : null;
LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, dateString) : null; LocalDate endTime = !ObjectUtils.isEmpty(end) ? LocalDate.parse(end, dateString) : null;

2
src/main/java/com/example/demo/service/impl/CjjcServiceImpl.java
View File

@ -685,7 +685,7 @@ public class CjjcServiceImpl implements CjjcService {
@Override @Override
public ZR<List<TongJiHeGeLv>> getTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street) { public ZR<List<TongJiHeGeLv>> 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); MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(year, month, month, TimeUtil.FORMAT_1);
LocalDate startDataTime = timeByMonth.getStartDataTime(); LocalDate startDataTime = timeByMonth.getStartDataTime();
LocalDate endDataTime = timeByMonth.getEndDataTime(); LocalDate endDataTime = timeByMonth.getEndDataTime();

8
src/main/java/com/example/demo/service/impl/ZhzsServiceImpl.java
View File

@ -250,7 +250,7 @@ public class ZhzsServiceImpl implements ZhzsService {
public List<DaPingScoreQX> getCountyMapScore(String hj, String szqx, LocalDate startTime, LocalDate endTime) { public List<DaPingScoreQX> getCountyMapScore(String hj, String szqx, LocalDate startTime, LocalDate endTime) {
//默认2023 //默认2023
String year = "2023"; String year = "2024";
String month = startTime.getMonthValue() + ""; String month = startTime.getMonthValue() + "";
//信息追溯 hj //信息追溯 hj
@ -402,7 +402,7 @@ public class ZhzsServiceImpl implements ZhzsService {
public List<DaPingScoreQX> getCountyMapScoreDasai(String hj, String szqx, LocalDate startTime, LocalDate endTime) { public List<DaPingScoreQX> getCountyMapScoreDasai(String hj, String szqx, LocalDate startTime, LocalDate endTime) {
//默认2023 //默认2023
String year = "2022"; String year = "2024";
String month = startTime.getMonthValue() + ""; String month = startTime.getMonthValue() + "";
//信息追溯 hj //信息追溯 hj
@ -558,7 +558,7 @@ public class ZhzsServiceImpl implements ZhzsService {
} }
//默认2023 //默认2023
String year = "2023"; String year = "2024";
//信息追溯 hj //信息追溯 hj
List<ZHZSVo> xxzsVoJie = zcqyService.getScoreByStreetQuery(hj, szqx, endTime); List<ZHZSVo> xxzsVoJie = zcqyService.getScoreByStreetQuery(hj, szqx, endTime);
@ -1134,7 +1134,7 @@ public class ZhzsServiceImpl implements ZhzsService {
for (String street : streetListInit) { for (String street : streetListInit) {
for (int month = 1; month <= 5; month++) { for (int month = 1; month <= 5; month++) {
String monthStr = month + ""; String monthStr = month + "";
String yearStr = 2023 + ""; String yearStr = 2024 + "";
MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(yearStr, monthStr, monthStr, TimeUtil.FORMAT_1); MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth(yearStr, monthStr, monthStr, TimeUtil.FORMAT_1);
this.setZhzsAllFenzi(timeByMonth.getStartDataTime(), timeByMonth.getEndDataTime(), monthStr, szqx, street, hj, now); this.setZhzsAllFenzi(timeByMonth.getStartDataTime(), timeByMonth.getEndDataTime(), monthStr, szqx, street, hj, now);
} }

57
src/main/resources/application-dev.yml
View File

@ -10,10 +10,52 @@ spring:
primary: db1 primary: db1
strict: false strict: false
datasource: datasource:
# 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:8124
# username: default
# 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: db1:
# url: jdbc:dm://localhost:5236?clobAsString=true
url: jdbc:dm://localhost:5236?clobAsString=true url: jdbc:dm://localhost:5236?clobAsString=true
username: BL # username: BL
password: asd159159 username: SYSDBA
# password: asd159159
password: Admin@123
driver-class-name: dm.jdbc.driver.DmDriver driver-class-name: dm.jdbc.driver.DmDriver
# db2: # db2:
# url: jdbc:clickhouse://192.168.1.128:8123 # url: jdbc:clickhouse://192.168.1.128:8123
@ -21,10 +63,17 @@ spring:
# password: "" # password: ""
# driver-class-name: com.clickhouse.jdbc.ClickHouseDriver # driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
db2: 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 username: default
password: default # password: default
password: ""
driver-class-name: com.clickhouse.jdbc.ClickHouseDriver driver-class-name: com.clickhouse.jdbc.ClickHouseDriver
hikari: hikari:
connection-timeout: 120000 connection-timeout: 120000
jackson: jackson: