From d2378fdd5c72e486d579d900f0d1ee1612e0662f Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 7 Mar 2025 10:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=20=E7=9B=91=E6=B5=8B=E7=82=B9=E7=A8=B3?= =?UTF-8?q?=E6=80=81=E6=8C=87=E6=A0=87=E8=B6=8A=E9=99=90=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/DataLimitRateFeignClient.java | 4 ++-- .../controller/DataLimitRateController.java | 17 +++-------------- .../dao/imapper/DataLimitRateMapper.java | 4 ++-- .../{ILimitRateService.java => ILimitRate.java} | 2 +- .../impl/influxdb/InfluxdbLimitRateImpl.java | 13 +++++-------- .../impl/relation/RelationLimitRateImpl.java | 17 +++++++---------- 6 files changed, 20 insertions(+), 37 deletions(-) rename data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/{ILimitRateService.java => ILimitRate.java} (85%) diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataLimitRateFeignClient.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataLimitRateFeignClient.java index 5148fdc..e51afae 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataLimitRateFeignClient.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataLimitRateFeignClient.java @@ -2,7 +2,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.DataIFeignClientFallbackFactory; +import com.njcn.dataProcess.api.fallback.DataLimitRateFeignClientFallbackFactory; import com.njcn.dataProcess.pojo.dto.DataLimitRateDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -15,7 +15,7 @@ import java.util.List; * @Author: wr * @Date: 2025/3/7 9:30 */ -@FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataLimitRate", fallbackFactory = DataIFeignClientFallbackFactory.class, contextId = "dataLimitRate") +@FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataLimitRate", fallbackFactory = DataLimitRateFeignClientFallbackFactory.class, contextId = "dataLimitRate") public interface DataLimitRateFeignClient { @PostMapping("/batchInsertion") diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataLimitRateController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataLimitRateController.java index 8415663..79024ed 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataLimitRateController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataLimitRateController.java @@ -8,28 +8,17 @@ 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.dto.DataVDTO; -import com.njcn.dataProcess.dto.DataVFiveItemDTO; -import com.njcn.dataProcess.param.LineCountEvaluateParam; -import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataLimitRateDto; -import com.njcn.dataProcess.pojo.dto.DataVCvtDto; -import com.njcn.dataProcess.pojo.dto.DataVDto; -import com.njcn.dataProcess.pojo.po.RStatLimitRateD; -import com.njcn.dataProcess.service.IDataV; -import com.njcn.dataProcess.service.ILimitRateService; +import com.njcn.dataProcess.service.ILimitRate; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; import java.util.List; -import java.util.Map; /** * @author hongawen @@ -45,10 +34,10 @@ import java.util.Map; public class DataLimitRateController extends BaseController { @QueryBean - private ILimitRateService limitRateQuery; + private ILimitRate limitRateQuery; @InsertBean - private ILimitRateService limitRateInsert; + private ILimitRate limitRateInsert; @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataLimitRateMapper.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataLimitRateMapper.java index e990b9b..79e5f68 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataLimitRateMapper.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataLimitRateMapper.java @@ -1,7 +1,7 @@ package com.njcn.dataProcess.dao.imapper; -import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.dataProcess.pojo.dto.DataLimitRateDto; +import com.njcn.influx.base.InfluxDbBaseMapper; /** @@ -10,7 +10,7 @@ import com.njcn.dataProcess.pojo.dto.DataLimitRateDto; *

* @author web2023 */ -public interface DataLimitRateMapper extends MppBaseMapper { +public interface DataLimitRateMapper extends InfluxDbBaseMapper { diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/ILimitRateService.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/ILimitRate.java similarity index 85% rename from data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/ILimitRateService.java rename to data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/ILimitRate.java index 5b6d9d6..c88bb54 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/ILimitRateService.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/ILimitRate.java @@ -12,7 +12,7 @@ import java.util.List; * @Author: wr * @Date: 2025/3/6 10:22 */ -public interface ILimitRateService extends IMppService { +public interface ILimitRate extends IMppService { /** * 批量插入数据 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/InfluxdbLimitRateImpl.java index 04e470d..fef8838 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/InfluxdbLimitRateImpl.java @@ -1,26 +1,23 @@ package com.njcn.dataProcess.service.impl.influxdb; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; -import com.njcn.dataProcess.dao.imapper.DataVMapper; 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.ILimitRateService; +import com.njcn.dataProcess.service.ILimitRate; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.List; /** - * Description: - * Date: 2024/11/18 14:33【需求编号】 - * - * @author clam - * @version V1.0.0 + * @Description: + * @Author: wr + * @Date: 2025/3/7 10:13 */ @Service("InfluxdbLimitRateImpl") @RequiredArgsConstructor -public class InfluxdbLimitRateImpl extends MppServiceImpl implements ILimitRateService { +public class InfluxdbLimitRateImpl extends MppServiceImpl implements ILimitRate { @Override public void batchInsertion(List limitRateList) { 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/RelationLimitRateImpl.java index 4a31158..d5f63b4 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/RelationLimitRateImpl.java @@ -3,11 +3,8 @@ package com.njcn.dataProcess.service.impl.relation; 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.RStatDataVD; import com.njcn.dataProcess.pojo.po.RStatLimitRateD; -import com.njcn.dataProcess.service.IDataV; -import com.njcn.dataProcess.service.ILimitRateService; -import com.njcn.dataProcess.util.TimeUtils; +import com.njcn.dataProcess.service.ILimitRate; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -18,16 +15,16 @@ import java.util.List; /** - * @author hongawen - * @version 1.0 - * @data 2024/11/7 11:02 + * @Description: + * @Author: wr + * @Date: 2025/3/7 10:13 */ @Service("RelationLimitRateImpl") @RequiredArgsConstructor -public class RelationLimitRateImpl extends MppServiceImpl implements ILimitRateService { +public class RelationLimitRateImpl extends MppServiceImpl implements ILimitRate { @Resource - private ILimitRateService limitRateService; + private ILimitRate limitRate; @Override public void batchInsertion(List limitRateList) { @@ -37,6 +34,6 @@ public class RelationLimitRateImpl extends MppServiceImpl