修改

zhanghua

2022-12-07 c8c898b2d1c9f7b9b2d8b6f4f30c0f76c1470ccd

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java

@@ -11,6 +11,8 @@
import com.ycl.controller.video.common.constant.BaseCaseStatus;
import com.ycl.controller.video.common.constant.StepName;
import com.ycl.controller.video.common.util.DateUtil;
import com.ycl.controller.video.common.util.UtilNumber;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
@@ -25,6 +27,7 @@
import com.ycl.remote.dto.*;
import com.ycl.remote.service.CityPlatformService;
import com.ycl.service.caseHandler.IBaseCaseService;
import com.ycl.service.caseHandler.IDispatchHandleService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.vo.casePool.*;
@@ -58,6 +61,7 @@
    private CityPlatformService cityPlatformService;
    private IViolationsService violationsService;
    private IVideoAlarmReportService videoAlarmReportService;


    @Value("${fdfs.fileUrl}")
    private String fileUrl;
@@ -106,9 +110,18 @@
    @Resource
    PartyInfoMapper partyInfoMapper;

    @Resource
    UtilNumber utilNumber;

    @Resource
    IDispatchHandleService iDispatchHandleService;

    @Resource
    IBaseCaseService baseCaseService;


    @Override
    public String uploadEvent(Integer caseId) {
    public String uploadEvent(Long caseId) {
        BaseCase baseCase = this.getById(caseId);
        Violations violations = violationsService.getById(caseId);
        String medias = "";
@@ -195,12 +208,11 @@
        stepQuery.eq("name", stepName);
        WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQuery);

        Integer state = 0;
        DisposeRecord disposeRecord = new DisposeRecord();
        disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId());
        disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId());
        disposeRecord.setBaseCaseId(id);
        disposeRecord.setState(state);
        disposeRecord.setState(1);
        disposeRecord.setCreateTime(LocalDateTime.now());
        AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        disposeRecord.setCreateUser(userDetails.getUserId());
@@ -376,8 +388,8 @@
    }

    @Override
    public Page<BaseCase> selectPage(Page<BaseCase> page, String number, Integer communityId, Integer categories, String startTime, String endTime, String site) {
        return baseCaseMapper.selectBaseCasePage(page, number, communityId, categories, startTime, endTime, site);
    public Page<BaseCase> selectPage(Page<BaseCase> page, String number, Integer streetId, Integer categories, String startTime, String endTime, String site) {
        return baseCaseMapper.selectBaseCasePage(page, number, streetId, categories, startTime, endTime, site);
    }

    @Override
@@ -390,7 +402,7 @@

    @Override
    public List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam) {
        return  baseCaseMapper.selectViolationPage(queryForViolationParam);
        return baseCaseMapper.selectViolationPage(queryForViolationParam);
    }

    @Override
@@ -412,10 +424,22 @@
        BaseCase baseCase = new BaseCase();
        BeanUtils.copyProperties(violationParam, baseCase);
        baseCase.setId(violationParam.getBaseId());
        baseCase.setCode(utilNumber.createCaseCode());
        baseCaseMapper.updateById(baseCase);
        Violations violations = new Violations();
        BeanUtils.copyProperties(violationParam, violations);
        violations.setId(violations.getId());
        return violationsMapper.updateById(violations) == 1 ? true : false;
        if (violationParam.getState() == 6) {
            AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
            violationParam.setCreateUser(user.getUserId());
            DispatchInfoParam dispatchInfoParam = new DispatchInfoParam();
            BeanUtils.copyProperties(violationParam, dispatchInfoParam);
            dispatchInfoParam.setBaseCaseId(violationParam.getBaseId());
            iDispatchHandleService.dispatch(dispatchInfoParam);
        }
        if (violationParam.getState() == 2) {
            baseCaseService.uploadEvent(violationParam.getBaseId());
        }
        return violationsMapper.insert(violations) == 1 ? true : false;
    }
}