12/21 大屏临时修改

101captain

2021-12-21 ecbe18133a8484314ec05b4aedaf52e60370a483

12/21  大屏临时修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/bigscreen/BigScreenStaticsReserve.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -25,13 +26,13 @@
    @ApiModelProperty("居家隔离登记")
    private Integer homeCount;
    @ApiModelProperty("返攀登记百分比")
    private Double reservePercent;
    private BigDecimal reservePercent;
    @ApiModelProperty("居家隔离百分比")
    private Double homePercent;
    private BigDecimal homePercent;
    @ApiModelProperty("燃气登记百分比")
    private Double gasPercent;
    private BigDecimal gasPercent;
    @ApiModelProperty("防火登记百分比")
    private Double firePercent;
    private BigDecimal firePercent;
    @ApiModelProperty("折线图数据")
    private List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList;
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java

@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;

import java.math.BigDecimal;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -285,10 +286,10 @@
    @Override
    public R bigScreenStaticsReserve(Long communityId) {
        BigScreenStaticsReserve bigScreenStaticsReserve=comActReserveRecordMapper.biggestScreen(communityId);
        bigScreenStaticsReserve.setReservePercent(bigScreenStaticsReserve.getReserveCount()*100d/ bigScreenStaticsReserve.getCount());
        bigScreenStaticsReserve.setFirePercent(bigScreenStaticsReserve.getFireCount()*100d/ bigScreenStaticsReserve.getCount());
        bigScreenStaticsReserve.setHomePercent(bigScreenStaticsReserve.getHomeCount()*100d/ bigScreenStaticsReserve.getCount());
        bigScreenStaticsReserve.setGasPercent(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount());
        bigScreenStaticsReserve.setReservePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getReserveCount()*100d/ bigScreenStaticsReserve.getCount()));
        bigScreenStaticsReserve.setFirePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getFireCount()*100d/ bigScreenStaticsReserve.getCount()));
        bigScreenStaticsReserve.setHomePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getHomeCount()*100d/ bigScreenStaticsReserve.getCount()));
        bigScreenStaticsReserve.setGasPercent(BigDecimal.valueOf(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount()));
        List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList=this.getPoints();
        bigScreenStaticsReserveMonthList.forEach(bigScreenStaticsReserveMonth -> {
            BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX());