From 1c5e4eea6a34e0ebeef09fad29efad39d4c05068 Mon Sep 17 00:00:00 2001 From: xiachao Date: Fri, 16 Aug 2024 16:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=BE=A7=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CarbonPubMaterialFactorMapper.java | 6 +++++- .../CarbonPubProductionReportMapper.java | 2 ++ .../service/impl/PubCockpitServiceImpl.java | 21 ++++++++++++------- .../CarbonPubProductionReportMapper.xml | 9 ++++++++ .../impl/CqcCarbonReportServiceImpl.java | 8 +++---- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java index a63cb48..9efdd6c 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java @@ -3,6 +3,7 @@ package com.thing.carbon.pub.mapper; import com.thing.carbon.pub.entity.CarbonPubMaterialFactorEntity; import com.thing.common.orm.mapper.PowerBaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** * 碳排因子库 @@ -12,5 +13,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface CarbonPubMaterialFactorMapper extends PowerBaseMapper { - + + + @Select("SELECT sum(hot_score) FROM carbon_pub_material_factor") + Long selectCarbonLibCount(); } \ No newline at end of file diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java index 8fc1160..3c3dc0b 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java @@ -18,4 +18,6 @@ import java.util.List; public interface CarbonPubProductionReportMapper extends PowerBaseMapper { List getAllModels(@Param("tenantCode") Long tenantCode); + + Long selectProductsCount(); } \ No newline at end of file diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java index 012ac55..e808022 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java @@ -3,10 +3,7 @@ package com.thing.carbon.pub.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.carbon.pub.dto.CockpitEnterpriseInfo; import com.thing.carbon.pub.dto.CockpitStatisticsDto; -import com.thing.carbon.pub.mapper.CarbonPubProductionModelMapper; -import com.thing.carbon.pub.mapper.CarbonPubProductionReportMapper; -import com.thing.carbon.pub.mapper.CarbonPubSupplierMapper; -import com.thing.carbon.pub.mapper.PubCockpitMapper; +import com.thing.carbon.pub.mapper.*; import com.thing.carbon.pub.service.PubCockpitService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +30,12 @@ public class PubCockpitServiceImpl implements PubCockpitService { @Autowired private CarbonPubProductionReportMapper carbonPubProductionReportMapper; + @Autowired + private CarbonPubMaterialFactorMapper carbonPubMaterialFactorMapper; + + @Autowired + private CarbonPubProductionResultMapper carbonPubProductionResultMapper; + @Override public List cockpitEnterpriseInfoList() { @@ -64,17 +67,19 @@ public class PubCockpitServiceImpl implements PubCockpitService { Long processCount = carbonPubProductionModelMapper.selectCountByQuery(QueryWrapper.create()); dto.setProcessCount(processCount); //服务产品数 - Long productsCount = carbonPubProductionReportMapper.selectCountByQuery(QueryWrapper.create().select()); + Long productsCount = carbonPubProductionReportMapper.selectProductsCount(); dto.setProductsCount(productsCount); Long carbonReportCount = carbonPubProductionReportMapper.selectCountByQuery(QueryWrapper.create()); dto.setCarbonReportCount(carbonReportCount); + Long carbonLibCount = carbonPubMaterialFactorMapper.selectCarbonLibCount(); + dto.setCarbonLibCount(carbonLibCount); + Long carbonCount = carbonPubProductionResultMapper.selectCountByQuery(QueryWrapper.create()); + dto.setCarbonCount(carbonCount); - - - return null; + return dto; } } diff --git a/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml b/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml index 3ed8ebb..ef69ab9 100644 --- a/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml +++ b/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml @@ -15,4 +15,13 @@ + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java index 3bef537..f11beab 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java @@ -106,10 +106,10 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl