bugfixed

CeDo

2021-06-08 008182e62d19bff65673b0823ee0e6c53142817d

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

@@ -531,10 +531,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 +1180,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);
        }
@@ -1505,14 +1510,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());
@@ -1645,7 +1649,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(",");