CQC新增分页得条件查询接口

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<CockpitEnterpriseInfo>> list(){
         List<CockpitEnterpriseInfo> list = pubCockpitService.cockpitEnterpriseInfoList();
         return new Result<List<CockpitEnterpriseInfo>>().ok(list);
@@ -38,4 +38,12 @@ public class PubCockpitController {
 
 
 
+    @GetMapping("statistics")
+    @Operation(summary="中间六个统计")
+    public Result<List<CockpitEnterpriseInfo>> statistics(){
+        List<CockpitEnterpriseInfo> list = pubCockpitService.cockpitEnterpriseInfoList();
+        return new Result<List<CockpitEnterpriseInfo>>().ok(list);
+    }
+
+
 }

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 {
+
+
+
+
+
+
+
+}

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<PageData<CqcCarbonConsumablesDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-//        PageData<CqcCarbonConsumablesDTO> page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
-//        return new Result<PageData<CqcCarbonConsumablesDTO>>().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<PageData<CqcCarbonConsumablesDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        PageData<CqcCarbonConsumablesDTO> page = cqcCarbonConsumablesService.getPageData(params, CqcCarbonConsumablesDTO.class);
+        return new Result<PageData<CqcCarbonConsumablesDTO>>().ok(page);
+    }
 
     @GetMapping("list/{applyNo}")
     @Operation(summary="信息")

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;
 
 /**
@@ -40,13 +42,21 @@ public class CqcCarbonDiscardController {
             @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.ORDER, description = "排序方式，可选值(asc、desc)"),
+            @Parameter(name = "applyNo", description = "applyNo,报表唯一编码")
     })
     public Result<PageData<CqcCarbonDiscardDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
         PageData<CqcCarbonDiscardDTO> page = cqcCarbonDiscardService.getPageData(params, CqcCarbonDiscardDTO.class);
         return new Result<PageData<CqcCarbonDiscardDTO>>().ok(page);
     }
 
+    @GetMapping("list/{applyNo}")
+    @Operation(summary="信息")
+    public Result<List<CqcCarbonDiscardDTO>> list(@PathVariable("applyNo") String applyNo){
+        List<CqcCarbonDiscardDTO> datas = cqcCarbonDiscardService.listAs(Map.of("applyNo",applyNo), CqcCarbonDiscardDTO.class);
+        return new Result<List<CqcCarbonDiscardDTO> >().ok(datas);
+    }
+
     @GetMapping("{id}")
     @Operation(summary="信息")
     public Result<CqcCarbonDiscardDTO> get(@PathVariable("id") Long id){

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<CqcCarbonDiscar
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params){
         QueryWrapper wrapper = new QueryWrapper();
+        String applyNo = MapUtils.getString(params,"applyNo");
+        wrapper.eq(CqcCarbonDiscardEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo));
         return wrapper;
     }
 

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<PageData<CqcCarbonDistributionDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-//        PageData<CqcCarbonDistributionDTO> page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
-//        return new Result<PageData<CqcCarbonDistributionDTO>>().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<PageData<CqcCarbonDistributionDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        PageData<CqcCarbonDistributionDTO> page = cqcCarbonDistributionService.getPageData(params, CqcCarbonDistributionDTO.class);
+        return new Result<PageData<CqcCarbonDistributionDTO>>().ok(page);
+    }
 
     @GetMapping("list/{applyNo}")
     @Operation(summary="信息")

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<PageData<CqcCarbonEnergyDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-//        PageData<CqcCarbonEnergyDTO> page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
-//        return new Result<PageData<CqcCarbonEnergyDTO>>().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<PageData<CqcCarbonEnergyDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        PageData<CqcCarbonEnergyDTO> page = cqcCarbonEnergyService.getPageData(params, CqcCarbonEnergyDTO.class);
+        return new Result<PageData<CqcCarbonEnergyDTO>>().ok(page);
+    }
 
     @GetMapping("list/{applyNo}")
     @Operation(summary="信息")

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<PageData<CqcCarbonMakeDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-//        PageData<CqcCarbonMakeDTO> page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
-//        return new Result<PageData<CqcCarbonMakeDTO>>().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<PageData<CqcCarbonMakeDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        PageData<CqcCarbonMakeDTO> page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class);
+        return new Result<PageData<CqcCarbonMakeDTO>>().ok(page);
+    }
 
 
     @GetMapping("list/{applyNo}")

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<PageData<CqcCarbonRawDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
-//        PageData<CqcCarbonRawDTO> page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
-//        return new Result<PageData<CqcCarbonRawDTO>>().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<PageData<CqcCarbonRawDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params){
+        PageData<CqcCarbonRawDTO> page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class);
+        return new Result<PageData<CqcCarbonRawDTO>>().ok(page);
+    }