细节调整

wl

2022-09-30 7fc6a36e9e336554a15e3d6c13d04dad0300cbc1

细节调整

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

@@ -13,9 +13,10 @@
import com.ycl.service.caseHandler.IDisposeRecordService;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
import com.ycl.vo.casePool.CasePoolViolationVO;
import io.swagger.annotations.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -23,6 +24,7 @@

import java.util.Arrays;
import java.util.List;
import java.util.UUID;


/**
@@ -72,23 +74,24 @@
     * @Param [size, current, state, type, resource]
     **/
    @ApiOperation(value = "查询违规违建")
    @GetMapping("/query/{type}")
    @GetMapping("/query")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "state", value = "处理状态(0误报 1上报 2立案 3派遣 4处置 5核查 6结案7处理中)", dataType = "Integer"),
            @ApiImplicitParam(name = "type", value = "01 违规,02 违建", dataType = "Integer")
            @ApiImplicitParam(name = "type", value = "1 违规,2 违建", dataType = "Integer"),
            @ApiImplicitParam(name = "resource", value = "1 视频,2 手动", dataType = "Integer")
    })
    public CommonResult searchViolation(@RequestParam Integer size,
                                        @RequestParam Integer current,
                                        @RequestParam Integer state,
                                        @PathVariable(value = "type") Integer type,
                                        @RequestParam Integer resource) {
                                        @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 = 01;
            Integer illegalBuilding = 02;
            Integer violation = 1;
            Integer illegalBuilding = 2;
            if (type == violation) {
                queryList = baseCaseService.listViolationsPage(page, state, resource);
            } else if (type == illegalBuilding) {
@@ -109,15 +112,11 @@
    @ApiOperation(value = "删除违规/违建案件")
    @DeleteMapping("/deletion")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "type", value = "01 违规,02 违建", dataType = "Integer")
    })
    @ApiResponses({
            @ApiResponse(code = 200, message = "成功", response = CasePoolViolationVO.class),
            @ApiResponse(code = 200, message = "成功", response = CasePoolIllegalBuildingVO.class),
            @ApiImplicitParam(name = "type", value = "1 违规,2 违建", dataType = "Integer")
    })
    public CommonResult removeCase(@RequestParam Integer id, @RequestParam Integer type) {
        Integer violationType = 01;
        Integer illegalBuildingType = 02;
        Integer violationType = 1;
        Integer illegalBuildingType = 2;
        if (id != null) {
            if (type == violationType) {
                return CommonResult.success(violationsService.removeById(id));
@@ -137,11 +136,11 @@
    @ApiOperation(value = "删除违规/违建案件")
    @DeleteMapping("/batch_deletion")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "type", value = "01 违规,02 违建", dataType = "Integer")
            @ApiImplicitParam(name = "type", value = "1 违规,2 违建", dataType = "Integer")
    })
    public CommonResult removeCases(@RequestParam String[] ids, @RequestParam Integer type) {
        Integer violationType = 01;
        Integer illegalBuildingType = 02;
        Integer violationType = 1;
        Integer illegalBuildingType = 2;
        List<String> idList = Arrays.asList(ids);
        if (!idList.isEmpty()) {
            if (type == violationType) {
@@ -162,8 +161,15 @@
    @ApiOperation(value = "添加违规案件")
    @PostMapping("/addition_violation")
    public CommonResult addViolationCase(@RequestBody @Validated ViolationParam violationParam) {
        Integer violation = 1;
        Integer resource = 2;
        Integer state = 7;
        BaseCase baseCase = new BaseCase();
        BeanUtils.copyProperties(violationParam, baseCase);
        baseCase.setEventSource(resource);
        baseCase.setCategory(violation);
        baseCase.setCode(UUID.randomUUID().toString());
        baseCase.setState(state);
        baseCaseService.save(baseCase);
        return CommonResult.success(baseCaseService.saveViolationCase(violationParam, baseCase.getId()));
    }
@@ -176,8 +182,15 @@
    @ApiOperation(value = "添加违建案件")
    @PostMapping("/addition_illegal_building")
    public CommonResult addIllegalBuildingCase(@RequestBody @Validated IllegalBuildingParam illegalBuildingParam) {
        Integer illegalBuilding = 2;
        Integer resource = 2;
        Integer state = 7;
        BaseCase baseCase = new BaseCase();
        BeanUtils.copyProperties(illegalBuildingParam, baseCase);
        baseCase.setCategory(illegalBuilding);
        baseCase.setEventSource(resource);
        baseCase.setCode(UUID.randomUUID().toString());
        baseCase.setState(state);
        baseCaseService.save(baseCase);
        return CommonResult.success(baseCaseService.saveIllegalBuildingCase(illegalBuildingParam, baseCase.getId()));
    }

 ycl-platform/src/main/java/com/ycl/dto/casePool/IllegalBuildingParam.java

@@ -1,19 +1,14 @@
package com.ycl.dto.casePool;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;

@Data
public class IllegalBuildingParam {
    /**
     * 问题类别（1-违规 2-违建）
     */
    @ApiModelProperty(value = "问题类别（1-违规 2-违建")
    @NotNull(message = "不允许问题类型为空")
    private Integer category;

    /**
     * 违建类别
@@ -24,12 +19,17 @@


    /**
     * 报警时间
     */
    @TableField("alarm_time")
    private LocalDateTime alarmTime;

    /**
     * 所属社区
     */
    @ApiModelProperty(value = "所属社区")
    @NotBlank(message = "不允许所属社区为空")
    private Integer communityId;



    /**

 ycl-platform/src/main/java/com/ycl/dto/casePool/ViolationParam.java

@@ -1,19 +1,15 @@
package com.ycl.dto.casePool;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;

@Data
public class ViolationParam {
    /**
     * 问题类别（1-违规 2-违建）
     */
    @ApiModelProperty(value = "问题类别（1-违规 2-违建")
    @NotNull(message = "不允许问题类型为空")
    private Integer category;

    /**
     * 大类
@@ -23,6 +19,12 @@
    private Integer categoryId;

    /**
     * 报警时间
     */
    @TableField("alarm_time")
    private LocalDateTime alarmTime;

    /**
     * 小类
     */
    @ApiModelProperty(value = "小类")

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

@@ -27,9 +27,8 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.Instant;
import java.time.Duration;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -91,8 +90,6 @@
    ImageResourcesMapper imageResourcesMapper;




    @Override
    public String uploadEvent(Integer caseId) {
        BaseCase baseCase = this.getById(caseId);
@@ -140,21 +137,20 @@
    @Override
    public Page listViolationsPage(Page page, Integer state, Integer resource) {
        Integer type = 01;
        Integer hours = 60;
        Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
        List<CasePoolViolationVO> violationVOList = violationsPage.getRecords().stream().map(item -> {
            CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
            BeanUtils.copyProperties(item, casePoolViolationVO);
            if (item.getCloseTime() == null) {
                long nowTime = System.currentTimeMillis();
                long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
                LocalDateTime continueTimes = Instant.ofEpochMilli(nowTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
                String continueTime = continueTimes.getHour() + "时" + continueTimes.getSecond() + "分钟";
                Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
                long minutes = duration.toMinutes() - (duration.toHours() * hours);
                String continueTime = duration.toHours() + "时" + minutes + "分钟";
                casePoolViolationVO.setContinueTime(continueTime);
            } else {
                long closeTime = item.getCloseTime().toEpochSecond(ZoneOffset.ofHours(8));
                long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
                LocalDateTime continueTimes = Instant.ofEpochMilli(closeTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
                String continueTime = continueTimes.getHour() + "时" + continueTimes.getSecond() + "分钟";
                Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
                long minutes = duration.toMinutes() - (duration.toHours() * hours);
                String continueTime = duration.toHours() + "时" + minutes + "分钟";
                casePoolViolationVO.setContinueTime(continueTime);
            }
            casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());