From 646b58a21b72a721d440676692f3152104c3fbdc Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 12 Mar 2025 13:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/line/IDataCrossingServiceImpl.java | 4 ++-- .../java/com/njcn/dataProcess/po/influx/PqsCommunicate.java | 2 +- ...xdbIntegrityImpl.java => InfluxdbDataIntegrityImpl.java} | 4 ++-- ...DetailImpl.java => InfluxdbDataLimitRateDetailImpl.java} | 4 ++-- ...xdbLimitRateImpl.java => InfluxdbDataLimitRateImpl.java} | 4 ++-- ...bOnlineRateImpl.java => InfluxdbDataOnlineRateImpl.java} | 4 ++-- ...ionIntegrityImpl.java => RelationDataIntegrityImpl.java} | 4 ++-- ...DetailImpl.java => RelationDataLimitRateDetailImpl.java} | 4 ++-- ...ionLimitRateImpl.java => RelationDataLimitRateImpl.java} | 4 ++-- ...nOnlineRateImpl.java => RelationDataOnlineRateImpl.java} | 4 ++-- .../java/com/njcn/message/produce/ProduceController.java | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/{InfluxdbIntegrityImpl.java => InfluxdbDataIntegrityImpl.java} (79%) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/{InfluxdbLimitRateDetailImpl.java => InfluxdbDataLimitRateDetailImpl.java} (76%) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/{InfluxdbLimitRateImpl.java => InfluxdbDataLimitRateImpl.java} (78%) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/{InfluxdbOnlineRateImpl.java => InfluxdbDataOnlineRateImpl.java} (79%) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/{RelationIntegrityImpl.java => RelationDataIntegrityImpl.java} (79%) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/{RelationLimitRateDetailImpl.java => RelationDataLimitRateDetailImpl.java} (84%) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/{RelationLimitRateImpl.java => RelationDataLimitRateImpl.java} (86%) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/{RelationOnlineRateImpl.java => RelationDataOnlineRateImpl.java} (85%) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java index f1a01a2..13ddbfb 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java @@ -184,7 +184,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { .collect(Collectors.groupingBy(DataVDto::getLineId)); /** - * 功能描述:获取influxDB -> data_plt -> 长时间闪变 -> 最大值(原始算法去掉了) + * 功能描述:获取influxDB -> data_plt -> 长时间闪变 -> 注(取最大值原始算法去掉了，现没有根据最大值比较) */ Map> dataPlt = dataFlickerAllTime.stream() .filter(x -> phase.contains(x.getPhasicType())) @@ -851,7 +851,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { if(CollUtil.isNotEmpty(info)){ return JSON.toJSONString(info); } - return null; + return ""; } private void addAbnormalData(List list,String phasicType, String valueType, String time, Double value, float overLimitValue) { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/PqsCommunicate.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/PqsCommunicate.java index 3a026f5..59dadc6 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/PqsCommunicate.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/PqsCommunicate.java @@ -27,7 +27,7 @@ public class PqsCommunicate { @JsonSerialize(using = InstantDateSerializer.class) private Instant time; - @Column(name = "id",tag = true) + @Column(name = "dev_id",tag = true) private String devId; @Column(name = "description") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbIntegrityImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIntegrityImpl.java similarity index 79% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbIntegrityImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIntegrityImpl.java index 2582346..b069a70 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbIntegrityImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIntegrityImpl.java @@ -17,9 +17,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/6 10:22 */ -@Service("InfluxdbIntegrityImpl") +@Service("InfluxdbDataIntegrityImpl") @RequiredArgsConstructor -public class InfluxdbIntegrityImpl extends MppServiceImpl implements IDataIntegrity { +public class InfluxdbDataIntegrityImpl extends MppServiceImpl implements IDataIntegrity { @Override diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbLimitRateDetailImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitRateDetailImpl.java similarity index 76% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbLimitRateDetailImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitRateDetailImpl.java index 62bdf65..837a586 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbLimitRateDetailImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitRateDetailImpl.java @@ -15,9 +15,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/7 10:13 */ -@Service("InfluxdbLimitRateDetailImpl") +@Service("InfluxdbDataLimitRateDetailImpl") @RequiredArgsConstructor -public class InfluxdbLimitRateDetailImpl extends MppServiceImpl implements IDataLimitRateDetail { +public class InfluxdbDataLimitRateDetailImpl extends MppServiceImpl implements IDataLimitRateDetail { @Override public void batchInsertion(List limitRateList) { diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbLimitRateImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitRateImpl.java similarity index 78% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbLimitRateImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitRateImpl.java index 97a2c21..1ffcb01 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbLimitRateImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitRateImpl.java @@ -15,9 +15,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/7 10:13 */ -@Service("InfluxdbLimitRateImpl") +@Service("InfluxdbDataLimitRateImpl") @RequiredArgsConstructor -public class InfluxdbLimitRateImpl extends MppServiceImpl implements IDataLimitRate { +public class InfluxdbDataLimitRateImpl extends MppServiceImpl implements IDataLimitRate { @Override public void batchInsertion(List limitRateList) { diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbOnlineRateImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataOnlineRateImpl.java similarity index 79% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbOnlineRateImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataOnlineRateImpl.java index 077678f..893a1da 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbOnlineRateImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataOnlineRateImpl.java @@ -17,9 +17,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/6 10:22 */ -@Service("InfluxdbOnlineRateImpl") +@Service("InfluxdbDataOnlineRateImpl") @RequiredArgsConstructor -public class InfluxdbOnlineRateImpl extends MppServiceImpl implements IDataOnlineRate { +public class InfluxdbDataOnlineRateImpl extends MppServiceImpl implements IDataOnlineRate { @Override diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationIntegrityImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIntegrityImpl.java similarity index 79% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationIntegrityImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIntegrityImpl.java index ed999d8..ca7cfc6 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationIntegrityImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIntegrityImpl.java @@ -17,9 +17,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/6 10:22 */ -@Service("RelationIntegrityImpl") +@Service("RelationDataIntegrityImpl") @RequiredArgsConstructor -public class RelationIntegrityImpl extends MppServiceImpl implements IDataIntegrity { +public class RelationDataIntegrityImpl extends MppServiceImpl implements IDataIntegrity { @Override diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationLimitRateDetailImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java similarity index 84% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationLimitRateDetailImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java index efdd3b2..b47bae3 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationLimitRateDetailImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java @@ -18,9 +18,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/7 10:13 */ -@Service("RelationLimitRateDetailImpl") +@Service("RelationDataLimitRateDetailImpl") @RequiredArgsConstructor -public class RelationLimitRateDetailImpl extends MppServiceImpl implements IDataLimitRateDetail { +public class RelationDataLimitRateDetailImpl extends MppServiceImpl implements IDataLimitRateDetail { @Override diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationLimitRateImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateImpl.java similarity index 86% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationLimitRateImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateImpl.java index 7ba8bfe..1a79731 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationLimitRateImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateImpl.java @@ -19,9 +19,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/7 10:13 */ -@Service("RelationLimitRateImpl") +@Service("RelationDataLimitRateImpl") @RequiredArgsConstructor -public class RelationLimitRateImpl extends MppServiceImpl implements IDataLimitRate { +public class RelationDataLimitRateImpl extends MppServiceImpl implements IDataLimitRate { @Resource private IDataLimitRate limitRate; diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationOnlineRateImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataOnlineRateImpl.java similarity index 85% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationOnlineRateImpl.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataOnlineRateImpl.java index fecc36e..21f3388 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationOnlineRateImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataOnlineRateImpl.java @@ -19,9 +19,9 @@ import java.util.List; * @Author: wr * @Date: 2025/3/6 10:22 */ -@Service("RelationOnlineRateImpl") +@Service("RelationDataOnlineRateImpl") @RequiredArgsConstructor -public class RelationOnlineRateImpl extends MppServiceImpl implements IDataOnlineRate { +public class RelationDataOnlineRateImpl extends MppServiceImpl implements IDataOnlineRate { @Override diff --git a/message/message-boot/src/main/java/com/njcn/message/produce/ProduceController.java b/message/message-boot/src/main/java/com/njcn/message/produce/ProduceController.java index 5394092..a3e2139 100644 --- a/message/message-boot/src/main/java/com/njcn/message/produce/ProduceController.java +++ b/message/message-boot/src/main/java/com/njcn/message/produce/ProduceController.java @@ -43,7 +43,7 @@ public class ProduceController extends BaseController { @PostMapping("/recall") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("数据补招消息推送") - @ApiImplicitParam(name = "param", value = "参数", required = true) + @ApiImplicitParam(name = "message", value = "参数", required = true) public HttpResult recall(@RequestBody RecallMessage message){ String methodDescribe = getMethodDescribe("recall"); BaseMessage baseMessage = new BaseMessage(); @@ -55,7 +55,7 @@ public class ProduceController extends BaseController { @PostMapping("/askRestartDevice") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("请求前置重启进程消息推送") - @ApiImplicitParam(name = "param", value = "参数", required = true) + @ApiImplicitParam(name = "message", value = "参数", required = true) public HttpResult askRestartDevice(@RequestBody DeviceRebootMessage message){ String methodDescribe = getMethodDescribe("recall"); BaseMessage baseMessage = new BaseMessage(); @@ -67,7 +67,7 @@ public class ProduceController extends BaseController { @PostMapping("/askRestartProcess") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("请求前置重启设备消息推送") - @ApiImplicitParam(name = "param", value = "参数", required = true) + @ApiImplicitParam(name = "message", value = "参数", required = true) public HttpResult askRestartProcess(@RequestBody ProcessRebootMessage message){ String methodDescribe = getMethodDescribe("recall"); BaseMessage baseMessage = new BaseMessage();