国网侧看板

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<CarbonPubMaterialFactorEntity> {
-	
+
+
+    @Select("SELECT sum(hot_score) FROM carbon_pub_material_factor")
+    Long selectCarbonLibCount();
 }

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<CarbonPubProductionReportEntity> {
 
     List<CarbonPubProductionModelEntity> getAllModels(@Param("tenantCode") Long tenantCode);
+
+    Long selectProductsCount();
 }

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<CockpitEnterpriseInfo> 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;
     }
 
 }

modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml

@@ -15,4 +15,13 @@
             </if>
         </where>
     </select>
+    
+    
+    <select id="selectProductsCount" resultType="Long">
+        SELECT "count"(1) FROM (
+                                   SELECT product_id FROM carbon_pub_production_report GROUP BY product_id
+                               ) as a
+    </select>
+
+
 </mapper>

modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java

@@ -106,10 +106,10 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl<CqcCarbonReportM
 
           JSONObject object = JSONObject.parseObject(reqResult);
           if(ObjectUtils.isNotEmpty(object)){
-              Integer code = object.getInteger("code");
-              String data = object.getString("data");
-              String msg = object.getString("msg");
-              result.setCode(code);
+              Integer code = object.getInteger("status");
+              String data = object.getString("message");
+              String msg = object.getString("message");
+              result.setCode(code==200?0:-1);
               result.setData(data);
               result.setMsg(msg);
           }