添加对外查询接口

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataLimitRateDetailFeignClient.java

@@ -3,6 +3,7 @@ package com.njcn.dataProcess.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.dataProcess.api.fallback.DataLimitRateDetailFeignClientFallbackFactory;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -22,4 +23,7 @@ public interface DataLimitRateDetailFeignClient {
     @PostMapping("/batchInsertion")
     HttpResult<String> batchInsertion(@RequestBody List<DataLimitRateDetailDto> dataIDTOList);
 
+    @PostMapping("/getRawData")
+    HttpResult<List<DataLimitRateDetailDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
+
 }

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataLimitRateDetailFeignClientFallbackFactory.java

@@ -4,6 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.dataProcess.api.DataLimitRateDetailFeignClient;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
@@ -43,6 +44,12 @@ public class DataLimitRateDetailFeignClientFallbackFactory implements FallbackFa
                 log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<DataLimitRateDetailDto>> getRawData(LineCountEvaluateParam lineParam) {
+                log.error("{}异常，降级处理，异常为：{}","获取基础数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/PqReasonableRangeDto.java

@@ -87,6 +87,16 @@ public class PqReasonableRangeDto implements Serializable {
      */
     private String remark;
 
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
     /**
      * 所属系统（pqs，govern）目前就这个两个系统
      */

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqReasonableRange.java

@@ -97,6 +97,16 @@ public class PqReasonableRange extends BaseEntity implements Serializable {
      */
     private String remark;
 
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
     /**
      * 所属系统（pqs，govern）目前就这个两个系统
      */

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataLimitRateDetailController.java

@@ -8,7 +8,9 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
+import com.njcn.dataProcess.pojo.dto.DataLimitTargetDto;
 import com.njcn.dataProcess.service.IDataLimitRateDetail;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -53,4 +55,14 @@ public class DataLimitRateDetailController extends BaseController {
     }
 
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getRawData")
+    @ApiOperation("获取原始数据")
+    public HttpResult<List<DataLimitRateDetailDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
+        String methodDescribe = getMethodDescribe("getRawData");
+        List<DataLimitRateDetailDto> rawData = limitRateDetailInsert.getRawData(lineParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rawData, methodDescribe);
+    }
+
+
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataLimitRateDetail.java

@@ -1,6 +1,7 @@
 package com.njcn.dataProcess.service;
 
 import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
 import com.njcn.dataProcess.pojo.po.RStatLimitRateDetailD;
 
@@ -19,4 +20,6 @@ public interface IDataLimitRateDetail extends IMppService<RStatLimitRateDetailD>
      * @param limitRateDetailList
      */
     void batchInsertion(List<DataLimitRateDetailDto> limitRateDetailList);
+
+    List<DataLimitRateDetailDto> getRawData(LineCountEvaluateParam lineParam);
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataLimitRateDetailImpl.java

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.service.impl.influxdb;
 
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateDetailRelationMapper;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
 import com.njcn.dataProcess.pojo.po.RStatLimitRateDetailD;
 import com.njcn.dataProcess.service.IDataLimitRateDetail;
@@ -23,4 +24,10 @@ public class InfluxdbDataLimitRateDetailImpl extends MppServiceImpl<RStatLimitRa
     public void batchInsertion(List<DataLimitRateDetailDto> limitRateList) {
 
     }
+
+    @Override
+    public List<DataLimitRateDetailDto> getRawData(LineCountEvaluateParam lineParam) {
+
+        return null;
+    }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java

@@ -1,8 +1,13 @@
 package com.njcn.dataProcess.service.impl.relation;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateDetailRelationMapper;
+import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
+import com.njcn.dataProcess.pojo.dto.DataQualifiedDetail;
+import com.njcn.dataProcess.pojo.po.RStatLimitQualifiedD;
 import com.njcn.dataProcess.pojo.po.RStatLimitRateDetailD;
 import com.njcn.dataProcess.service.IDataLimitRateDetail;
 import lombok.RequiredArgsConstructor;
@@ -33,4 +38,22 @@ public class RelationDataLimitRateDetailImpl extends MppServiceImpl<RStatLimitRa
         });
         this.saveOrUpdateBatchByMultiId(result);
     }
+
+    @Override
+    public List<DataLimitRateDetailDto> getRawData(LineCountEvaluateParam lineParam) {
+        List<DataLimitRateDetailDto> result = new ArrayList<>();
+        LambdaQueryWrapper<RStatLimitRateDetailD> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(CollUtil.isNotEmpty(lineParam.getLineId()),RStatLimitRateDetailD::getLineId,lineParam.getLineId())
+                .ge(RStatLimitRateDetailD::getTime,lineParam.getStartTime())
+                .le(RStatLimitRateDetailD::getTime,lineParam.getEndTime());
+
+        List<RStatLimitRateDetailD> list = this.list(lambdaQueryWrapper);
+
+        list.forEach(item->{
+            DataLimitRateDetailDto dto = new DataLimitRateDetailDto();
+            BeanUtils.copyProperties(item,dto);
+            result.add(dto);
+        });
+        return result;
+    }
 }