From c7f69f55e98c9f0777d46ef04f5cb58924e8d869 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 23 五月 2025 23:42:52 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/service/impl/StaticsService.java | 82 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 5 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 91575e4..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,12 +1,18 @@
package com.panzhihua.sangeshenbian.service.impl;
-import com.beust.jcommander.internal.Lists;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.utlis.DateUtils;
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.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;
import com.panzhihua.sangeshenbian.service.IComActService;
@@ -18,9 +24,11 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* @author mitao
@@ -35,11 +43,11 @@
private final IComStreetService comStreetService;
private final IComActService comActService;
private final SystemUserMapper systemUserMapper;
-
+ private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
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();
@@ -86,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);
@@ -123,4 +131,68 @@
return Collections.singletonList(regionVO);
}
+ /**
+ * 统计分析-第一部分
+ * @param query
+ * @param loginUserInfo
+ * @return
+ */
+ public AnalyticStatisticsOneVo queryStaticsPartOne(AppStaticsQuery query, LoginUserInfoVO loginUserInfo) {
+ List<Complaint> complaints = complaintService.queryCompliantList(query,loginUserInfo);
+ 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);
+ //时间范围
+ String time = "";
+ if (Objects.nonNull(query.getTimeType())) {
+ Date now = new Date();
+ Date start = null;
+ switch (query.getTimeType()) {
+ case 2:
+ start = DateUtils.addDay(now, -14);
+ break;
+ case 3:
+ start = DateUtils.addDay(now, -29);
+ break;
+ default:
+ start = DateUtils.addDay(now, -6);
+ break;
+ }
+ //格式化
+ String startStr = DateUtils.format(start, DateUtils.yyyyMMdd_format);
+ String endStr = DateUtils.format(now, DateUtils.yyyyMMdd_format);
+ time = startStr + " - " + endStr;
+ }
+ 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