From a75fe35c77672436f81f480c4cdf7184c522cf17 Mon Sep 17 00:00:00 2001 From: xiachao Date: Tue, 13 Aug 2024 16:29:09 +0800 Subject: [PATCH] =?UTF-8?q?CQC=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=BE=97=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pub/controller/PubCockpitController.java | 10 ++++++- .../carbon/pub/dto/CockpitStatisticsDto.java | 20 +++++++++++++ .../CqcCarbonConsumablesController.java | 29 +++++++++++-------- .../CqcCarbonDiscardController.java | 18 +++++++++--- .../impl/CqcCarbonDiscardServiceImpl.java | 6 +++- .../CqcCarbonDistributionController.java | 29 +++++++++++-------- .../controller/CqcCarbonEnergyController.java | 29 +++++++++++-------- .../controller/CqcCarbonMakeController.java | 29 +++++++++++-------- .../controller/CqcCarbonRawController.java | 29 +++++++++++-------- 9 files changed, 133 insertions(+), 66 deletions(-) create mode 100644 modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CockpitStatisticsDto.java diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/PubCockpitController.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/PubCockpitController.java index 3203954..12ac3b6 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/PubCockpitController.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/controller/PubCockpitController.java @@ -30,7 +30,7 @@ public class PubCockpitController { private PubCockpitService pubCockpitService; @GetMapping("list") - @Operation(summary="分页") + @Operation(summary="左上角和地图得企业列表") public Result> list(){ List list = pubCockpitService.cockpitEnterpriseInfoList(); return new Result>().ok(list); @@ -38,4 +38,12 @@ public class PubCockpitController { + @GetMapping("statistics") + @Operation(summary="中间六个统计") + public Result> statistics(){ + List list = pubCockpitService.cockpitEnterpriseInfoList(); + return new Result>().ok(list); + } + + } diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CockpitStatisticsDto.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CockpitStatisticsDto.java new file mode 100644 index 0000000..e081d10 --- /dev/null +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/dto/CockpitStatisticsDto.java @@ -0,0 +1,20 @@ +package com.thing.carbon.pub.dto; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * 国网侧驾驶舱中间六个统计信息 + */ +@Data +@Schema(description = "国网侧驾驶舱中间六个统计信息") +public class CockpitStatisticsDto { + + + + + + + +} diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java index a9bedf3..cb8e324 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonConsumables/controller/CqcCarbonConsumablesController.java @@ -1,15 +1,19 @@ package com.thing.cqc.cqcCarbonConsumables.controller; import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.cqc.cqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; import com.thing.cqc.cqcCarbonConsumables.service.CqcCarbonConsumablesService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -31,18 +35,19 @@ public class CqcCarbonConsumablesController { private final CqcCarbonConsumablesService cqcCarbonConsumablesService; -// @GetMapping("page") -// @Operation(summary="分页") -// @Parameters({ -// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , -// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , -// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , -// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") -// }) -// public Result> page(@Parameter(hidden = true) @RequestParam Map params){ -// PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class); -// return new Result>().ok(page); -// } + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"), + @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class); + return new Result>().ok(page); + } @GetMapping("list/{applyNo}") @Operation(summary="信息") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java index baed0c3..89d367d 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/controller/CqcCarbonDiscardController.java @@ -11,6 +11,7 @@ import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.cqc.cqcCarbonDiscard.dto.CqcCarbonDiscardDTO; import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService; +import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -18,6 +19,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; /** @@ -37,16 +39,24 @@ public class CqcCarbonDiscardController { @GetMapping("page") @Operation(summary="分页") @Parameters({ - @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , - @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , - @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , - @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"), + @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ PageData page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class); return new Result>().ok(page); } + @GetMapping("list/{applyNo}") + @Operation(summary="信息") + public Result> list(@PathVariable("applyNo") String applyNo){ + List datas = cqcCarbonDiscardService.listAs(Map.of("applyNo",applyNo), CqcCarbonDiscardDTO.class); + return new Result >().ok(datas); + } + @GetMapping("{id}") @Operation(summary="信息") public Result get(@PathVariable("id") Long id){ diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java index bd85ec7..66873a3 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDiscard/service/impl/CqcCarbonDiscardServiceImpl.java @@ -2,9 +2,11 @@ package com.thing.cqc.cqcCarbonDiscard.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.cqcCarbonDiscard.mapper.CqcCarbonDiscardMapper; import com.thing.cqc.cqcCarbonDiscard.entity.CqcCarbonDiscardEntity; +import com.thing.cqc.cqcCarbonDiscard.mapper.CqcCarbonDiscardMapper; import com.thing.cqc.cqcCarbonDiscard.service.CqcCarbonDiscardService; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.Map; @@ -21,6 +23,8 @@ public class CqcCarbonDiscardServiceImpl extends BaseServiceImpl params){ QueryWrapper wrapper = new QueryWrapper(); + String applyNo = MapUtils.getString(params,"applyNo"); + wrapper.eq(CqcCarbonDiscardEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo)); return wrapper; } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java index ed81e9e..4901e9b 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonDistribution/controller/CqcCarbonDistributionController.java @@ -1,6 +1,7 @@ package com.thing.cqc.cqcCarbonDistribution.controller; import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; @@ -9,7 +10,10 @@ import com.thing.common.core.validator.group.UpdateGroup; import com.thing.common.core.web.response.Result; import com.thing.cqc.cqcCarbonDistribution.dto.CqcCarbonDistributionDTO; import com.thing.cqc.cqcCarbonDistribution.service.CqcCarbonDistributionService; +import com.thing.common.core.web.response.PageData; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -31,18 +35,19 @@ public class CqcCarbonDistributionController { private final CqcCarbonDistributionService cqcCarbonDistributionService; -// @GetMapping("page") -// @Operation(summary="分页") -// @Parameters({ -// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , -// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , -// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , -// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") -// }) -// public Result> page(@Parameter(hidden = true) @RequestParam Map params){ -// PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class); -// return new Result>().ok(page); -// } + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"), + @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class); + return new Result>().ok(page); + } @GetMapping("list/{applyNo}") @Operation(summary="信息") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java index b8b993b..68d9519 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonEnergy/controller/CqcCarbonEnergyController.java @@ -1,16 +1,20 @@ package com.thing.cqc.cqcCarbonEnergy.controller; import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.cqc.cqcCarbonEnergy.dto.CqcCarbonEnergyDTO; import com.thing.cqc.cqcCarbonEnergy.service.CqcCarbonEnergyService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -32,18 +36,19 @@ public class CqcCarbonEnergyController { private final CqcCarbonEnergyService cqcCarbonEnergyService; -// @GetMapping("page") -// @Operation(summary="分页") -// @Parameters({ -// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , -// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , -// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , -// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") -// }) -// public Result> page(@Parameter(hidden = true) @RequestParam Map params){ -// PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class); -// return new Result>().ok(page); -// } + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"), + @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class); + return new Result>().ok(page); + } @GetMapping("list/{applyNo}") @Operation(summary="信息") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java index 27627a8..486b612 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonMake/controller/CqcCarbonMakeController.java @@ -1,16 +1,20 @@ package com.thing.cqc.cqcCarbonMake.controller; import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.cqc.cqcCarbonMake.dto.CqcCarbonMakeDTO; import com.thing.cqc.cqcCarbonMake.service.CqcCarbonMakeService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -32,18 +36,19 @@ public class CqcCarbonMakeController { private final CqcCarbonMakeService cqcCarbonMakeService; -// @GetMapping("page") -// @Operation(summary="分页") -// @Parameters({ -// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , -// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , -// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , -// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") -// }) -// public Result> page(@Parameter(hidden = true) @RequestParam Map params){ -// PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class); -// return new Result>().ok(page); -// } + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"), + @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class); + return new Result>().ok(page); + } @GetMapping("list/{applyNo}") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java index 9fd8640..0976a22 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonRaw/controller/CqcCarbonRawController.java @@ -1,15 +1,19 @@ package com.thing.cqc.cqcCarbonRaw.controller; import com.thing.common.core.annotation.LogOperation; +import com.thing.common.core.constants.Constant; import com.thing.common.core.validator.AssertUtils; import com.thing.common.core.validator.ValidatorUtils; import com.thing.common.core.validator.group.AddGroup; import com.thing.common.core.validator.group.DefaultGroup; import com.thing.common.core.validator.group.UpdateGroup; +import com.thing.common.core.web.response.PageData; import com.thing.common.core.web.response.Result; import com.thing.cqc.cqcCarbonRaw.dto.CqcCarbonRawDTO; import com.thing.cqc.cqcCarbonRaw.service.CqcCarbonRawService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -31,18 +35,19 @@ public class CqcCarbonRawController { private final CqcCarbonRawService cqcCarbonRawService; -// @GetMapping("page") -// @Operation(summary="分页") -// @Parameters({ -// @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , -// @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , -// @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , -// @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)") -// }) -// public Result> page(@Parameter(hidden = true) @RequestParam Map params){ -// PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class); -// return new Result>().ok(page); -// } + @GetMapping("page") + @Operation(summary="分页") + @Parameters({ + @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true) , + @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) , + @Parameter(name = Constant.ORDER_FIELD, description = "排序字段") , + @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"), + @Parameter(name = "applyNo", description = "applyNo,报表唯一编码") + }) + public Result> page(@Parameter(hidden = true) @RequestParam Map params){ + PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class); + return new Result>().ok(page); + }