调整实体

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOnlineRateServiceImpl.java

@@ -11,8 +11,8 @@ import com.njcn.dataProcess.api.DataOnlineRateFeignClient;
 import com.njcn.dataProcess.api.DataVFeignClient;
 import com.njcn.dataProcess.api.PqsCommunicateFeignClient;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
 import com.njcn.dataProcess.pojo.dto.PqsCommunicateDto;
-import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
 import com.njcn.dataProcess.util.TimeUtils;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.influx.deprecated.InfluxDBPublicParam;
@@ -49,10 +49,10 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
         List<LineDevGetDTO> devList = calculatedParam.getIdList();
 
         Map<String, List<LineDevGetDTO>> LineDevGetMap = devList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
-        List<RStatOnlineRateDto.Detail> list = new ArrayList<>();
+        List<DataOnlineRateDto.Detail> list = new ArrayList<>();
         if(ObjectUtil.isNotNull(calculatedParam.getType())){
             LineDevGetMap.forEach((key,value)->{
-                RStatOnlineRateDto.Detail onlineRateDpo = new RStatOnlineRateDto.Detail();
+                DataOnlineRateDto.Detail onlineRateDpo = new DataOnlineRateDto.Detail();
                 List<String> collect = value.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
                 lineParam.setLineId(collect);
                 Integer data = dataVFeignClient.getCountRawData(lineParam).getData();
@@ -76,10 +76,10 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
             });
             Date dateOut = DateUtil.parse(calculatedParam.getDataDate());
             for (PqsCommunicateDto pqsCommunicate : outCommunicateData) {
-                RStatOnlineRateDto.Detail onlineRateDpo = new RStatOnlineRateDto.Detail();
+                DataOnlineRateDto.Detail onlineRateDpo = new DataOnlineRateDto.Detail();
                 Date newDate = DateUtil.parse(pqsCommunicate.getTime());
                 lineParam.setLineId(Arrays.asList(pqsCommunicate.getDevId()));
-                RStatOnlineRateDto onLineRate = onLineMinute(newDate, dateOut, pqsCommunicate.getType(), lineParam);
+                DataOnlineRateDto onLineRate = onLineMinute(newDate, dateOut, pqsCommunicate.getType(), lineParam);
                 onlineRateDpo.setTimeId(calculatedParam.getDataDate());
                 onlineRateDpo.setDevIndex(pqsCommunicate.getDevId());
                 onlineRateDpo.setOnlineMin(onLineRate.getOnlineMin());
@@ -95,8 +95,8 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
     /**
      * new的时间和当前统计时间 不是/是 同一天
      */
-    private RStatOnlineRateDto onLineMinute(Date newDate, Date date, Integer type, LineCountEvaluateParam lineParam) {
+    private DataOnlineRateDto onLineMinute(Date newDate, Date date, Integer type, LineCountEvaluateParam lineParam) {
-        RStatOnlineRateDto onLineRate = new RStatOnlineRateDto();
+        DataOnlineRateDto onLineRate = new DataOnlineRateDto();
         Integer minute = 0;
         /*new的时间和当前统计时间是同一天*/
         if (DateUtil.isSameDay(newDate, date)) {

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

@@ -3,8 +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.DataOnlineRateFeignClientFallbackFactory;
-import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
+import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
-import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +19,6 @@ import java.util.List;
 public interface DataOnlineRateFeignClient {
 
     @PostMapping("/batchInsertion")
-    HttpResult<String> batchInsertion(@RequestBody List<RStatOnlineRateDto.Detail> dataIDTOList);
+    HttpResult<String> batchInsertion(@RequestBody List<DataOnlineRateDto.Detail> dataIDTOList);
 
 }

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

@@ -4,8 +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.DataOnlineRateFeignClient;
-import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
+import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
-import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
 import com.njcn.dataProcess.util.DataProcessingEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +37,7 @@ public class DataOnlineRateFeignClientFallbackFactory implements FallbackFactory
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new DataOnlineRateFeignClient() {
             @Override
-            public HttpResult<String> batchInsertion(List<RStatOnlineRateDto.Detail> dataIDTOList) {
+            public HttpResult<String> batchInsertion(List<DataOnlineRateDto.Detail> dataIDTOList) {
                 log.error("{}异常，降级处理，异常为：{}","批量插入数据",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -0,0 +1,35 @@
+package com.njcn.dataProcess.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 数据完整性日表
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-03-28
+ */
+@Data
+public class DataIntegrityDto {
+
+    private static final long serialVersionUID = 1L;
+
+    private String timeId;
+
+
+    private String lineIndex;
+
+    /**
+     * 应收数量
+     */
+    private Integer dueTime;
+
+    /**
+     * 实收数量
+     */
+    private Integer realTime;
+
+
+
+}

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @Date: 2025/3/10 11:28
  */
 @Data
-public class RStatOnlineRateDto {
+public class DataOnlineRateDto {
 
     private static final long serialVersionUID = 1L;
 
@@ -24,7 +24,7 @@ public class RStatOnlineRateDto {
     private Integer offlineMin;
 
     @Data
-    public static class Detail extends RStatOnlineRateDto{
+    public static class Detail extends DataOnlineRateDto{
         /**
          * 日期
          */

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

@@ -0,0 +1,51 @@
+package com.njcn.dataProcess.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
+import com.njcn.db.bo.BaseEntity;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.annotation.Transient;
+
+/**
+ * <p>
+ * 数据完整性日表
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-03-28
+ */
+@Data
+@TableName("r_stat_integrity_d")
+public class RStatIntegrityD {
+
+    private static final long serialVersionUID = 1L;
+
+    @MppMultiId
+    @TableField(value = "time_id")
+    private String timeId;
+
+    @MppMultiId
+    @TableField(value = "line_index")
+    private String lineIndex;
+
+    /**
+     * 应收数量
+     */
+    @TableField(value = "due_time")
+    private Integer dueTime;
+    /**
+     * 实收数量
+     */
+    @TableField(value = "real_time")
+    private Integer realTime;
+
+
+
+}

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

@@ -9,7 +9,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
-import com.njcn.dataProcess.service.ILimitRate;
+import com.njcn.dataProcess.service.IDataLimitRate;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,10 +34,10 @@ import java.util.List;
 public class DataLimitRateController extends BaseController {
 
     @QueryBean
-    private ILimitRate limitRateQuery;
+    private IDataLimitRate limitRateQuery;
 
     @InsertBean
-    private ILimitRate limitRateInsert;
+    private IDataLimitRate limitRateInsert;
 
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)

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

@@ -9,9 +9,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.dataProcess.annotation.InsertBean;
 import com.njcn.dataProcess.annotation.QueryBean;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
-import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
+import com.njcn.dataProcess.service.IDataLimitRateDetail;
-import com.njcn.dataProcess.service.ILimitRate;
-import com.njcn.dataProcess.service.ILimitRateDetail;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,10 +37,10 @@ import java.util.List;
 public class DataLimitRateDetailController extends BaseController {
 
     @QueryBean
-    private ILimitRateDetail limitRateDetailQuery;
+    private IDataLimitRateDetail limitRateDetailQuery;
 
     @InsertBean
-    private ILimitRateDetail limitRateDetailInsert;
+    private IDataLimitRateDetail limitRateDetailInsert;
 
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)

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

@@ -8,8 +8,8 @@ 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.pojo.dto.RStatOnlineRateDto;
+import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
-import com.njcn.dataProcess.service.IOnlineRate;
+import com.njcn.dataProcess.service.IDataOnlineRate;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,16 +37,16 @@ import java.util.List;
 public class DataOnlineRateController extends BaseController {
 
     @QueryBean
-    private IOnlineRate onlineRateQuery;
+    private IDataOnlineRate onlineRateQuery;
 
     @InsertBean
-    private IOnlineRate onlineRateInsert;
+    private IDataOnlineRate onlineRateInsert;
 
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
     @PostMapping("/batchInsertion")
     @ApiOperation("批量插入")
-    public HttpResult<String> batchInsertion(@RequestBody List<RStatOnlineRateDto.Detail> dataVDTOList) {
+    public HttpResult<String> batchInsertion(@RequestBody List<DataOnlineRateDto.Detail> dataVDTOList) {
         String methodDescribe = getMethodDescribe("batchInsertion");
         onlineRateInsert.batchInsertion(dataVDTOList);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/relation/mapper/RStatIntegrityDMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.dataProcess.dao.relation.mapper;
+
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
+
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/12 9:29
+ */
+public interface RStatIntegrityDMapper extends MppBaseMapper<RStatIntegrityD> {
+
+
+
+}

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

@@ -0,0 +1,23 @@
+package com.njcn.dataProcess.service;
+
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
+import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/12 9:32
+ */
+public interface IDataIntegrity extends IMppService<RStatIntegrityD>{
+
+    /**
+     * 批量插入数据
+     * @param onlineRateList
+     */
+    void batchInsertion(List<DataIntegrityDto> onlineRateList);
+
+}

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @Author: wr
  * @Date: 2025/3/6 10:22
  */
-public interface ILimitRate extends IMppService<RStatLimitRateD> {
+public interface IDataLimitRate extends IMppService<RStatLimitRateD> {
 
     /**
      * 批量插入数据

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

@@ -12,7 +12,7 @@ import java.util.List;
  * @Author: wr
  * @Date: 2025/3/6 10:22
  */
-public interface ILimitRateDetail extends IMppService<RStatLimitRateDetailD> {
+public interface IDataLimitRateDetail extends IMppService<RStatLimitRateDetailD> {
 
     /**
      * 批量插入数据

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

@@ -0,0 +1,24 @@
+package com.njcn.dataProcess.service;
+
+
+import com.github.jeffreyning.mybatisplus.service.IMppService;
+
+import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
+import com.njcn.dataProcess.pojo.po.RStatOnlineRateD;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/6 10:22
+ */
+public interface IDataOnlineRate extends IMppService<RStatOnlineRateD>{
+
+    /**
+     * 批量插入数据
+     * @param onlineRateList
+     */
+    void batchInsertion(List<DataOnlineRateDto.Detail> onlineRateList);
+
+}

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

@@ -1,27 +0,0 @@
-package com.njcn.dataProcess.service;
-
-
-import com.github.jeffreyning.mybatisplus.service.IMppService;
-import com.njcn.dataProcess.param.LineCountEvaluateParam;
-import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
-import com.njcn.dataProcess.pojo.dto.PqsCommunicateDto;
-import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
-import com.njcn.dataProcess.pojo.po.RStatLimitRateD;
-import com.njcn.dataProcess.pojo.po.RStatOnlineRateD;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author: wr
- * @Date: 2025/3/6 10:22
- */
-public interface IOnlineRate extends IMppService<RStatOnlineRateD>{
-
-    /**
-     * 批量插入数据
-     * @param onlineRateList
-     */
-    void batchInsertion(List<RStatOnlineRateDto.Detail> onlineRateList);
-
-}

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

@@ -0,0 +1,29 @@
+package com.njcn.dataProcess.service.impl.influxdb;
+
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.dataProcess.dao.relation.mapper.RStatIntegrityDMapper;
+import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
+import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
+import com.njcn.dataProcess.service.IDataIntegrity;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/6 10:22
+ */
+@Service("InfluxdbIntegrityImpl")
+@RequiredArgsConstructor
+public class InfluxdbIntegrityImpl extends MppServiceImpl<RStatIntegrityDMapper, RStatIntegrityD> implements IDataIntegrity {
+
+
+    @Override
+    public void batchInsertion(List<DataIntegrityDto> onlineRateList) {
+
+    }
+}

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

@@ -4,7 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateDetailRelationMapper;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
 import com.njcn.dataProcess.pojo.po.RStatLimitRateDetailD;
-import com.njcn.dataProcess.service.ILimitRateDetail;
+import com.njcn.dataProcess.service.IDataLimitRateDetail;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Service("InfluxdbLimitRateDetailImpl")
 @RequiredArgsConstructor
-public class InfluxdbLimitRateDetailImpl extends MppServiceImpl<RStatLimitRateDetailRelationMapper, RStatLimitRateDetailD> implements ILimitRateDetail {
+public class InfluxdbLimitRateDetailImpl 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/InfluxdbLimitRateImpl.java

@@ -4,7 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateRelationMapper;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
 import com.njcn.dataProcess.pojo.po.RStatLimitRateD;
-import com.njcn.dataProcess.service.ILimitRate;
+import com.njcn.dataProcess.service.IDataLimitRate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Service("InfluxdbLimitRateImpl")
 @RequiredArgsConstructor
-public class InfluxdbLimitRateImpl extends MppServiceImpl<RStatLimitRateRelationMapper, RStatLimitRateD> implements ILimitRate {
+public class InfluxdbLimitRateImpl 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/InfluxdbOnlineRateImpl.java

@@ -3,9 +3,9 @@ package com.njcn.dataProcess.service.impl.influxdb;
 
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatOnlineRateDMapper;
-import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
+import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
 import com.njcn.dataProcess.pojo.po.RStatOnlineRateD;
-import com.njcn.dataProcess.service.IOnlineRate;
+import com.njcn.dataProcess.service.IDataOnlineRate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -19,11 +19,11 @@ import java.util.List;
  */
 @Service("InfluxdbOnlineRateImpl")
 @RequiredArgsConstructor
-public class InfluxdbOnlineRateImpl extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateD> implements IOnlineRate {
+public class InfluxdbOnlineRateImpl extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateD> implements IDataOnlineRate {
 
 
     @Override
-    public void batchInsertion(List<RStatOnlineRateDto.Detail> onlineRateList) {
+    public void batchInsertion(List<DataOnlineRateDto.Detail> onlineRateList) {
 
     }
 }

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

@@ -0,0 +1,29 @@
+package com.njcn.dataProcess.service.impl.relation;
+
+
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.njcn.dataProcess.dao.relation.mapper.RStatIntegrityDMapper;
+import com.njcn.dataProcess.pojo.dto.DataIntegrityDto;
+import com.njcn.dataProcess.pojo.po.RStatIntegrityD;
+import com.njcn.dataProcess.service.IDataIntegrity;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2025/3/6 10:22
+ */
+@Service("RelationIntegrityImpl")
+@RequiredArgsConstructor
+public class RelationIntegrityImpl extends MppServiceImpl<RStatIntegrityDMapper, RStatIntegrityD> implements IDataIntegrity {
+
+
+    @Override
+    public void batchInsertion(List<DataIntegrityDto> onlineRateList) {
+
+    }
+}

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

@@ -4,7 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateDetailRelationMapper;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDetailDto;
 import com.njcn.dataProcess.pojo.po.RStatLimitRateDetailD;
-import com.njcn.dataProcess.service.ILimitRateDetail;
+import com.njcn.dataProcess.service.IDataLimitRateDetail;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Service("RelationLimitRateDetailImpl")
 @RequiredArgsConstructor
-public class RelationLimitRateDetailImpl extends MppServiceImpl<RStatLimitRateDetailRelationMapper, RStatLimitRateDetailD> implements ILimitRateDetail {
+public class RelationLimitRateDetailImpl extends MppServiceImpl<RStatLimitRateDetailRelationMapper, RStatLimitRateDetailD> implements IDataLimitRateDetail {
 
 
     @Override

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

@@ -4,7 +4,7 @@ import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatLimitRateRelationMapper;
 import com.njcn.dataProcess.pojo.dto.DataLimitRateDto;
 import com.njcn.dataProcess.pojo.po.RStatLimitRateD;
-import com.njcn.dataProcess.service.ILimitRate;
+import com.njcn.dataProcess.service.IDataLimitRate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -21,10 +21,10 @@ import java.util.List;
  */
 @Service("RelationLimitRateImpl")
 @RequiredArgsConstructor
-public class RelationLimitRateImpl extends MppServiceImpl<RStatLimitRateRelationMapper, RStatLimitRateD> implements ILimitRate {
+public class RelationLimitRateImpl extends MppServiceImpl<RStatLimitRateRelationMapper, RStatLimitRateD> implements IDataLimitRate {
 
     @Resource
-    private ILimitRate limitRate;
+    private IDataLimitRate limitRate;
 
     @Override
     public void batchInsertion(List<DataLimitRateDto> limitRateList) {

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

@@ -3,9 +3,9 @@ package com.njcn.dataProcess.service.impl.relation;
 
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.dataProcess.dao.relation.mapper.RStatOnlineRateDMapper;
-import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
+import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
 import com.njcn.dataProcess.pojo.po.RStatOnlineRateD;
-import com.njcn.dataProcess.service.IOnlineRate;
+import com.njcn.dataProcess.service.IDataOnlineRate;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -21,11 +21,11 @@ import java.util.List;
  */
 @Service("RelationOnlineRateImpl")
 @RequiredArgsConstructor
-public class RelationOnlineRateImpl  extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateD> implements IOnlineRate {
+public class RelationOnlineRateImpl  extends MppServiceImpl<RStatOnlineRateDMapper, RStatOnlineRateD> implements IDataOnlineRate {
 
 
     @Override
-    public void batchInsertion(List<RStatOnlineRateDto.Detail> onlineRateList) {
+    public void batchInsertion(List<DataOnlineRateDto.Detail> onlineRateList) {
         List<RStatOnlineRateD> result = new ArrayList<>();
         onlineRateList.forEach(item->{
             RStatOnlineRateD onlineRate = new RStatOnlineRateD();