java/zhihuishenqu.git

			@@ -1,5 +1,7 @@
			package com.panzhihua.service_grid.service.impl;

			import cn.hutool.core.date.DateTime;
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.util.IdcardUtil;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			@@ -12,21 +14,21 @@
			import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
			import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
			import com.panzhihua.common.model.dtos.grid.*;
			import com.panzhihua.common.model.helper.AESUtil;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.ComActVO;
			import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
			import com.panzhihua.common.model.vos.grid.*;
			import com.panzhihua.common.model.vos.screen.*;
			import com.panzhihua.common.service.community.CommunityService;
			import com.panzhihua.common.utlis.ExcelSelectListUtil;
			import com.panzhihua.common.utlis.DateUtils;
			import com.panzhihua.common.utlis.LngLatUtils;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_grid.dao.*;
			import com.panzhihua.service_grid.model.dos.*;
			import com.panzhihua.service_grid.service.*;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.stereotype.Service;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.util.CollectionUtils;

			@@ -63,6 +65,10 @@
			private EventGridDataService eventGridDataService;
			@Resource
			private EventResourceMapper eventResourceMapper;

			private final String moth_format_str = "yyyy-MM";

			private final String[] monthStr = new String[]{"一","二","三","四","五","六","七","八","九","十","十一","十二"};

			/**
			* 分页查找事件
			@@ -1729,7 +1735,11 @@
			public R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO) {
			Page page = new Page(pageEventGridNearbyDTO.getPageNum(), pageEventGridNearbyDTO.getPageSize());
			String latLng = pageEventGridNearbyDTO.getHappentLatLng();
			if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?\|([1-9](\\d)?)(\\.\\d{1,10})?\|1[0-7]\\d{1}(\\.\\d{1,10})?\|180\\.0{1,10}),[\\-\\+]?((0\|([1-8]\\d?))(\\.\\d{1,10})?\|90(\\.0{1,10})?)$")){
			// if(!latLng.matches("^[\\-\\+]?(0(\\.\\d{1,10})?\|([1-9](\\d)?)(\\.\\d{1,10})?\|1[0-7]\\d{1}(\\.\\d{1,10})?\|180\\.0{1,10}),[\\-\\+]?((0\|([1-8]\\d?))(\\.\\d{1,10})?\|90(\\.0{1,10})?)$")){
			// return R.fail("经纬度参数错误");
			// }
			//经纬度匹配规则：（短（纬度）在前长（经度）在后，不要擅自修改此规则，否则出现问题后果自负）
			if(!latLng.matches("[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?")){
			return R.fail("经纬度参数错误");
			}
			String latLngArr[] = latLng.split(",");
			@@ -2222,4 +2232,90 @@
			}
			return false;
			}

			public R eventWork(Long communityId){
			EventWorkScreenVO workScreenVO = new EventWorkScreenVO();
			String date = DateUtils.getDateFormatString(new Date(),moth_format_str);
			Map<String,Long> countMap = this.eventMapper.countByCommunityId(communityId,date);
			if(!countMap.isEmpty()){
			workScreenVO.setResolvedNum(countMap.get("resolvedNum")== null ? 0L : Long.valueOf(countMap.get("resolvedNum").toString()));
			workScreenVO.setPendingNum(countMap.get("pendingNum")== null ? 0L : Long.valueOf(countMap.get("pendingNum").toString()));
			workScreenVO.setPropagandaNum(countMap.get("propagandaNum")== null ? 13L : Long.valueOf(countMap.get("propagandaNum").toString()));
			workScreenVO.setCurrentNum(countMap.get("currentNum")== null ? 0L : Long.valueOf(countMap.get("currentNum").toString()));
			}

			//计算处理时间消耗的时间
			DateScreenVO countAvg = this.eventMapper.countByAvgCommunityId(communityId);
			if(countAvg != null){
			int second = (int) (countAvg.getEndTime().getTime() - countAvg.getStartTime().getTime())/1000;
			if(second > 0){
			second = second/workScreenVO.getResolvedNum().intValue();
			workScreenVO.setAvgCost(second);
			}
			}
			//查询最新事件轮播列表
			List<EventDetailWorkVO> eventList = this.eventMapper.getWorkScreenEventList(communityId);
			if(!eventList.isEmpty()){
			workScreenVO.setEventList(eventList);
			}

			//统计近半年数据
			List<EventWorkVO> list = new ArrayList<>();
			for(EventWorkVO eventWorkVO: listHalfYearByDyn()){
			EventWorkVO result = this.eventMapper.countByTime(eventWorkVO.getStart(),eventWorkVO.getEnd(),communityId);
			result.setMonth(eventWorkVO.getMonth());
			list.add(result);
			}
			workScreenVO.setList(list);

			//查询完成事件统计
			EventTypeWorkVO complete = this.eventMapper.getComplete(communityId);
			if(complete != null){
			workScreenVO.setComplete(complete);
			}
			//查询未完成事件统计
			EventTypeWorkVO noComplete = this.eventMapper.getNoComplete(communityId);
			if(complete != null){
			workScreenVO.setNoComplete(noComplete);
			}
			return R.ok(workScreenVO);
			}

			private List<EventWorkVO> listHalfYearByDyn() {
			List<EventWorkVO> dateList = new ArrayList<>();
			Date now = new Date();
			for(int i= 6;i>=1;i--){
			Date date = DateUtils.getDateM(now,-i);
			DateTime endDay = DateUtil.endOfMonth(date);

			int m = DateUtil.month(endDay);
			m++;
			if(m == 12){
			m = 0;
			}
			int day = DateUtil.dayOfMonth(endDay);
			int half = day/2;
			String month = DateUtil.format(date,moth_format_str);
			EventWorkVO eventWorkVO = new EventWorkVO();
			eventWorkVO.setMonth(monthStr[m]+"月上旬");
			eventWorkVO.setStart(month+ "-01 00:00:00");
			eventWorkVO.setEnd(month+ "-"+half+" 23:59:58");
			dateList.add(eventWorkVO);
			EventWorkVO eventWorkVO1 = new EventWorkVO();
			eventWorkVO1.setMonth(monthStr[m]+"月下旬");
			eventWorkVO1.setStart(month+ "-"+half+" 23:59:58");
			eventWorkVO1.setEnd(DateUtils.getDateFormatString(endDay,"yyyy-MM-dd HH:mm:ss"));
			dateList.add(eventWorkVO1);
			}
			return dateList;

			}

			public static void main(String[] args) {
			String content = "30,104";
			String re = "[1-9][0-9](\\.[0-9]{1,6})?,[1-9][0-9]{2}(\\.[0-9]{1,6})?";

			System.out.println(content.matches(re));
			}

			}