Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-04 38b44e0c9996f06524903417f1d0a3f746b4550b

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -143,12 +143,13 @@
                medias = stringBuilder.toString();
            }
        }
        eventDesc += "[大华视频接入测试]";
        EventAddParamDto dto = EventAddParamDto.builder().y84(baseCase.getLatitude() != null ? baseCase.getLatitude().toString() : "").x84(baseCase.getLongitude() != null ? baseCase.getLongitude().toString() : "").source(11).address(baseCase.getSite()).eventDesc(eventDesc).eventSign(baseCase.getCode()).medias(medias).build();
        String msg = cityPlatformService.addEvent(dto);
        ResultResponseDto result = JSONObject.parseObject(msg, ResultResponseDto.class);
        if (result.getCode() == 0) {
            EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
            baseCase.setTaskCode(responseDto.getTaskcode());
//            EventAddResponseDto responseDto = JSONObject.parseObject(result.getResult(), EventAddResponseDto.class);
            baseCase.setTaskCode(result.getResult());
            this.updateById(baseCase);
            return null;
        } else {
@@ -406,21 +407,48 @@
        LocalDateTime now = LocalDateTime.now();
        if (Objects.nonNull(time) && time == 0) {
            end = now;
            start = now.plusWeeks(1);
            start = now.minusWeeks(1);

        }
        if (Objects.nonNull(time) && time == 1) {
            end = now;
            start = now.plusMonths(1);
            start = now.minusMonths(1);

        }
        if (Objects.nonNull(time) && time == 2) {
            end = now;
            start = now.plusMonths(3);
            start = now.minusMonths(3);
        }
        Page<BaseCase> baseCasePage = baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, start, end, site, state, streetId);
        if (Objects.isNull(baseCasePage) && CollUtil.isNotEmpty(baseCasePage.getRecords())) {
        if (!Objects.isNull(baseCasePage) && CollUtil.isNotEmpty(baseCasePage.getRecords())) {
            List<BaseCase> records = baseCasePage.getRecords();
            //TODO:将状态state改为状态名stateName
            records.stream().forEach(baseCase -> {
                Integer stateInt = baseCase.getState();
                if (stateInt == 0) {
                    baseCase.setStateName("待处理");
                } else if (stateInt == 1) {
                    baseCase.setStateName("报警");
                } else if (stateInt == 2) {
                    baseCase.setStateName("上报");
                } else if (stateInt == 3) {
                    baseCase.setStateName("在学习");
                } else if (stateInt == 4) {
                    baseCase.setStateName("暂不处理");
                } else if (stateInt == 5) {
                    baseCase.setStateName("立案");
                } else if (stateInt == 6) {
                    baseCase.setStateName("调度");
                } else if (stateInt == 7) {
                    baseCase.setStateName("处置");
                } else if (stateInt == 8) {
                    baseCase.setStateName("核查");
                } else if (stateInt == 9) {
                    baseCase.setStateName("结案");
                } else if (stateInt == 10) {
                    baseCase.setStateName("待上报");
                }
            });
            Set<Long> caseIds = records.stream().map(BaseCase::getId).collect(Collectors.toSet());
            Map<Long, String> urlMap = imageResourcesService.getUrlMap(caseIds, "01");
            records.stream().forEach(item -> {
@@ -445,8 +473,8 @@
    }

    @Override
    public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime) {
        return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime);
    public Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime, Integer type) {
        return baseCaseMapper.selectVideoInspection(new Page<>(current, pageSize), gradeId, videoId, beginTime, endTime, type);
    }

    @Override