From 0c9a434ca2d0521d726f9539ba0f6b2dfb52841c Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 23 五月 2025 22:40:06 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java
index e8450f8..1817567 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java
@@ -1,20 +1,17 @@
package com.panzhihua.sangeshenbian.service.impl;
-import cn.hutool.core.date.DateUtil;
-import com.beust.jcommander.internal.Lists;
-import com.fasterxml.jackson.databind.ser.std.ObjectArraySerializer;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.utlis.DateUtils;
-import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.sangeshenbian.dao.SystemUserMapper;
import com.panzhihua.sangeshenbian.model.entity.ComAct;
import com.panzhihua.sangeshenbian.model.entity.ComStreet;
import com.panzhihua.sangeshenbian.model.entity.Complaint;
-import com.panzhihua.sangeshenbian.model.entity.PartyMember;
import com.panzhihua.sangeshenbian.model.entity.SystemUserLevel;
import com.panzhihua.sangeshenbian.model.query.AppStaticsQuery;
+import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsFourVo;
import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsOneVo;
+import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsThreeVo;
import com.panzhihua.sangeshenbian.model.vo.AnalyticStatisticsTwoVo;
import com.panzhihua.sangeshenbian.model.vo.RegionVO;
import com.panzhihua.sangeshenbian.service.IBcRegionService;
@@ -28,7 +25,6 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -51,7 +47,7 @@
public List<RegionVO> queryRegionTree(LoginUserInfoVO loginUserInfo) {
IdentityInformation currentIdentityInformation = identityInformationService.getCurrentIdentityInformation(loginUserInfo);
if (!Integer.valueOf(2).equals(currentIdentityInformation.getIdentity())) {
- throw new ServiceException("当前账号无权限");
+ return Collections.emptyList();
}
SystemUserLevel userLevel = currentIdentityInformation.getSystemUserLevel();
@@ -98,7 +94,7 @@
private List<RegionVO> buildDistrictLevelTree(String districtCode) {
List<RegionVO> streets = systemUserMapper.getStreet(districtCode);
streets.forEach(street -> {
- street.setTier(2);
+ street.setTier(3);
List<RegionVO> communities = systemUserMapper.getCommunity(street.getId());
communities.forEach(c -> c.setTier(4));
street.setChildren(communities);
@@ -146,6 +142,12 @@
return complaintService.analyticStatisticsOne(null, complaints, simpleDateFormat);
}
+ /**
+ *获取统计分析-第二部分（诉求单量统计柱状图）
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
public List<AnalyticStatisticsTwoVo> queryStaticsPartTwo(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
List<Complaint> complaints = complaintService.queryCompliantList(query,loginUserInfo);
//时间范围
@@ -155,13 +157,13 @@
Date start = null;
switch (query.getTimeType()) {
case 2:
- start = DateUtils.addDay(now, -15);
+ start = DateUtils.addDay(now, -14);
break;
case 3:
- start = DateUtils.addDay(now, -30);
+ start = DateUtils.addDay(now, -29);
break;
default:
- start = DateUtils.addDay(now, -7);
+ start = DateUtils.addDay(now, -6);
break;
}
//格式化
@@ -172,4 +174,25 @@
return complaintService.analyticStatisticsTwo(time, complaints, simpleDateFormat);
}
+ /**
+ *获取统计分析-第三部分（问题类型排名）
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ public List<AnalyticStatisticsThreeVo> queryStaticsPartThree(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
+ List<Complaint> complaints = complaintService.queryCompliantList(query,loginUserInfo);
+ return complaintService.analyticStatisticsThree(query.getRank(), complaints);
+ }
+
+ /**
+ * 获取统计分析-第四部分（评价占比）
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ public AnalyticStatisticsFourVo queryStaticsPartFour(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
+ List<Complaint> complaints = complaintService.queryCompliantList(query,loginUserInfo);
+ return complaintService.analyticStatisticsFour(complaints);
+ }
}
--
Gitblit v1.7.1