解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/MonitorFanIndicatorMapper.xml

@@ -72,7 +72,12 @@
         WHERE gateway=#{gateway} and
         indicator like concat('%',#{indicator},'%')
     </select>
-
+    <select id="getIndicatoralueTotal" resultType="Object">
+        SELECT SUM(indicator_value) wind_speed
+        FROM monitor_fan_indicator
+        WHERE gateway=#{gateway} and
+        indicator like concat('%',#{indicator},'%')
+    </select>
     <select id="queryRunRecord" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.RunRecord">
         SELECT
         t.equipment_number AS FanName,

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitoringMapController.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IMapRegionService;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.Test;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.MonitoringServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.RegionServiceImpl;
@@ -46,9 +47,10 @@ public class MonitoringMapController extends BaseController {
       return ResponseHelper.buildResponse(monitoringServiceImpl.getNationWideInfo(provinceName));
     }
 
-
-
-
-
-
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取社会贡献")
+    @GetMapping("/getTotalSocialContribution")
+    public ResponseModel<List<SocialContributionDto>> getTotalSocialContribution() {
+        return ResponseHelper.buildResponse(monitoringServiceImpl.getTotalSocialContribution());
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/SocialContributionDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import lombok.Data;
+
+@Data
+public class SocialContributionDto {
+    /**
+     * 社会贡献值
+     */
+    private Double title;
+    /**
+     * 贡献单位
+     */
+    private String unit;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -125,7 +125,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     }
 
     /**
-     * 根据网关与指标获取指标的平均值
+     * 根据网关与指标获取指标的总值
      * @param gateway
      * @param indicator
      * @return

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

 package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.injector.methods.SelectOne;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationCoordinate;
@@ -8,6 +9,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationCoordinateMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.RegionNationWideDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.SocialContributionDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -140,18 +142,36 @@ public class MonitoringServiceImpl {
         return this.monitorFanIndicatorImpl.getIndicatoralueTotal(gateway,indicatorcName);
     }
 
-    public void  getTotalSocialContribution(){
-        HashMap<String,Double> hashMap = new HashMap<>();
+    public List<SocialContributionDto>  getTotalSocialContribution(){
+        List<SocialContributionDto> socialContributionDtoList =new ArrayList<>();
         AtomicReference<Double> totalSocialContribution = new AtomicReference<>(0.0);
         //获取所有网关id不为空的数据
         List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("gateway_id"));
         stationBasicList.forEach(stationBasic -> {
-            totalSocialContribution.updateAndGet(v -> v + (Double) monitorFanIndicatorImpl.getIndicatoralueTotal(stationBasic.getStationNumber(), "年发电量"));
+            totalSocialContribution.updateAndGet(v -> v + (Double) monitorFanIndicatorImpl.getIndicatoralueTotal(stationBasic.getGatewayId(), "年发电量"));
         });
-        //
-//        hashMap.put("CO2",(totalSocialContribution * 0.3049)/1000000);
-//        hashMap.put("Coal",totalSocialContribution*);
-//        hashMap.put("Toner",totalSocialContribution*);
-//        hashMap.put("S02",totalSocialContribution*);
+        SocialContributionDto co2 = new SocialContributionDto();
+        SocialContributionDto coal = new SocialContributionDto();
+        SocialContributionDto toner = new SocialContributionDto();
+        SocialContributionDto so2 = new SocialContributionDto();
+       /** 社会贡献原始计算公式，后边的数据已经经过处理
+        //二氧化碳计算公式  *10000*832/10000/1000/1000
+        //标准煤计算公式  *10000*304.9/10000/1000/1000
+        //碳粉尘计算公式 *10000*0.032/1000/1000
+        //二氧化硫计算公式  =A2*10000*0.16/1000/1000
+        */
+        co2.setUnit("二氧化碳减排量（万t）");
+        co2.setTitle(totalSocialContribution.get() * 0.000832);
+        socialContributionDtoList.add(co2);
+        coal.setUnit("节约标准煤（万t）");
+        coal.setTitle(totalSocialContribution.get() * 0.0003049);
+        socialContributionDtoList.add(coal);
+        toner.setUnit("碳粉尘减排量（万t）");
+        toner.setTitle(totalSocialContribution.get() * 0.00032);
+        socialContributionDtoList.add(toner);
+        so2.setUnit("二氧化硫减排量（万t）");
+        so2.setTitle(totalSocialContribution.get() * 0.0016);
+        socialContributionDtoList.add(so2);
+        return  socialContributionDtoList;
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev.properties

@@ -11,55 +11,6 @@ spring.db2.datasource.url=jdbc:mysql://139.9.173.44:3306/jxiop_sync_data?allowMu
 spring.db2.datasource.username=root
 spring.db2.datasource.password=Yeejoin@2020
 spring.db2.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
-#spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
-#spring.datasource.url=jdbc:mysql://139.9.173.44:3306/jxiop_sync_data?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
-#spring.datasourceusername=root
-#spring.datasource.password=Yeejoin@2020
-#spring.datasource.driver-class-name: com.mysql.cj.jdbc.Driver
-#
-#
-#
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.type=com.zaxxer.hikari.HikariDataSource
-#spring.datasource.hikari.minimum-idle=10
-#spring.datasource.hikari.maximum-pool-size=25
-#spring.datasource.hikari.auto-commit=true
-#spring.datasource.hikari.idle-timeout=30000
-#spring.datasource.hikari.pool-name=DatebookHikariCP
-#spring.datasource.hikari.max-lifetime=120000
-#spring.datasource.hikari.connection-timeout=30000
-#spring.datasource.hikari.connection-test-query=SELECT 1
-#spring.datasource.url=jdbc:mysql://172.16.10.220:3306/production?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
-#spring.datasource.username=root
-#spring.datasource.password=Yeejoin@2020
-
-
-#spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
-#spring.datasource.master.jdbc-url=jdbc:mysql://139.9.173.44:3306/amos_idx?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useOldAliasMetadataBehavior=true
-#spring.datasource.master.username=root
-#spring.datasource.master.password=Yeejoin@2020
-#spring.datasource.master.driver-Class-Name=com.mysql.cj.jdbc.Driver
-#spring.datasource.master.minimum-idle=10
-#spring.datasource.master.max-wait=10000
-#spring.datasource.master.initial-size=10
-#spring.datasource.master.maximum-pool-size=100
-#spring.datasource.master.max-lifetime=1800000
-#spring.datasource.master.idle-timeout=60000
-#spring.datasource.master.connection-timeout=60000
-##\u6570\u636E\u6E902
-#spring.datasource.slave.jdbc-url=jdbc:mysql://139.9.173.44:3306/amos_idx_biz?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useOldAliasMetadataBehavior=true
-#spring.datasource.slave.username=root
-#spring.datasource.slave.password=Yeejoin@2020
-#spring.datasource.slave.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.slave.minimum-idle=10
-#spring.datasource.slave.max-wait=10000
-#spring.datasource.slave.initial-size=10
-#spring.datasource.slave.maximum-pool-size=100
-#spring.datasource.slave.max-lifetime=1800000
-#spring.datasource.slave.idle-timeout=60000
-#spring.datasource.slave.connection-timeout=60000
-
-
 
 ## eureka properties:
 eureka.instance.hostname=172.16.10.220