Merge remote-tracking branch 'origin/test_screen' into test_screen

xyh

2021-06-18 aa9d5899deda2c9a9c4da111e89509136f1c4ec2

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java

@@ -17,7 +17,6 @@
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.EventGridDataService;
import com.panzhihua.service_grid.service.EventResourceService;
import com.panzhihua.service_grid.service.EventService;
import com.panzhihua.service_grid.service.EventTransferRecordService;
@@ -25,12 +24,14 @@
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * @author cedoo
@@ -53,8 +54,6 @@
    private EventGridDataMapper eventGridDataMapper;
    @Resource
    private EventGridMemberRelationMapper eventGridMemberRelationMapper;
    @Resource
    private EventGridDataService eventGridDataService;

    /**
     * 分页查找事件
@@ -234,10 +233,11 @@
            }
            eventDetailsVO.setTrans(eventTransferRecordVOS);

            //查询事件发布人头像
            String imageUrl = eventMapper.getGridMemberImageUrl(eventDO.getGridMemberId());
            if (StringUtils.isNotEmpty(imageUrl)) {
                eventDetailsVO.setGridMemberImageUrl(imageUrl);
            //查询网格员头像,姓名
            Map<String,Object> userBaseInfoMap = eventMapper.getUserBaseInfo(eventDO.getGridMemberId());
            if (!CollectionUtils.isEmpty(userBaseInfoMap)) {
                eventDetailsVO.setCreator(userBaseInfoMap.get("name") == null ? "" : userBaseInfoMap.get("name").toString());
                eventDetailsVO.setGridMemberImageUrl(userBaseInfoMap.get("image_url") == null ? "" : userBaseInfoMap.get("image_url").toString());
            }

            return R.ok(eventDetailsVO);
@@ -280,6 +280,7 @@
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
                eventResourceDO.setResourceName(commonEventAddDTO.getAudio().substring(commonEventAddDTO.getAudio().lastIndexOf("/")+1));
                int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (audioAdd != 1) {
                    throw new ServiceException("添加音频失败");
@@ -294,6 +295,7 @@
                eventResourceDO.setRefId(eventDO.getId());
                eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
                eventResourceDO.setResourceName(commonEventAddDTO.getVideo().substring(commonEventAddDTO.getVideo().lastIndexOf("/")+1));
                int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                if (videoAdd != 1) {
                    throw new ServiceException("添加视频失败");
@@ -309,6 +311,7 @@
                    eventResourceDO.setUrl(pica[i]);
                    eventResourceDO.setRefId(eventDO.getId());
                    eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
                    eventResourceDO.setResourceName(pica[i].substring(pica[i].lastIndexOf("/")+1));
                    int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
                    if (picAdd != 1) {
                        throw new ServiceException("添加图片失败");
@@ -515,6 +518,8 @@
        eventDO.setUpdateBy(eventRevokeDTO.getUserId());
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
        eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated == 1) {
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
@@ -531,10 +536,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("事件不是待处理状态");
@@ -1180,6 +1185,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);
        }
@@ -1257,12 +1267,12 @@
            if (eventDO.getEventCategory() == 1) {
                boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
                if (!canRevoke) {
                    return R.fail("当前事件不是上报状态，不允许标为无效");
                    return R.fail("当前事件不是上报状态，不允许撤销");
                }
            } else if (eventDO.getEventCategory() == 2) {
                boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
                if (!canRevoke) {
                    return R.fail("当前事件不是发布状态，不允许标为无效");
                    return R.fail("当前事件不是发布状态，不允许撤销");
                }
            } else {
                return R.fail("");
@@ -1276,6 +1286,8 @@
        eventDO.setEventStatus(4);//4、撤销
        eventDO.setProcessType(1);//网格员处理
        eventDO.setCommunityProcess(0);//非 社区处理
        eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
        eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
        int updated = this.getBaseMapper().updateById(eventDO);
        if (updated == 1) {
            addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(), 1, "标为无效", eventRevokeDTO.getCommunityId(), eventRevokeDTO.getCommunityName(), 4);
@@ -1506,7 +1518,7 @@
                .orderByDesc(EventTransferRecordDO::getCreateAt)
        );
        EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
        if (list != null || list.size() > 0) {
        if (list != null && list.size() > 0) {
            EventTransferRecordDO lastRecord = list.get(0);
            eventTransferRecordDO.setFromType(lastRecord.getToType());
            eventTransferRecordDO.setFromId(lastRecord.getToId());
@@ -1576,10 +1588,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 +1657,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(",");
@@ -1771,15 +1784,15 @@
                    throw new ServiceException("id为" + id + "的事件不存在");
                }
                if (eventDO.getEventCategory() != null) {
                    if (eventDO.getEventCategory() == 1) {
                    if (eventDO.getEventCategory() == 1) {//
                        boolean canRevoke = eventDO.getEventDealStatus() == 3; //上报状态
                        if (!canRevoke) {
                            throw new ServiceException("当前事件不是上报状态，不允许标为无效");
                            throw new ServiceException("当前事件不是上报状态，不允许撤销");
                        }
                    } else if (eventDO.getEventCategory() == 2) {
                    } else if (eventDO.getEventCategory() == 2) {//宣传教育
                        boolean canRevoke = eventDO.getEventDealStatus() == 8; //发布状态
                        if (!canRevoke) {
                            throw new ServiceException("当前事件不是发布状态，不允许标为无效");
                            throw new ServiceException("当前事件不是发布状态，不允许撤销");
                        }
                    } else {
                        throw new ServiceException("事件分类错误");