bug修改

zhanghua

2023-10-23 252b4943e54f7ef930f7f7ea01ad1a8a29655dcf

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

@@ -1,5 +1,6 @@
package com.ycl.controller.caseHandler;

import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -20,11 +21,13 @@
import com.ycl.entity.caseHandler.BaseCaseDetail;
import com.ycl.entity.caseHandler.DisposeRecord;
import com.ycl.entity.resources.ImageResources;
import com.ycl.entity.resources.VideoResources;
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.service.resources.IVideoResourcesService;
import com.ycl.utils.EasyExcelUtils;
import com.ycl.vo.casePool.QueryForViolationVO;
import io.swagger.annotations.Api;
@@ -73,6 +76,9 @@
    @Autowired
    IImageResourcesService iImageResourcesService;

    @Autowired
    IVideoResourcesService iVideoResourcesService;


    @Autowired
    public void setBaseCaseService(IBaseCaseService baseCaseService) {
@@ -80,11 +86,11 @@
    }

    @ApiOperation(value = "上传市平台")
    @PostMapping("/upload-event")
    public CommonResult uploadEvent(@RequestParam Long caseId, CommonResult<Object> success) {
    @PostMapping("/upload-event/{caseId}")
    public CommonResult uploadEvent(@PathVariable Long caseId) {
        String msg = baseCaseService.uploadEvent(caseId);
        if (StringUtils.isEmpty(msg)) {
            return success;
            return CommonResult.success(msg);
        } else {
            return CommonResult.failed(msg);
        }
@@ -233,19 +239,34 @@
        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());
        // 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);
        if (CollUtil.isNotEmpty(violationParam.getImageUrls())) {
            for (int i = 0; i < violationParam.getImageUrls().size(); i++) {
                ImageResources imageResources = new ImageResources();
                imageResources.setType("01");
                imageResources.setBelongToId(baseCase.getId());
                imageResources.setUrl(violationParam.getImageUrls().get(i));
                imageResources.setCreateTime(LocalDateTime.now());
                imageResources.setCreateUser(user.getUserId());
                iImageResourcesService.save(imageResources);
            }
        }

        if (CollUtil.isNotEmpty(violationParam.getVideoUrls())) {
            VideoResources videoResources = new VideoResources();
            videoResources.setCreateTime(LocalDateTime.now());
            videoResources.setType("1");
            videoResources.setCreateUser(user.getUserId());
            videoResources.setBelongToId(baseCase.getId().intValue());
            StringBuilder sb1 = new StringBuilder("");
            violationParam.getImageUrls().forEach(item -> {
                sb1.append(",").append(item);
            });
            videoResources.setUrl(sb1.substring(1, sb1.length() - 1));
            iVideoResourcesService.save(videoResources);
        }
        return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
    }

@@ -269,6 +290,49 @@
        baseCase.setAlarmTime(LocalDateTime.parse(illegalBuildingParam.getAlarmTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
        baseCase.setCreateTime(LocalDateTime.now());
        baseCaseService.save(baseCase);

        // if (CollUtil.isNotEmpty(illegalBuildingParam.getImageUrls())) {
        //     ImageResources imageResources = new ImageResources();
        //     imageResources.setCreateTime(LocalDateTime.now());
        //     imageResources.setType("1");
        //     AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        //     imageResources.setCreateUser(user.getUserId());
        //     imageResources.setBelongToId(baseCase.getId());
        //     StringBuilder sb1 = new StringBuilder("");
        //     illegalBuildingParam.getImageUrls().forEach(item -> {
        //         sb1.append(",").append(item);
        //     });
        //     imageResources.setUrl(sb1.substring(1, sb1.length() - 1));
        //     imageResourcesService.save(imageResources);
        // }

        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        if (CollUtil.isNotEmpty(illegalBuildingParam.getImageUrls())) {
            for (int i = 0; i < illegalBuildingParam.getImageUrls().size(); i++) {
                ImageResources imageResources = new ImageResources();
                imageResources.setType("01");
                imageResources.setBelongToId(baseCase.getId());
                imageResources.setUrl(illegalBuildingParam.getImageUrls().get(i));
                imageResources.setCreateTime(LocalDateTime.now());
                imageResources.setCreateUser(user.getUserId());
                iImageResourcesService.save(imageResources);
            }
        }

        if (CollUtil.isNotEmpty(illegalBuildingParam.getVideoUrls())) {
            VideoResources videoResources = new VideoResources();
            videoResources.setCreateTime(LocalDateTime.now());
            videoResources.setType("01");
            user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
            videoResources.setCreateUser(user.getUserId());
            videoResources.setBelongToId(baseCase.getId().intValue());
            StringBuilder sb2 = new StringBuilder("");
            illegalBuildingParam.getImageUrls().forEach(item -> {
                sb2.append(",").append(item);
            });
            videoResources.setUrl(sb2.substring(1, sb2.length() - 1));
            iVideoResourcesService.save(videoResources);
        }
        return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
    }

@@ -380,15 +444,18 @@

    @ApiOperation(value = "查询案卷")
    @GetMapping("/query_case")
    public CommonResult queryCase(@RequestParam Integer pageSize,
                                  @RequestParam Integer current,
                                  @RequestParam(required = false) String number,
                                  @RequestParam(required = false) Integer communityId,
                                  @RequestParam(required = false) Integer categories,
                                  @RequestParam(required = false) String startTime,
                                  @RequestParam(required = false) String endTime,
                                  @RequestParam(required = false) String site) {
        return CommonResult.success(baseCaseService.selectPage(new Page<BaseCase>().setCurrent(current).setSize(pageSize), number, communityId, categories, startTime, endTime, site));
    public CommonResult<Page<BaseCase>> queryCase(@RequestParam Integer pageSize,
                                                  @RequestParam Integer current,
                                                  @RequestParam(required = false) String number,
                                                  @RequestParam(required = false) Integer communityId,
                                                  @RequestParam(required = false) Integer categories,
                                                  @RequestParam(required = false) String startTime,
                                                  @RequestParam(required = false) String endTime,
                                                  @RequestParam(required = false) Integer state,
                                                  @RequestParam(required = false) Integer time,
                                                  @RequestParam(required = false) Integer streetId,
                                                  @RequestParam(required = false) String site) {
        return CommonResult.success(baseCaseService.selectPage(new Page<BaseCase>().setCurrent(current).setSize(pageSize), number, communityId, categories, startTime, endTime, site, state, streetId, time));
    }

    @GetMapping("/query_for_violation")