Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-01-09 a73593d70d59af01bc6afcd55ba817e319d228df

 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;
@@ -247,7 +247,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 +260,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();
@@ -271,6 +271,24 @@
        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");
    }

    /**
     * @return com.ycl.api.CommonResult
     * @Description reset case