Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

将终端台账拆分为pq&pms两类

Browse Source
This commit is contained in:
hongawen
2022-09-29 19:43:14 +08:00
parent 5385e7521b
commit ab8e86f257
530 changed files with 5060 additions and 1863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ClonePqsOnlineRateJob.java
View File

@@ -1,9 +1,8 @@
package com.njcn.executor.handler;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.device.api.LineFeignClient;
import com.njcn.device.pojo.dto.OnlineLineDTO;
import com.njcn.device.pojo.vo.AreaLineInfoVO;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.dto.OnlineLineDTO;
import com.njcn.energy.pojo.constant.ModelState;
import com.njcn.executor.pojo.vo.PqsCommunicateClone;
import com.njcn.executor.pojo.vo.PqsOnlineRate;

2
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/DayJob.java
View File

@@ -1,7 +1,7 @@
package com.njcn.executor.handler;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.device.api.LineFeignClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.executor.pojo.vo.*;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDbUtils;

2
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/EleIntegrityJob.java
View File

@@ -34,7 +34,7 @@ public class EleIntegrityJob {
private final Integer AIR_DATA_DUE = 288;
private final String DATABASE = "pqsbase";
private final String DATABASE = "PQSBASE";
private final InfluxDbUtils influxDbUtils;

2
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/EleOnlineRateJob.java
View File

@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
@AllArgsConstructor
public class EleOnlineRateJob {
private final String DATABASE = "pqsbase";
private final String DATABASE = "PQSBASE";
private final InfluxDbUtils influxDbUtils;

2
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/ElectricCalJob.java
View File

@@ -92,7 +92,7 @@ public class ElectricCalJob {
});
if (CollectionUtil.isNotEmpty(insertObj)) {
BatchPoints batchPoints = BatchPoints.database("pqsbase").build();
BatchPoints batchPoints = BatchPoints.database("PQSBASE").build();
for (Map<String, Object> it : insertObj) {
Point.Builder point = Point.measurement("power_data_add");
it.forEach((key, val) -> {

6
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitRateJob.java
View File

@@ -1,9 +1,9 @@
package com.njcn.executor.handler;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.device.api.LineFeignClient;
import com.njcn.device.pojo.dto.PollutionParamDTO;
import com.njcn.device.pojo.po.Overlimit;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.executor.pojo.vo.*;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDbUtils;

6
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/LimitTargetJob.java
View File

@@ -1,9 +1,9 @@
package com.njcn.executor.handler;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.device.api.LineFeignClient;
import com.njcn.device.pojo.dto.PollutionParamDTO;
import com.njcn.device.pojo.po.Overlimit;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.executor.pojo.vo.*;
import com.njcn.harmonic.pojo.po.LimitTarget;
import com.njcn.influxdb.param.InfluxDBPublicParam;

6
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PollutionJob.java
View File

@@ -1,7 +1,7 @@
package com.njcn.executor.handler;
import com.njcn.device.api.LineFeignClient;
import com.njcn.device.pojo.po.Overlimit;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.po.Overlimit;
import com.njcn.executor.pojo.dto.PollutionDTO;
import com.njcn.executor.pojo.vo.*;
import com.njcn.harmonic.pojo.dto.PublicDTO;
@@ -38,7 +38,7 @@ import java.util.stream.Stream;
@AllArgsConstructor
public class PollutionJob {
private final String DATABASE = "pqsbase";
private final String DATABASE = "PQSBASE";
private final InfluxDbUtils influxDbUtils;

4
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsIntegrityJob.java
View File

@@ -1,8 +1,8 @@
package com.njcn.executor.handler;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.device.api.LineFeignClient;
import com.njcn.device.pojo.po.LineDetail;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.executor.pojo.vo.*;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDbUtils;

2
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/PqsOnlineRateJob.java
View File

@@ -1,7 +1,7 @@
package com.njcn.executor.handler;
import com.njcn.common.pojo.constant.PatternRegex;
import com.njcn.device.api.LineFeignClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.energy.pojo.constant.ModelState;
import com.njcn.executor.pojo.vo.PqsCommunicate;
import com.njcn.executor.pojo.vo.PqsOnlineRate;

4
pqs-job/job-executor/src/main/resources/bootstrap.yml
View File

@@ -42,12 +42,12 @@ logging:
xxl:
job:
admin:
addresses: http://192.168.1.102:10217/job-admin
addresses: http://198.120.100.195:10217/job-admin
#执行器通讯TOKEN [选填]：非空时启用；
accessToken:
executor:
#执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册
appname: executorCdf
appname: xuyang
#执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。
address:
#执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"；

4
pqs-job/job-executor/src/test/java/Test1.java
View File

@@ -30,8 +30,8 @@ public class Test1 {
@Test
public void testMethod(){
InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "pqsbase", "");
SelectQueryImpl selectQuery = select().from("pqsbase","data_flicker").where(eq("fluc",0)).limit(1).tz("Asia/Shanghai");
InfluxDbUtils influxDBUtil = new InfluxDbUtils("admin", "njcnpqs", "http://192.168.1.18:8086", "PQSBASE", "");
SelectQueryImpl selectQuery = select().from("PQSBASE","data_flicker").where(eq("fluc",0)).limit(1).tz("Asia/Shanghai");
WhereQueryImpl<SelectQueryImpl> where = selectQuery.where();
QueryResult queryResult = influxDBUtil.query(selectQuery.getCommand());
InfluxDBResultMapper resultMapper = new InfluxDBResultMapper();