1.调整暂态算法

This commit is contained in:
wr
2025-12-11 14:56:14 +08:00
parent 5afb860467
commit b0972ba896
5 changed files with 549 additions and 502 deletions

View File

@@ -58,7 +58,7 @@ liteflow:
logging: logging:
config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
level: level:
root: root: error
#mybatis配置信息 #mybatis配置信息
@@ -66,7 +66,7 @@ mybatis-plus:
#别名扫描 #别名扫描
type-aliases-package: com.njcn.harmonic.pojo type-aliases-package: com.njcn.harmonic.pojo
line: line:
num: 20 num: 10
mqtt: mqtt:
client-id: @artifactId@${random.value} client-id: @artifactId@${random.value}

View File

@@ -82,14 +82,14 @@ public class MigrationInfluxDBController {
long betweenDay = LocalDateTimeUtil.between(startDate, endDate, ChronoUnit.HOURS); long betweenDay = LocalDateTimeUtil.between(startDate, endDate, ChronoUnit.HOURS);
param.setStartTime(startDate.format(dateTimeFormatter)); param.setStartTime(startDate.format(dateTimeFormatter));
param.setEndTime(startDate.with(LocalTime.of(startDate.getHour(), 59, 59)).format(dateTimeFormatter)); param.setEndTime(startDate.with(LocalTime.of(startDate.getHour(), 59, 59)).format(dateTimeFormatter));
migrationService.hourseLineEventBacthSysc(param); migrationService.hourseDevDataBacthSysc(param);
for (int i = 0; i <betweenDay; i++) { for (int i = 0; i <betweenDay; i++) {
LineCountEvaluateParam countEvaluateParam=new LineCountEvaluateParam(); LineCountEvaluateParam countEvaluateParam=new LineCountEvaluateParam();
countEvaluateParam.setIsManual(true); countEvaluateParam.setIsManual(true);
startDate = LocalDateTimeUtil.offset(startDate, 1, ChronoUnit.HOURS); startDate = LocalDateTimeUtil.offset(startDate, 1, ChronoUnit.HOURS);
countEvaluateParam.setStartTime(startDate.format(dateTimeFormatter)); countEvaluateParam.setStartTime(startDate.format(dateTimeFormatter));
countEvaluateParam.setEndTime(startDate.with(LocalTime.of(startDate.getHour(), 59, 59)).format(dateTimeFormatter)); countEvaluateParam.setEndTime(startDate.with(LocalTime.of(startDate.getHour(), 59, 59)).format(dateTimeFormatter));
migrationService.hourseLineEventBacthSysc(countEvaluateParam); migrationService.hourseDevDataBacthSysc(countEvaluateParam);
} }
} catch (Exception exception) { } catch (Exception exception) {
exception.printStackTrace(); exception.printStackTrace();

View File

@@ -98,7 +98,7 @@ public class BaseJunitTest {
lineParam.setStartTime("2025-04-23 00:00:00"); lineParam.setStartTime("2025-04-23 00:00:00");
lineParam.setEndTime("2025-04-23 23:59:00"); lineParam.setEndTime("2025-04-23 23:59:00");
lineParam.setIsManual(true); lineParam.setIsManual(true);
migrationService.hourseLineDataBacthSysc(lineParam); // migrationService.hourseLineDataBacthSysc(lineParam);
System.out.println(""); System.out.println("");

45
pom.xml
View File

@@ -33,11 +33,46 @@
<properties> <properties>
<!--内网--> <!--内网-->
<middle.server.url>192.168.1.22</middle.server.url> <!-- <middle.server.url>192.168.1.22</middle.server.url>-->
<service.server.url>192.168.1.121</service.server.url> <!-- <service.server.url>192.168.1.121</service.server.url>-->
<docker.server.url>192.168.1.22</docker.server.url> <!-- <docker.server.url>192.168.1.22</docker.server.url>-->
<nacos.url>${middle.server.url}:18848</nacos.url> <!-- <nacos.url>${middle.server.url}:18848</nacos.url>-->
<nacos.namespace>07ec981d-1377-4920-8760-b5a98ff7e668</nacos.namespace> <!-- <nacos.namespace>07ec981d-1377-4920-8760-b5a98ff7e668</nacos.namespace>-->
<!-- <middle.server.url>192.168.21.129</middle.server.url>-->
<!-- <service.server.url>192.168.21.1</service.server.url>-->
<!-- <docker.server.url>192.168.1.22</docker.server.url>-->
<!-- <nacos.url>${middle.server.url}:18848</nacos.url>-->
<!-- <nacos.namespace>0c19477c-444e-413c-9782-e6ebc2eedac1</nacos.namespace>-->
<!-- <middle.server.url>127.0.0.1</middle.server.url>-->
<!-- &lt;!&ndash;微服务模块发布地址&ndash;&gt;-->
<!-- <service.server.url>127.0.0.1</service.server.url>-->
<!-- &lt;!&ndash;docker仓库地址&ndash;&gt;-->
<!-- <docker.server.url>127.0.0.1</docker.server.url>-->
<!-- &lt;!&ndash;nacos的ip:port&ndash;&gt;-->
<!-- <nacos.url>${middle.server.url}:8848</nacos.url>-->
<!-- <nacos.namespace>37a0e99f-eb96-4d2f-9b47-75bffa765827</nacos.namespace>-->
<!-- <middle.server.url>24.43.102.139</middle.server.url>-->
<!-- <service.server.url>24.43.102.139</service.server.url>-->
<!-- <docker.server.url>24.43.102.139</docker.server.url>-->
<!-- <nacos.url>${middle.server.url}:18848</nacos.url>-->
<!-- <nacos.namespace></nacos.namespace>-->
<middle.server.url>127.0.0.1</middle.server.url>
<service.server.url>127.0.0.1</service.server.url>
<docker.server.url>127.0.0.1</docker.server.url>
<nacos.url>${middle.server.url}:8848</nacos.url>
<nacos.namespace>37a0e99f-eb96-4d2f-9b47-75bffa765827</nacos.namespace>
<!-- <middle.server.url>192.168.21.129</middle.server.url>-->
<!-- &lt;!&ndash;微服务模块发布地址&ndash;&gt;-->
<!-- <service.server.url>192.168.21.1</service.server.url>-->
<!-- &lt;!&ndash;docker仓库地址&ndash;&gt;-->
<!-- <docker.server.url>192.168.1.22</docker.server.url>-->
<!-- <nacos.url>${middle.server.url}:18848</nacos.url>-->
<!-- <nacos.namespace>0c19477c-444e-413c-9782-e6ebc2eedac1</nacos.namespace>-->
<!--sentinel:port--> <!--sentinel:port-->
<sentinel.url>${middle.server.url}:8080</sentinel.url> <sentinel.url>${middle.server.url}:8080</sentinel.url>
<!--网关地址主要用于配置swagger中认证token--> <!--网关地址主要用于配置swagger中认证token-->