Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-04 38b44e0c9996f06524903417f1d0a3f746b4550b

 ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java

@@ -230,6 +230,13 @@
    @PostMapping("/addition_violation")
    @LogSave(operationType = "事项处置管理", contain = "新增违规案件")
    public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
        log.info("---------------->参数,报警时间{},限时{},对象{}", violationParam.getAlarmTime(), violationParam.getLimitTime(), violationParam);
        if (violationParam.getAlarmTime() != null) {
            violationParam.setAlarmTime(violationParam.getAlarmTime().replace("/", "-"));
        }
        if (violationParam.getLimitTime() != null) {
            violationParam.setLimitTime(violationParam.getLimitTime().replace("/", "-"));
        }
        Integer violation = 1;
        Integer resource = 2;
        BaseCase baseCase = new BaseCase();
@@ -281,6 +288,13 @@
    @PostMapping("/addition_illegal_building")
    @LogSave(operationType = "事项处置管理", contain = "新增违建案件")
    public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
        log.info("---------------->参数,报警时间{},限时{},对象{}", illegalBuildingParam.getAlarmTime(), illegalBuildingParam.getLimitTime(), illegalBuildingParam);
        if (illegalBuildingParam.getAlarmTime() != null) {
            illegalBuildingParam.setAlarmTime(illegalBuildingParam.getAlarmTime().replace("/", "-"));
        }
        if (illegalBuildingParam.getLimitTime() != null) {
            illegalBuildingParam.setLimitTime(illegalBuildingParam.getLimitTime().replace("/", "-"));
        }
        Integer illegalBuilding = 2;
        Integer resource = 2;
        BaseCase baseCase = new BaseCase();
@@ -314,7 +328,7 @@
                ImageResources imageResources = new ImageResources();
                imageResources.setType("01");
                imageResources.setBelongToId(baseCase.getId());
                imageResources.setUrl(illegalBuildingParam.getImageUrls().get(i));
                imageResources.setUrl(illegalBuildingParam.getImageUrls().toString());
                imageResources.setCreateTime(LocalDateTime.now());
                imageResources.setCreateUser(user.getUserId());
                iImageResourcesService.save(imageResources);
@@ -477,11 +491,12 @@
    @ApiOperation("预警研判")
    public CommonResult searchVideoInspection(@RequestParam Integer current,
                                              @RequestParam Integer pageSize,
                                              @RequestParam(required = false) Integer type,
                                              @RequestParam(required = false) Long gradeId,
                                              @RequestParam(required = false) Long videoId,
                                              @RequestParam(required = false) String beginTime,
                                              @RequestParam(required = false) String endTime) {
        return CommonResult.success(baseCaseService.selectVideoInspection(current, pageSize, gradeId, videoId, beginTime, endTime));
        return CommonResult.success(baseCaseService.selectVideoInspection(current, pageSize, gradeId, videoId, beginTime, endTime, type));
    }

    @GetMapping("/video_inspection/{id}")