Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-30 e986bd63309fba70f7f3cfaf70aadec46220917b

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

@@ -7,8 +7,8 @@
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.controller.video.common.constant.BaseCaseStatus;
import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.util.UtilNumber;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.VideoInspectParam;
@@ -86,7 +86,7 @@
     * @Description query illegal building and violation
     * @Param [size, current, state, type, resource]
     **/
    @ApiOperation(value = "查询违规违建")
/*    @ApiOperation(value = "查询违规违建")
    @GetMapping("/query")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "state", value = "处理状态(0-待处理1-误报2-上报3-再学习/再训练4暂不处理5立案6调度7处置8核查9结案)", dataType = "Integer"),
@@ -112,6 +112,46 @@
            return CommonResult.success(queryList);
        }
        return CommonResult.failed("request parameter is null");
    }*/
    @ApiOperation(value = "查询违规违建")
    @GetMapping("/query")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "state", value = "处理状态(0-待处理1-误报2-上报3-再学习/再训练4暂不处理5立案6调度7处置8核查9结案)", dataType = "Integer"),
            @ApiImplicitParam(name = "type", value = "1 违规,2 违建", dataType = "Integer"),
            @ApiImplicitParam(name = "resource", value = "1 视频,2 手动", dataType = "Integer"),
            @ApiImplicitParam(name = "code", dataType = "String"),
            @ApiImplicitParam(name = "categoryBig", dataType = "String"),
            @ApiImplicitParam(name = "categorySmall", dataType = "String"),
            @ApiImplicitParam(name = "street", dataType = "Integer"),
            @ApiImplicitParam(name = "site", dataType = "String"),
            @ApiImplicitParam(name = "startTime", dataType = "String"),
            @ApiImplicitParam(name = "endTime", dataType = "String")

    })
    public CommonResult searchViolation(@RequestParam Integer size,
                                        @RequestParam Integer current,
                                        @RequestParam(required = false) Integer state,
                                        @RequestParam Integer type,
                                        @RequestParam(required = false) Integer resource,
                                        @RequestParam(required = false) String code,
                                        @RequestParam(required = false) String categoryBig,
                                        @RequestParam(required = false) String categorySmall,
                                        @RequestParam(required = false) Integer street,
                                        @RequestParam(required = false) String site,
                                        @RequestParam(required = false) String startTime,
                                        @RequestParam(required = false) String endTime,
                                        @RequestParam(required = false) Integer violationsTypeId,
                                        @RequestParam(required = false) Integer videoId) {

        Page<Object> queryList;
        if (type == 1) {
            queryList = baseCaseService.listViolationsPage(current, size, state, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId, videoId);
        } else if (type == 2) {
            queryList = baseCaseService.listIllegalBuilding(current, size, state, resource);
        } else {
            return CommonResult.failed("bad request url");
        }
        return CommonResult.success(queryList);
    }

    /**
@@ -247,7 +287,7 @@

    @ApiOperation(value = "案件批在学习")
    @PutMapping("/batch_case_study")
    public CommonResult batchHandCaseByStudy(@RequestBody List<Long> ids) {
    public CommonResult batchHandCaseByStudy(@RequestParam List<Long> ids) {
        ids.stream().forEach(item ->
        {
            BaseCase baseCase = new BaseCase();
@@ -260,7 +300,7 @@

    @ApiOperation(value = "案件批暂不处理")
    @PutMapping("/batch_case_Ignore")
    public CommonResult batchHandCaseByIgnore(@RequestBody List<Long> ids) {
    public CommonResult batchHandCaseByIgnore(@RequestParam List<Long> ids) {
        ids.stream().forEach(item ->
        {
            BaseCase baseCase = new BaseCase();
@@ -268,6 +308,24 @@
            baseCase.setState(4);
            baseCaseService.updateById(baseCase);
        });
        return CommonResult.success("success");
    }

    @ApiOperation(value = "调度管理-批量删除")
    @DeleteMapping("/batch_case_delete")
    public CommonResult batchCaseDelete(@RequestParam List<Long> ids) {
        ids.forEach(
                item -> {
                    BaseCase baseCase = baseCaseService.getOne(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getId, item));
                    if (baseCase.getCategory() == 1) {
                        violationsService.removeById(item);
                        baseCaseService.removeById(item);
                    } else {
                        illegalBuildingService.removeById(item);
                        baseCaseService.removeById(item);
                    }
                }
        );
        return CommonResult.success("success");
    }

@@ -283,7 +341,7 @@
        Integer state = iDisposeRecordService
                .list(new LambdaQueryWrapper<DisposeRecord>()
                        .eq(DisposeRecord::getBaseCaseId, caseId).
                        orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
                                orderByDesc(DisposeRecord::getCreateTime)).get(firstNum).getState();
        return CommonResult.success(baseCaseService
                .update(new LambdaUpdateWrapper<BaseCase>()
                        .eq(BaseCase::getId, caseId)
@@ -326,8 +384,12 @@

    @GetMapping("/video_inspection")
    @ApiOperation("预警研判")
    public CommonResult searchVideoInspection(@RequestParam Integer current) {
        return CommonResult.success(baseCaseService.selectVideoInspection(current));
    public CommonResult searchVideoInspection(@RequestParam Integer current,
                                              @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, gradeId, videoId, beginTime, endTime));
    }

    @GetMapping("/video_inspection/Count")