From 3278d4712b6bfd787f374f3e294dadbd51e82cd0 Mon Sep 17 00:00:00 2001 From: xiachao Date: Fri, 9 Aug 2024 18:44:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=B1=9E=E6=80=A7=E9=81=A5=E6=B5=8B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8E=86=E5=8F=B2=E6=9F=A5=E8=AF=A2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CqcCarbonConsumablesController.java | 33 +++++++++++------ .../impl/CqcCarbonConsumablesServiceImpl.java | 5 +++ .../CqcCarbonDistributionController.java | 33 +++++++++++------ .../CqcCarbonDistributionServiceImpl.java | 5 +++ .../controller/CqcCarbonEnergyController.java | 33 ++++++++++------- .../impl/CqcCarbonEnergyServiceImpl.java | 5 +++ .../controller/CqcCarbonMakeController.java | 33 +++++++++++------ .../impl/CqcCarbonMakeServiceImpl.java | 5 +++ .../controller/CqcCarbonRawController.java | 35 ++++++++++++------- .../service/impl/CqcCarbonRawServiceImpl.java | 6 +++- .../dto/CqcCarbonReportDTO.java | 3 ++ .../entity/CqcCarbonReportEntity.java | 5 +++ .../impl/IotThingEntityServiceImpl.java | 4 +-- 13 files changed, 145 insertions(+), 60 deletions(-) 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 7780f42..16d9d93 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 @@ -12,6 +12,7 @@ import com.thing.common.core.web.response.Result; import com.thing.cqc.CqcCarbonConsumables.dto.CqcCarbonConsumablesDTO; import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; +import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -19,6 +20,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; /** @@ -35,19 +37,28 @@ 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)") +// }) +// 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="信息") + public Result> list(@PathVariable("applyNo") String applyNo){ + List datas = cqcCarbonConsumablesService.listAs(Map.of("applyNo",applyNo), CqcCarbonConsumablesDTO.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/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java index b436f41..37ab7c2 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonConsumables/service/impl/CqcCarbonConsumablesServiceImpl.java @@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl; import com.thing.cqc.CqcCarbonConsumables.mapper.CqcCarbonConsumablesMapper; import com.thing.cqc.CqcCarbonConsumables.entity.CqcCarbonConsumablesEntity; import com.thing.cqc.CqcCarbonConsumables.service.CqcCarbonConsumablesService; +import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.Map; @@ -21,6 +24,8 @@ public class CqcCarbonConsumablesServiceImpl extends BaseServiceImpl params){ QueryWrapper wrapper = new QueryWrapper(); + String applyNo = MapUtils.getString(params,"applyNo"); + wrapper.eq(CqcCarbonConsumablesEntity::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 08d1566..bae4155 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 @@ -12,6 +12,7 @@ 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.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -19,6 +20,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; /** @@ -35,19 +37,28 @@ 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)") +// }) +// 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="信息") + public Result> list(@PathVariable("applyNo") String applyNo){ + List datas = cqcCarbonDistributionService.listAs(Map.of("applyNo",applyNo), CqcCarbonDistributionDTO.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/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java index ff0be4d..8b00ddf 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonDistribution/service/impl/CqcCarbonDistributionServiceImpl.java @@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl; import com.thing.cqc.CqcCarbonDistribution.mapper.CqcCarbonDistributionMapper; import com.thing.cqc.CqcCarbonDistribution.entity.CqcCarbonDistributionEntity; import com.thing.cqc.CqcCarbonDistribution.service.CqcCarbonDistributionService; +import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.Map; @@ -21,6 +24,8 @@ public class CqcCarbonDistributionServiceImpl extends BaseServiceImpl params){ QueryWrapper wrapper = new QueryWrapper(); + String applyNo = MapUtils.getString(params,"applyNo"); + wrapper.eq(CqcCarbonDistributionEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo)); return wrapper; } 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 69d7743..4cb3f1a 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 @@ -12,6 +12,7 @@ import com.thing.common.core.web.response.Result; import com.thing.cqc.CqcCarbonEnergy.dto.CqcCarbonEnergyDTO; import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; +import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -19,6 +20,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; /** @@ -29,23 +31,30 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbonenergy") -@Tag(name=" 碳足迹认证核查-使用阶段") +@Tag(name=" 碳足迹认证核查-使用阶段能源") @RequiredArgsConstructor 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)") +// }) +// 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="信息") + public Result> list(@PathVariable("applyNo") String applyNo){ + List datas = cqcCarbonEnergyService.listAs(Map.of("applyNo",applyNo), CqcCarbonEnergyDTO.class); + return new Result >().ok(datas); } @GetMapping("{id}") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java index 22e34a4..750630e 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonEnergy/service/impl/CqcCarbonEnergyServiceImpl.java @@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl; import com.thing.cqc.CqcCarbonEnergy.mapper.CqcCarbonEnergyMapper; import com.thing.cqc.CqcCarbonEnergy.entity.CqcCarbonEnergyEntity; import com.thing.cqc.CqcCarbonEnergy.service.CqcCarbonEnergyService; +import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.Map; @@ -21,6 +24,8 @@ public class CqcCarbonEnergyServiceImpl extends BaseServiceImpl params){ QueryWrapper wrapper = new QueryWrapper(); + String applyNo = MapUtils.getString(params,"applyNo"); + wrapper.eq(CqcCarbonEnergyEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo)); return wrapper; } 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 82f7b82..3913c2c 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 @@ -12,6 +12,7 @@ import com.thing.common.core.web.response.Result; import com.thing.cqc.CqcCarbonMake.dto.CqcCarbonMakeDTO; import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; +import com.thing.cqc.CqcCarbonRaw.dto.CqcCarbonRawDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -19,6 +20,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; /** @@ -35,19 +37,28 @@ 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)") +// }) +// public Result> page(@Parameter(hidden = true) @RequestParam Map params){ +// PageData page = cqcCarbonMakeService.getPageData(params, CqcCarbonMakeDTO.class); +// return new Result>().ok(page); +// } + + + @GetMapping("list/{applyNo}") + @Operation(summary="信息") + public Result> list(@PathVariable("applyNo") String applyNo){ + List datas = cqcCarbonMakeService.listAs(Map.of("applyNo",applyNo), CqcCarbonMakeDTO.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/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java index 5ade199..93b3980 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonMake/service/impl/CqcCarbonMakeServiceImpl.java @@ -5,6 +5,9 @@ import com.thing.common.orm.service.impl.BaseServiceImpl; import com.thing.cqc.CqcCarbonMake.mapper.CqcCarbonMakeMapper; import com.thing.cqc.CqcCarbonMake.entity.CqcCarbonMakeEntity; import com.thing.cqc.CqcCarbonMake.service.CqcCarbonMakeService; +import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import org.apache.commons.collections4.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.Map; @@ -21,6 +24,8 @@ public class CqcCarbonMakeServiceImpl extends BaseServiceImpl params){ QueryWrapper wrapper = new QueryWrapper(); + String applyNo = MapUtils.getString(params,"applyNo"); + wrapper.eq(CqcCarbonMakeEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo)); return wrapper; } 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 7f3808f..92a18ef 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 @@ -18,6 +18,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; /** @@ -28,25 +29,35 @@ import java.util.Map; */ @RestController @RequestMapping("v2/cqccarbonraw") -@Tag(name="碳足迹认证喝茶-原物料阶段") +@Tag(name="碳足迹认证核查-原物料阶段") @RequiredArgsConstructor 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)") +// }) +// public Result> page(@Parameter(hidden = true) @RequestParam Map params){ +// PageData page = cqcCarbonRawService.getPageData(params, CqcCarbonRawDTO.class); +// return new Result>().ok(page); +// } + + + + @GetMapping("list/{applyNo}") + @Operation(summary="信息") + public Result> list(@PathVariable("applyNo") String applyNo){ + List datas = cqcCarbonRawService.listAs(Map.of("applyNo",applyNo), CqcCarbonRawDTO.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/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java index a1e0440..fc0ffa1 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonRaw/service/impl/CqcCarbonRawServiceImpl.java @@ -2,9 +2,11 @@ package com.thing.cqc.CqcCarbonRaw.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.common.orm.service.impl.BaseServiceImpl; -import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper; import com.thing.cqc.CqcCarbonRaw.entity.CqcCarbonRawEntity; +import com.thing.cqc.CqcCarbonRaw.mapper.CqcCarbonRawMapper; import com.thing.cqc.CqcCarbonRaw.service.CqcCarbonRawService; +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 CqcCarbonRawServiceImpl extends BaseServiceImpl params){ QueryWrapper wrapper = new QueryWrapper(); + String applyNo = MapUtils.getString(params,"applyNo"); + wrapper.eq(CqcCarbonRawEntity::getApplyNo,applyNo, StringUtils.isNotEmpty(applyNo)); return wrapper; } diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java index d1f3996..5869011 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/dto/CqcCarbonReportDTO.java @@ -123,6 +123,9 @@ public class CqcCarbonReportDTO implements Serializable { private String processDescription; @Schema(description = "产品信息") private String productInfo; + @Schema(description = "产品图片") + private String productUrl; + @Schema(description = "公司简介") private String companyInfo; @Schema(description = "盘查期间场内平均人数") diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java index a718f62..2045339 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/CqcCarbonReport/entity/CqcCarbonReportEntity.java @@ -2,6 +2,7 @@ package com.thing.cqc.CqcCarbonReport.entity; import com.mybatisflex.annotation.Table; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -231,6 +232,10 @@ public class CqcCarbonReportEntity implements Serializable { * 产品信息 */ private String productInfo; + /** + * 产品图片 + */ + private String productUrl; /** * 公司简介 */ diff --git a/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java index 0f8bd87..d1d6073 100644 --- a/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/entity/service/impl/IotThingEntityServiceImpl.java @@ -880,8 +880,8 @@ public class IotThingEntityServiceImpl extends BaseServiceImpl