From 9f085b4293671d235498a1a4ff2866737d44d33f Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 14 Dec 2023 09:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/harmonic/pojo/param/SendParam.java | 43 +++++++++++++++++++ .../ConverterdetailstatisticsController.java | 27 +++++++++++- .../send/PqTypicalSourceCreateController.java | 27 ++++++++++++ ...SubstationQualityStatisticsController.java | 28 ++++++++++++ .../ConverterdetailstatisticsPOService.java | 5 ++- .../send/PqTypicalSourceCreatePOService.java | 5 ++- .../SubstationQualityStatisticsPOService.java | 5 ++- ...onverterdetailstatisticsPOServiceImpl.java | 20 ++++++++- .../PqTypicalSourceCreatePOServiceImpl.java | 19 +++++++- ...stationQualityStatisticsPOServiceImpl.java | 22 +++++++++- 10 files changed, 194 insertions(+), 7 deletions(-) create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendParam.java diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendParam.java new file mode 100644 index 000000000..84e084d4b --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/SendParam.java @@ -0,0 +1,43 @@ +package com.njcn.harmonic.pojo.param; + +import com.njcn.common.pojo.constant.PatternRegex; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; + +/** + * Description: + * Date: 2023/12/13 15:53【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Data +public class SendParam { + @ApiModelProperty(name = "deptIndex", value = "部门索引", required = true) + @NotBlank(message = "部门索引不可为空") + private String deptIndex; + + @ApiModelProperty("开始时间") + @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") + private String searchBeginTime; + + @ApiModelProperty("结束时间") + @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") + private String searchEndTime; + @Data + public static class SendPageParam extends SendParam{ + @NotNull(message="当前页不能为空！") + @Min(value = 1, message = "当前页不能为0") + @ApiModelProperty(value = "当前页",name = "currentPage",dataType ="Integer",required = true) + private Integer currentPage; + /**显示条数*/ + @NotNull(message="显示条数不能为空！") + @ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true) + private Integer pageSize; + } +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java index ddfaea419..ae519a471 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/ConverterdetailstatisticsController.java @@ -1,9 +1,24 @@ package com.njcn.harmonic.controller.send; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.common.utils.LogUtil; +import com.njcn.harmonic.pojo.param.SendParam; +import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; +import com.njcn.harmonic.service.send.ConverterdetailstatisticsPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -22,6 +37,16 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class ConverterdetailstatisticsController extends BaseController { - + private final ConverterdetailstatisticsPOService converterdetailstatisticsPOService; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPage") + @ApiOperation("数据查询") + @ApiImplicitParam(name = "param", value = "实体参数", required = true) + public HttpResult> queryPage(@Validated @RequestBody SendParam.SendPageParam param) { + String methodDescribe = getMethodDescribe("queryPage"); + LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); + Page list = converterdetailstatisticsPOService.queryPage(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java index 60542147b..b873a0df7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/PqTypicalSourceCreateController.java @@ -1,9 +1,24 @@ package com.njcn.harmonic.controller.send; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.common.utils.LogUtil; +import com.njcn.harmonic.pojo.param.SendParam; +import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; +import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,4 +36,16 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "能质量典型源荷指标统计数据") @RequiredArgsConstructor public class PqTypicalSourceCreateController extends BaseController { + private final PqTypicalSourceCreatePOService pqTypicalSourceCreatePOService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPage") + @ApiOperation("数据查询") + @ApiImplicitParam(name = "param", value = "实体参数", required = true) + public HttpResult> queryPage(@Validated @RequestBody SendParam.SendPageParam param) { + String methodDescribe = getMethodDescribe("queryPage"); + LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); + Page list = pqTypicalSourceCreatePOService.queryPage(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java index 1cec5b9b1..70f4fad4e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/send/SubstationQualityStatisticsController.java @@ -1,9 +1,24 @@ package com.njcn.harmonic.controller.send; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.common.utils.LogUtil; +import com.njcn.harmonic.pojo.param.SendParam; +import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; +import com.njcn.harmonic.service.send.SubstationQualityStatisticsPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -25,5 +40,18 @@ import org.springframework.web.bind.annotation.RestController; public class SubstationQualityStatisticsController extends BaseController { + private final SubstationQualityStatisticsPOService substationQualityStatisticsPOService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/queryPage") + @ApiOperation("数据查询") + @ApiImplicitParam(name = "param", value = "实体参数", required = true) + public HttpResult> queryPage(@Validated @RequestBody SendParam.SendPageParam param) { + String methodDescribe = getMethodDescribe("queryPage"); + LogUtil.njcnDebug(log, "{}，实体参数：{}", methodDescribe, param); + Page list = substationQualityStatisticsPOService.queryPage(param); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterdetailstatisticsPOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterdetailstatisticsPOService.java index 88b88a2db..c2dc8f4c0 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterdetailstatisticsPOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/ConverterdetailstatisticsPOService.java @@ -1,6 +1,8 @@ package com.njcn.harmonic.service.send; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.harmonic.pojo.param.SendParam; import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; /** @@ -14,4 +16,5 @@ import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; public interface ConverterdetailstatisticsPOService extends IService{ - } + Page queryPage(SendParam.SendPageParam param); +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java index 0d75c2eb7..471561408 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/PqTypicalSourceCreatePOService.java @@ -1,6 +1,8 @@ package com.njcn.harmonic.service.send; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.harmonic.pojo.param.SendParam; import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; /** @@ -14,4 +16,5 @@ import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; public interface PqTypicalSourceCreatePOService extends IService{ - } + Page queryPage(SendParam.SendPageParam param); +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/SubstationQualityStatisticsPOService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/SubstationQualityStatisticsPOService.java index c9063cbac..1c7d25035 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/SubstationQualityStatisticsPOService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/SubstationQualityStatisticsPOService.java @@ -1,6 +1,8 @@ package com.njcn.harmonic.service.send; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.harmonic.pojo.param.SendParam; import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; /** @@ -14,4 +16,5 @@ import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; public interface SubstationQualityStatisticsPOService extends IService{ - } + Page queryPage(SendParam.SendPageParam param); +} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterdetailstatisticsPOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterdetailstatisticsPOServiceImpl.java index a75a093da..15ab8c324 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterdetailstatisticsPOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/ConverterdetailstatisticsPOServiceImpl.java @@ -1,12 +1,18 @@ package com.njcn.harmonic.service.send.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.harmonic.mapper.send.ConverterdetailstatisticsPOMapper; +import com.njcn.harmonic.pojo.param.SendParam; import com.njcn.harmonic.pojo.po.send.ConverterdetailstatisticsPO; import com.njcn.harmonic.service.send.ConverterdetailstatisticsPOService; -import com.njcn.prepare.harmonic.mapper.mysql.send.ConverterdetailstatisticsPOMapper; +import com.njcn.user.api.DeptFeignClient; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * * Description: @@ -19,5 +25,17 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class ConverterdetailstatisticsPOServiceImpl extends ServiceImpl implements ConverterdetailstatisticsPOService { + private final DeptFeignClient deptFeignClient; + @Override + public Page queryPage(SendParam.SendPageParam param) { + Page page = new Page<> (param.getCurrentPage ( ), param.getPageSize ( )); + List deptIds = deptFeignClient.getDepSonSelfCodetByCode(param.getDeptIndex()).getData(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().in(ConverterdetailstatisticsPO::getProvinceId,deptIds). + between(ConverterdetailstatisticsPO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()); + Page converterdetailstatisticsPOPage = this.getBaseMapper().selectPage(page, wrapper); + + return converterdetailstatisticsPOPage; + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java index c614cc32b..730a9465c 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/PqTypicalSourceCreatePOServiceImpl.java @@ -1,12 +1,18 @@ package com.njcn.harmonic.service.send.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.harmonic.mapper.send.PqTypicalSourceCreatePOMapper; +import com.njcn.harmonic.pojo.param.SendParam; import com.njcn.harmonic.pojo.po.send.PqTypicalSourceCreatePO; import com.njcn.harmonic.service.send.PqTypicalSourceCreatePOService; -import com.njcn.prepare.harmonic.mapper.mysql.send.PqTypicalSourceCreatePOMapper; +import com.njcn.user.api.DeptFeignClient; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * * Description: @@ -19,7 +25,18 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl implements PqTypicalSourceCreatePOService { + private final DeptFeignClient deptFeignClient; + @Override + public Page queryPage(SendParam.SendPageParam param) { + Page page = new Page<> (param.getCurrentPage ( ), param.getPageSize ( )); + List deptIds = deptFeignClient.getDepSonSelfCodetByCode(param.getDeptIndex()).getData(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().in(PqTypicalSourceCreatePO::getProvinceId,deptIds). + between(PqTypicalSourceCreatePO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()); + Page pqTypicalSourceCreatePOPage = this.getBaseMapper().selectPage(page, wrapper); + return pqTypicalSourceCreatePOPage; + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/SubstationQualityStatisticsPOServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/SubstationQualityStatisticsPOServiceImpl.java index c7a5f7a1f..9a5f4f32e 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/SubstationQualityStatisticsPOServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/send/impl/SubstationQualityStatisticsPOServiceImpl.java @@ -1,12 +1,18 @@ package com.njcn.harmonic.service.send.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.harmonic.mapper.send.SubstationQualityStatisticsPOMapper; +import com.njcn.harmonic.pojo.param.SendParam; import com.njcn.harmonic.pojo.po.send.SubstationQualityStatisticsPO; import com.njcn.harmonic.service.send.SubstationQualityStatisticsPOService; -import com.njcn.prepare.harmonic.mapper.mysql.send.SubstationQualityStatisticsPOMapper; +import com.njcn.user.api.DeptFeignClient; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * * Description: @@ -20,5 +26,19 @@ import org.springframework.stereotype.Service; public class SubstationQualityStatisticsPOServiceImpl extends ServiceImpl implements SubstationQualityStatisticsPOService { + private final DeptFeignClient deptFeignClient; + + @Override + public Page queryPage(SendParam.SendPageParam param) { + Page page = new Page<> (param.getCurrentPage ( ), param.getPageSize ( )); + + List deptIds = deptFeignClient.getDepSonSelfCodetByCode(param.getDeptIndex()).getData(); + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.lambda().in(SubstationQualityStatisticsPO::getProvinceId,deptIds). + between(SubstationQualityStatisticsPO::getStatisticalDate,param.getSearchBeginTime(),param.getSearchEndTime()); + Page substationQualityStatisticsPOPage = this.getBaseMapper().selectPage(page, wrapper); + + return substationQualityStatisticsPOPage; + } }