zhanghua
2023-11-29 704e7207d74b6477c5f472c5aba92d484ab17f98
Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
2个文件已修改
26 ■■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/BaseCaseController.java
@@ -230,6 +230,13 @@
    @PostMapping("/addition_violation")
    @LogSave(operationType = "事项处置管理", contain = "新增违规案件")
    public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
        log.info("---------------->参数,报警时间{},限时{},对象{}", violationParam.getAlarmTime(), violationParam.getLimitTime(), violationParam);
        if (violationParam.getAlarmTime() != null) {
            violationParam.setAlarmTime(violationParam.getAlarmTime().replace("/", "-"));
        }
        if (violationParam.getLimitTime() != null) {
            violationParam.setLimitTime(violationParam.getLimitTime().replace("/", "-"));
        }
        Integer violation = 1;
        Integer resource = 2;
        BaseCase baseCase = new BaseCase();
@@ -281,6 +288,13 @@
    @PostMapping("/addition_illegal_building")
    @LogSave(operationType = "事项处置管理", contain = "新增违建案件")
    public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
        log.info("---------------->参数,报警时间{},限时{},对象{}", illegalBuildingParam.getAlarmTime(), illegalBuildingParam.getLimitTime(), illegalBuildingParam);
        if (illegalBuildingParam.getAlarmTime() != null) {
            illegalBuildingParam.setAlarmTime(illegalBuildingParam.getAlarmTime().replace("/", "-"));
        }
        if (illegalBuildingParam.getLimitTime() != null) {
            illegalBuildingParam.setLimitTime(illegalBuildingParam.getLimitTime().replace("/", "-"));
        }
        Integer illegalBuilding = 2;
        Integer resource = 2;
        BaseCase baseCase = new BaseCase();
@@ -314,7 +328,7 @@
                ImageResources imageResources = new ImageResources();
                imageResources.setType("01");
                imageResources.setBelongToId(baseCase.getId());
                imageResources.setUrl(illegalBuildingParam.getImageUrls().get(i));
                imageResources.setUrl(illegalBuildingParam.getImageUrls().toString());
                imageResources.setCreateTime(LocalDateTime.now());
                imageResources.setCreateUser(user.getUserId());
                iImageResourcesService.save(imageResources);
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java
@@ -21,6 +21,7 @@
import com.ycl.service.caseHandler.*;
import com.ycl.service.resources.IImageResourcesService;
import com.ycl.vo.MyBacklogVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,7 @@
 * @since 2022-09-24
 */
@Service
@Slf4j
public class DisposeRecordServiceImpl extends ServiceImpl<DisposeRecordMapper, DisposeRecord> implements IDisposeRecordService {
    @Resource
@@ -101,6 +103,14 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean saveOrUpdateUpload(UploadDisposingResultParam uploadDisposingResultParam) {
        log.info("参数------------------>{}",uploadDisposingResultParam);
        if (uploadDisposingResultParam.getArrivalTime() != null) {
            uploadDisposingResultParam.setArrivalTime(uploadDisposingResultParam.getArrivalTime().replace("/", "-"));
        }
        if (uploadDisposingResultParam.getInvestigationTime() != null) {
            uploadDisposingResultParam.setInvestigationTime(uploadDisposingResultParam.getInvestigationTime().replace("/", "-"));
        }
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        List<ArrivalSituation> list = iArrivalSituationService.list(new LambdaQueryWrapper<ArrivalSituation>().eq(ArrivalSituation::getBaseCaseId, uploadDisposingResultParam.getCaseId()));
        if (!list.isEmpty()) {