Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-18 42cce7d9a859083818a0e10eb3b6c80385042e47

Merge remote-tracking branch 'origin/master'

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

@@ -48,7 +48,7 @@
     */
    @ApiModelProperty(value = "案件等级")
    @NotNull(message = "不允许案件等级为空")
    private Integer gradeId;
    private Long gradeId;

    /**
     * 所属街道

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

@@ -170,11 +170,11 @@
    }

    @Override
    public Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime,Integer violationsTypeId) {
    public Page listViolationsPage(Page page, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId) {
        Integer type = 01;
        Integer hours = 60;
        Integer day = 24;
        Page<CasePoolViolationVO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource, code, categoryBig, categorySmall, street, site, startTime, endTime,violationsTypeId);
        Page<CasePoolViolationVO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource, code, categoryBig, categorySmall, street, site, startTime, endTime, violationsTypeId);
        violationsPage.getRecords().stream().forEach(item -> {
            if (item.getCloseTime() == null) {
                Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
@@ -206,7 +206,7 @@
        Integer value = 1;
        violations.setId(id);
        setDisposeRecord(id, violationParam.getLimitTime());
        return violationsMapper.insert(violations) == value ? true : false;
        return violationsMapper.insert(violations) == value;
    }

    private void setDisposeRecord(Long id, String limitTime) {

 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml

@@ -356,7 +356,7 @@

    </select>
    <select id="areaCount" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO">
        SELECT t2.region_name,
        SELECT t2.region_name name,
               COUNT(1) AS count
        FROM
            `ums_base_case` t1

 ycl-platform/src/main/resources/mapper/unlawful/UnlawfulMapper.xml

@@ -96,7 +96,7 @@
        GROUP BY
        DATE_FORMAT(ubc.alarm_time,'%Y-%m-%d')
        ORDER BY
        DATE_FORMAT(ubc.alarm_time,'%Y-%m-%d')
        DATE_FORMAT(ubc.alarm_time,'%Y-%m-%d') desc
    </select>

    <select id="getDataByPoint" resultType="com.ycl.dto.statistics.UnlawfulDto">