bug修改

zhanghua

2023-06-12 905296d89c10d770cb613fd93f1ca4aa687754ce

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

@@ -1,14 +1,17 @@
package com.ycl.controller.caseHandler;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.video.common.constant.BaseCaseStatus;
import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
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;
@@ -16,10 +19,12 @@
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.BaseCaseDetail;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.entity.resources.ImageResources;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDisposeRecordService;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.resources.IImageResourcesService;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.vo.casePool.QueryForViolationVO;
import io.swagger.annotations.Api;
@@ -28,6 +33,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -64,6 +70,9 @@
    @Autowired
    UtilNumber utilNumber;

    @Autowired
    IImageResourcesService iImageResourcesService;


    @Autowired
    public void setBaseCaseService(IBaseCaseService baseCaseService) {
@@ -86,7 +95,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"),
@@ -99,22 +108,59 @@
                                        @RequestParam(required = false) Integer type,
                                        @RequestParam(required = false) Integer resource) {
        if (state != null) {
            Page<Object> page = new Page<>();
            page.setCurrent(current);
            page.setSize(size);
            Page<Object> queryList;
            Integer violation = 1;
            Integer illegalBuilding = 2;
            if (type == violation) {
                queryList = baseCaseService.listViolationsPage(page, state, resource);
                queryList = baseCaseService.listViolationsPage(new Page<>().setCurrent(current).setSize(size), state, resource);
            } else if (type == illegalBuilding) {
                queryList = baseCaseService.listIllegalBuilding(page, state, resource);
                queryList = baseCaseService.listIllegalBuilding(new Page<>().setCurrent(current).setSize(size), state, resource);
            } else {
                return CommonResult.failed("bad request url");
            }
            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);
    }

    /**
@@ -174,7 +220,7 @@
     **/
    @ApiOperation(value = "添加违规案件")
    @PostMapping("/addition_violation")
    @LogSave(operationType = "事项处置管理", contain = "新增违建案件")
    @LogSave(operationType = "事项处置管理", contain = "新增违规案件")
    public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
        Integer violation = 1;
        Integer resource = 2;
@@ -187,6 +233,19 @@
        baseCase.setAlarmTime(LocalDateTime.parse(violationParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        baseCase.setCreateTime(LocalDateTime.now());
        baseCaseService.save(baseCase);
        JSONArray arr = JSON.parseArray(baseCase.getPic());
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();

        for (int i = 0; i < arr.size(); i++) {
            ImageResources imageResources = new ImageResources();
            imageResources.setType("01");
            imageResources.setBelongToId(baseCase.getId());
            imageResources.setUrl(arr.getString(i));
            imageResources.setCreateTime(LocalDateTime.now());
            imageResources.setCreateUser(user.getUserId());
            iImageResourcesService.save(imageResources);
        }

        return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
    }

@@ -197,7 +256,7 @@
     **/
    @ApiOperation(value = "添加违建案件")
    @PostMapping("/addition_illegal_building")
    @LogSave(operationType = "事项处置管理", contain = "新增违规案件")
    @LogSave(operationType = "事项处置管理", contain = "新增违建案件")
    public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
        Integer illegalBuilding = 2;
        Integer resource = 2;
@@ -246,6 +305,50 @@
                .update(new LambdaUpdateWrapper<BaseCase>()
                        .eq(BaseCase::getId, caseId)
                        .set(BaseCase::getState, state)));
    }

    @ApiOperation(value = "案件批在学习")
    @PutMapping("/batch_case_study")
    public CommonResult batchHandCaseByStudy(@RequestParam List<Long> ids) {
        ids.stream().forEach(item ->
        {
            BaseCase baseCase = new BaseCase();
            baseCase.setId(item);
            baseCase.setState(3);
            baseCaseService.updateById(baseCase);
        });
        return CommonResult.success("success");
    }

    @ApiOperation(value = "案件批暂不处理")
    @PutMapping("/batch_case_Ignore")
    public CommonResult batchHandCaseByIgnore(@RequestParam List<Long> ids) {
        ids.stream().forEach(item ->
        {
            BaseCase baseCase = new BaseCase();
            baseCase.setId(item);
            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");
    }

    /**
@@ -303,19 +406,30 @@

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

    @GetMapping("/video_inspection/{id}")
    @ApiOperation("预警研判详情")
    public CommonResult getVideoInspection(@PathVariable Long id) {
        return CommonResult.success(baseCaseService.getById(id));
    }

    @GetMapping("/video_inspection/Count")
    @ApiOperation("预警研判左上角待审核案件,今日审核,今日在学习")
    public CommonResult searchCount(){
        return  CommonResult.success(baseCaseService.selectCount());
    public CommonResult searchCount() {
        return CommonResult.success(baseCaseService.selectCount());
    }

    @PutMapping("/video_inspection")
    @ApiOperation("预警研判确定")
    public CommonResult searchCount(@RequestBody VideoInspectParam violationParam){
        return  CommonResult.success(baseCaseService.updateCase(violationParam));
    public CommonResult searchCount(@RequestBody VideoInspectParam violationParam) {
        return CommonResult.success(baseCaseService.updateCase(violationParam));
    }
}