java/zhihuishenqu.git

			@@ -1,18 +1,20 @@
			package com.panzhihua.service_community.service.impl;

			import java.util.ArrayList;
			import java.util.Comparator;
			import java.util.List;
			import java.util.TreeSet;
			import java.util.*;
			import java.util.stream.Collectors;


			import javax.annotation.Resource;


			import cn.hutool.core.collection.CollectionUtil;
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.panzhihua.common.model.dtos.community.building.BuildingDto;
			import com.panzhihua.common.model.dtos.community.large.AreaStreetDetail;
			import com.panzhihua.common.model.dtos.community.large.AreaStreetDetailResp;
			import com.panzhihua.common.model.dtos.community.large.SumAreaStreetResp;
			import com.panzhihua.common.model.dtos.partybuilding.QryReportResp;
			import com.panzhihua.common.model.vos.StreetVO;
			import com.panzhihua.common.model.vos.area.StreetAndBuildVO;
			import com.panzhihua.common.model.vos.community.bigscreen.ScreenStatics;
			@@ -32,6 +34,7 @@
			import com.panzhihua.service_community.util.WxDataUtil;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.data.redis.core.StringRedisTemplate;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.ObjectUtils;
			@@ -49,6 +52,7 @@
			import com.panzhihua.service_community.model.dos.ComActDO;
			import com.panzhihua.service_community.model.dos.ComStreetDO;
			import com.panzhihua.service_community.service.ComStreetService;
			import org.springframework.util.StringUtils;

			/**
			* @author: llming
			@@ -70,6 +74,9 @@

			@Autowired
			private CommunityService communityService;

			@Resource
			private StringRedisTemplate stringRedisTemplate;

			/**
			* 新增社区
			@@ -318,8 +325,23 @@
			public R getScreenStatics() {
			ScreenStatics screenStatics = comActDAO.getScreenStatics();
			WxDataUtil wxDataUtil=new WxDataUtil();
			screenStatics.setDayUser(wxDataUtil.getDayUser());
			screenStatics.setCountUser(wxDataUtil.getMonthUser());
			//微信查询较慢数据时有时没有缓存到 redis 里
			//日活跃
			if(null != wxDataUtil.getDayUser()){
			stringRedisTemplate.opsForValue().set("WxDataUtil_Day",String.valueOf(wxDataUtil.getDayUser()));
			screenStatics.setDayUser(wxDataUtil.getDayUser());
			}else {
			Object obj = stringRedisTemplate.opsForValue().get("WxDataUtil_Day");
			screenStatics.setDayUser(Integer.valueOf((String)obj));
			}
			//月活跃
			if(null != wxDataUtil.getMonthUser()){
			stringRedisTemplate.opsForValue().set("WxDataUtil_Month",String.valueOf(wxDataUtil.getMonthUser()));
			screenStatics.setCountUser(wxDataUtil.getMonthUser());
			}else {
			Object obj = stringRedisTemplate.opsForValue().get("WxDataUtil_Month");
			screenStatics.setCountUser(Integer.valueOf((String)obj));
			}
			return R.ok(screenStatics);
			}

			@@ -358,7 +380,8 @@
			// endTime=year.toString().concat("-12-31");
			// }
			activityVO.setUnitCount(comActDAO.arriveUnit(belongTo));
			R r = communityService.institutionalUnitServiceAnalysis(year, null, null, null, null, null, belongTo, null, null);
			R r = communityService.institutionalUnitServiceAnalysis(year, null, null, null,
			null, null, belongTo, null, null,null);
			Object data = r.getData();
			String jsonString = JSON.toJSONString(data);
			ActivityAnalysisVO activityAnalysisVO = JSON.parseObject(jsonString, ActivityAnalysisVO.class);
			@@ -366,4 +389,46 @@
			return R.ok(activityVO);
			}

			@Override
			public SumAreaStreetResp sumAreaStreet() {
			SumAreaStreetResp resp = comActDAO.sumAreaStreet();
			return resp;
			}

			@Override
			public AreaStreetDetail areaStreetDetail(String code, String type) {
			//根据层级查询社区id
			LambdaQueryWrapper<ComActDO> qry = new LambdaQueryWrapper<>();
			if(type.equals("1")){// 1 查询大区
			qry.eq( !StringUtils.isEmpty(code),ComActDO::getAreaCode,code);
			}
			if(type.equals("2")){// 2 查询街道
			qry.eq( !StringUtils.isEmpty(code),ComActDO::getStreetId,code);
			}
			if(type.equals("3")){// 3 查询小区
			qry.eq( !StringUtils.isEmpty(code),ComActDO::getCommunityId,code);
			}
			// qry.eq(ComActDO::getAppId,"wx118de8a734d269f0");
			List<ComActDO> doList = comActDAO.selectList(qry);
			//解析社区id
			List<Long> ids = doList.stream().map(ComActDO::getCommunityId).collect(Collectors.toList());

			AreaStreetDetail result = new AreaStreetDetail();
			if(CollectionUtil.isNotEmpty(ids)){
			//查询街道相关信息
			AreaStreetDetailResp village = comActDAO.selectVillage(ids,type);
			result.setAreaStreetDetailResp(village);
			//查询人口相关数据
			EventPopulationSpecialStatisticsVO eventResult = comActDAO.selectEvent(ids);
			result.setEventPopulationVO(eventResult);
			}
			return result;
			}


			@Override
			public List<QryReportResp> qryReport(String yearTime) {
			List<QryReportResp> result = comActDAO.qryReport(yearTime);
			return result;
			}
			}