java/zhihuishenqu.git

			@@ -1737,7 +1737,10 @@
			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(",");
			@@ -2207,6 +2210,7 @@
			List<EventDO> unEventList = baseMapper.selectList(
			new QueryWrapper<EventDO>()
			.eq("upload", false)
			.eq("event_process_status", 2)
			);
			unEventList.forEach(eventDO -> {
			eventDetailsVOList.add(eventDetails(eventDO.getId()).getData());
			@@ -2237,14 +2241,14 @@
			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 ? 0L : Long.valueOf(countMap.get("propagandaNum").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.getStartTime().getTime() - countAvg.getEndTime().getTime())/1000;
			int second = (int) (countAvg.getEndTime().getTime() - countAvg.getStartTime().getTime())/1000;
			if(second > 0){
			second = second/workScreenVO.getResolvedNum().intValue();
			workScreenVO.setAvgCost(second);
			@@ -2286,10 +2290,10 @@
			DateTime endDay = DateUtil.endOfMonth(date);

			int m = DateUtil.month(endDay);
			// if(m == 0){
			// m = 11;
			// }
			// m--;
			m++;
			if(m == 12){
			m = 0;
			}
			int day = DateUtil.dayOfMonth(endDay);
			int half = day/2;
			String month = DateUtil.format(date,moth_format_str);
			@@ -2309,9 +2313,10 @@
			}

			public static void main(String[] args) {
			EventServiceImpl service = new EventServiceImpl();
			List<EventWorkVO> list = service.listHalfYearByDyn();
			System.out.println(list);
			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));
			}

			}