快速下发丢弃最近半小时，monitorvo增加deviceType

xiangpei

2024-08-31 03f8996994c1334f6dda1a7a131561d6f0736c2f

快速下发丢弃最近半小时，monitorvo增加deviceType

 ycl-common/src/main/java/enumeration/general/FastDistributeTypeEnum.java

@@ -12,7 +12,6 @@
@Getter
public enum FastDistributeTypeEnum {

    LAST_HALF_HOUR("LAST_HALF_HOUR", "最近半小时"),
    LAST_HOUR("LAST_HOUR", "最近一小时"),
    LAST_TWO_HOUR("LAST_TWO_HOUR", "最近两小时"),
    LAST_DAY("LAST_DAY", "最近一天"),

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DistributeWorkOrderVO.java

@@ -30,7 +30,7 @@
    /**
     * 快速下发方式
     */
   @NotNull(message = "请选择快捷下发方式")
    @NotNull(message = "请选择快捷下发方式")
    private FastDistributeTypeEnum fastWay;

    /**

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java

@@ -267,4 +267,10 @@
     * 动态列
     */
    private List<DynamicColumnVO> dynamicColumnList;

    /**
     * 设备厂商： 0海康  1大华  2宇视
     */
    private Integer deviceType;

}

 ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java

@@ -124,7 +124,7 @@
    }

    @PostMapping("/distribute/ids")
    @ApiOperation(value = "下发选择", notes = "下发选择")
    @ApiOperation(value = "下发选择的工单", notes = "下发选择选择的工单")
    @PreAuthorize("@ss.hasPermi('work:order:distribute')")
    public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
        return workOrderService.selectedIdsDistribute(query);

 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java

@@ -489,9 +489,6 @@
        LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
        data.setEnd(now);
        switch (data.getFastWay()) {
            case LAST_HALF_HOUR:
                data.setStart(now.minusMinutes(30));
                break;
            case LAST_HOUR:
                data.setStart(now.minusHours(1));
                break;
@@ -501,8 +498,12 @@
            case LAST_DAY:
                data.setStart(now.minusDays(1));
                break;
            default:
                break;
           }

        if (Objects.isNull(data.getStart())) {
            throw new RuntimeException("无法生成快速下发的时间范围，请选择正确的快速下发方式");
        }
        // 查询符合条件的工单
        List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
                .select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)