From 5a8a90c095280fbd2106869ecd2bad10e01a57a6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 18:10:22 +0800
Subject: [PATCH] 12/23 大屏修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index 2898373..6c37a89 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -1,8 +1,10 @@
package com.panzhihua.service_community.service.impl;
+import java.math.BigDecimal;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -285,10 +287,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()).setScale(2,BigDecimal.ROUND_HALF_UP));
+ bigScreenStaticsReserve.setFirePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getFireCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
+ bigScreenStaticsReserve.setHomePercent(BigDecimal.valueOf(bigScreenStaticsReserve.getHomeCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
+ bigScreenStaticsReserve.setGasPercent(BigDecimal.valueOf(bigScreenStaticsReserve.getGasCount()*100d/ bigScreenStaticsReserve.getCount()).setScale(2,BigDecimal.ROUND_HALF_UP));
List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonthList=this.getPoints();
bigScreenStaticsReserveMonthList.forEach(bigScreenStaticsReserveMonth -> {
BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth1=comActReserveRecordMapper.biggestScreenMonth(communityId,bigScreenStaticsReserveMonth.getX());
@@ -319,17 +321,39 @@
public List<BigScreenStaticsReserveMonth> getPoints(){
List<BigScreenStaticsReserveMonth> bigScreenStaticsReserveMonths=new ArrayList<>();
- for(int i=1;i<=12;i++){
- String aDate="";
- if(i<10){
- aDate = "0"+i;
+ String nowMonth=DateUtils.getDateFormatString(new Date(),"MM");
+ String nowYear=DateUtils.getDateFormatString(new Date(),"yyyy");
+ String nowYearMonth=DateUtils.getDateFormatString(new Date(),"yyyyMM");
+ if(Integer.parseInt(nowYearMonth)<202212){
+ for(int i=9;i<=12;i++){
+ String aDate="";
+ if(i<10){
+ aDate = "0"+i;
+ }
+ else {
+ aDate=i+"";
+ }
+ BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
+ bigScreenStaticsReserveMonth.setX(aDate);
+ bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
- else {
- aDate=i+"";
+ }
+ if(Integer.parseInt(nowYear)>2021){
+ for(int i=1;i<=Integer.parseInt(nowMonth);i++){
+ if(bigScreenStaticsReserveMonths.size()>=12){
+ bigScreenStaticsReserveMonths.remove(0);
+ }
+ String aDate="";
+ if(i<10){
+ aDate = "0"+i;
+ }
+ else {
+ aDate=i+"";
+ }
+ BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
+ bigScreenStaticsReserveMonth.setX(aDate);
+ bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
- BigScreenStaticsReserveMonth bigScreenStaticsReserveMonth=new BigScreenStaticsReserveMonth();
- bigScreenStaticsReserveMonth.setX(aDate);
- bigScreenStaticsReserveMonths.add(bigScreenStaticsReserveMonth);
}
return bigScreenStaticsReserveMonths;
}
--
Gitblit v1.7.1