java/zhihuishenqu.git

			@@ -2,6 +2,7 @@

			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			@@ -13,6 +14,7 @@
			import com.panzhihua.common.model.vos.community.ComActVO;
			import com.panzhihua.common.model.vos.grid.*;
			import com.panzhihua.common.service.community.CommunityService;
			import com.panzhihua.common.utlis.ExcelSelectListUtil;
			import com.panzhihua.common.utlis.LngLatUtils;
			import com.panzhihua.common.utlis.StringUtils;
			import com.panzhihua.service_grid.dao.*;
			@@ -55,7 +57,8 @@
			private EventGridMemberRelationMapper eventGridMemberRelationMapper;
			@Resource
			private EventGridDataService eventGridDataService;

			@Resource
			private EventResourceMapper eventResourceMapper;
			/**
			* 分页查找事件
			*
			@@ -531,10 +534,10 @@
			if (eventDO == null) {
			return R.fail("事件不存在");
			}
			boolean canDealByUser = eventDO.getEventStatus() == 2 && eventDO.getEventProcessStatus() == 1;
			boolean canDealByUser = (eventDO.getEventStatus() == 2\|\|eventDO.getEventStatus()==4) && eventDO.getEventProcessStatus() == 1;
			if (!canDealByUser) {
			if (eventDO.getEventStatus() != 2) {
			return R.fail("事件不是发布状态");
			if (eventDO.getEventStatus() != 2 ) {
			return R.fail("事件不是发布/待处理状态");
			}
			if (eventDO.getEventProcessStatus() != 1) {
			return R.fail("事件不是待处理状态");
			@@ -650,7 +653,8 @@
			@Override
			public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) {
			EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId());
			boolean canRepublishByUser = eventDO.getEventStatus() == 4 \|\| eventDO.getEventStatus() == 1;
			//boolean canRepublishByUser = eventDO.getEventStatus() == 4 \|\| eventDO.getEventStatus() == 1;
			boolean canRepublishByUser = eventDO.getEventDealStatus() == 7\|eventDO.getEventDealStatus() == 5; //已失效状态
			if (!canRepublishByUser) {
			return R.fail("当前不是撤销/草稿状态");
			}
			@@ -1179,6 +1183,11 @@
			eventVO.setAudios(audioList);
			eventVO.setPics(picList);
			eventVO.setVideos(videoList);
			//查询网格员头像
			String imageUrl = eventMapper.getGridMemberImageUrl(eventVO.getGridMemberId());
			if (StringUtils.isNotEmpty(imageUrl)) {
			eventVO.setGridMemberImageUrl(imageUrl);
			}
			});
			return R.ok(ipage);
			}
			@@ -1504,14 +1513,13 @@
			.eq(EventTransferRecordDO::getEventId, eventId)
			.orderByDesc(EventTransferRecordDO::getCreateAt)
			);
			if (list == null \|\| list.size() == 0) {
			throw new ServiceException("事件流转记录异常");
			}
			EventTransferRecordDO lastRecord = list.get(0);
			EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
			eventTransferRecordDO.setFromType(lastRecord.getToType());
			eventTransferRecordDO.setFromId(lastRecord.getToId());
			eventTransferRecordDO.setFromName(lastRecord.getToName());
			if (list != null && list.size() > 0) {
			EventTransferRecordDO lastRecord = list.get(0);
			eventTransferRecordDO.setFromType(lastRecord.getToType());
			eventTransferRecordDO.setFromId(lastRecord.getToId());
			eventTransferRecordDO.setFromName(lastRecord.getToName());
			}
			eventTransferRecordDO.setToType(toType);
			eventTransferRecordDO.setToId(toId);
			eventTransferRecordDO.setProcessDate(new Date());
			@@ -1576,10 +1584,11 @@
			Integer community_process = eventDO.getCommunityProcess() != null ? eventDO.getCommunityProcess() : -1;

			Integer eventDealStatus = -1;
			if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
			/*if (eventDO.getInvalid() != null && eventDO.getInvalid() == false) {
			eventDealStatus = 7;
			//7已失效
			} else if (event_status == 1) {
			}*/
			if (event_status == 1) {
			eventDealStatus = 5;
			//"草稿箱"
			} else if (event_status == 4) {
			@@ -1644,7 +1653,7 @@
			public R getNearByGrid(PageEventGridNearbyDTO pageEventGridNearbyDTO) {
			Page page = new Page(pageEventGridNearbyDTO.getPageNum(), pageEventGridNearbyDTO.getPageSize());
			String latLng = pageEventGridNearbyDTO.getHappentLatLng();
			if(!latLng.matches("^[\\-\\+]?((0\|([1-8]\\d?))(\\.\\d{1,10})?\|90(\\.0{1,10})?),[\\-\\+]?(0(\\.\\d{1,10})?\|([1-9](\\d)?)(\\.\\d{1,10})?\|1[0-7]\\d{1}(\\.\\d{1,10})?\|180\\.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("经纬度参数错误");
			}
			String latLngArr[] = latLng.split(",");
			@@ -2037,4 +2046,33 @@

			return R.fail();
			}

			@Override
			public List<EventDetailsVO> getUnUploadEvent() {
			List<EventDetailsVO> eventDetailsVOList =new ArrayList<>();
			List<EventDO> unEventList = baseMapper.selectList(
			new QueryWrapper<EventDO>()
			.eq("upload", false)
			);
			unEventList.forEach(eventDO -> {
			eventDetailsVOList.add(eventDetails(eventDO.getId()).getData());
			});
			return eventDetailsVOList;
			}

			@Override
			@Transactional(rollbackFor = Exception.class)
			public Boolean updateLcUploadFlag(Long id) {
			EventDO event = baseMapper.selectById(id);
			event.setUpload(true);
			baseMapper.updateById(event);
			EventResourceDO eventResourceDO =new EventResourceDO();
			eventResourceDO.setUpload(true);
			int flag = eventResourceMapper.update(eventResourceDO, new QueryWrapper<EventResourceDO>()
			.eq("ref_id", id));
			if(flag>0){
			return true;
			}
			return false;
			}
			}