调整实体

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<String, List<DataPltDto>> 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<AbnormalData> list,String phasicType, String valueType, String time, Double value, float overLimitValue) {

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")

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<RStatIntegrityDMapper, RStatIntegrityD> implements IDataIntegrity {
+public class InfluxdbDataIntegrityImpl extends MppServiceImpl<RStatIntegrityDMapper, RStatIntegrityD> implements IDataIntegrity {
 
 
     @Override

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<RStatLimitRateDetailRelationMapper, RStatLimitRateDetailD> implements IDataLimitRateDetail {
+public class InfluxdbDataLimitRateDetailImpl extends MppServiceImpl<RStatLimitRateDetailRelationMapper, RStatLimitRateDetailD> implements IDataLimitRateDetail {
 
     @Override
     public void batchInsertion(List<DataLimitRateDetailDto> limitRateList) {

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<RStatLimitRateRelationMapper, RStatLimitRateD> implements IDataLimitRate {
+public class InfluxdbDataLimitRateImpl extends MppServiceImpl<RStatLimitRateRelationMapper, RStatLimitRateD> implements IDataLimitRate {
 
     @Override
     public void batchInsertion(List<DataLimitRateDto> limitRateList) {

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<RStatOnlineRateDMapper, RStatOnlineRateD> implements IDataOnlineRate {
+public class InfluxdbDataOnlineRateImpl extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateD> implements IDataOnlineRate {
 
 
     @Override

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<RStatIntegrityDMapper, RStatIntegrityD> implements IDataIntegrity {
+public class RelationDataIntegrityImpl extends MppServiceImpl<RStatIntegrityDMapper, RStatIntegrityD> implements IDataIntegrity {
 
 
     @Override

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<RStatLimitRateDetailRelationMapper, RStatLimitRateDetailD> implements IDataLimitRateDetail {
+public class RelationDataLimitRateDetailImpl extends MppServiceImpl<RStatLimitRateDetailRelationMapper, RStatLimitRateDetailD> implements IDataLimitRateDetail {
 
 
     @Override

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<RStatLimitRateRelationMapper, RStatLimitRateD> implements IDataLimitRate {
+public class RelationDataLimitRateImpl extends MppServiceImpl<RStatLimitRateRelationMapper, RStatLimitRateD> implements IDataLimitRate {
 
     @Resource
     private IDataLimitRate limitRate;

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<RStatOnlineRateDMapper, RStatOnlineRateD> implements IDataOnlineRate {
+public class RelationDataOnlineRateImpl  extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateD> implements IDataOnlineRate {
 
 
     @Override

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<Boolean> 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<Boolean> 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<Boolean> askRestartProcess(@RequestBody ProcessRebootMessage message){
         String methodDescribe = getMethodDescribe("recall");
         BaseMessage baseMessage = new BaseMessage();