排序

liuhaonan

2022-05-27 161b775f40d5d168cc98240165c57887ee8c8df8

排序

 dao/src/main/java/com/sandu/ximon/dao/bo/IpVolumeMissionBo.java

@@ -1,10 +1,8 @@
package com.sandu.ximon.dao.bo;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.sandu.ximon.dao.domain.IpVolumeMission;
import lombok.Data;

import java.time.LocalDateTime;
import java.util.List;

/**
@@ -15,23 +13,6 @@
@Data
public class IpVolumeMissionBo extends IpVolumeMission {

//    private Integer taskId;
//
//    private String missionName;
//
//    private Integer numberInPlay;
//
//    private LocalDateTime createTime;
//
//    private String userName;

    /*@JsonIgnore
    private String fileName;*/

    private List<String> fileNames;

//    private List files;
//
//    private List IpVolumes;

}

 dao/src/main/java/com/sandu/ximon/dao/enums/OrderByEnums.java

@@ -97,7 +97,7 @@
    IP_VOLUME_MISSION_CREATE_TIME("create_time"),

    /**
     * 管理员列表
     * 客户列表
     */
    //创建时间
    CLIENT_CREATE_TIME("create_time"),

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java

@@ -157,7 +157,7 @@
                    .or(w2 -> w2.like(Client::getLinkMan, keyword));
        }
        //排序字段
        String orderByResult = OrderByEnums.CLIENT_CREATE_TIME.getCode();
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeFileService.java

@@ -102,7 +102,7 @@
        }

        //排序字段
        String orderByResult = OrderByEnums.IP_VOLUME_FILE_CREATE_TIME.getCode();
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -366,17 +366,17 @@
    }


    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order,Integer seq) {
    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {


        //排序字段
        String orderByResult = OrderByEnums.IP_VOLUME_ID.getCode();
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = "ASC";
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = "create_time";
                    orderByResult = OrderByEnums.IP_VOLUME_MISSION_CREATE_TIME.getCode();
                    break;
                default:
            }

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -102,7 +102,7 @@
        Long clientId = SecurityUtils.getClientId();

        //排序字段
        String orderByResult = OrderByEnums.LIGHT_POLE_NAME.getCode();
        String orderByResult = "light_id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java

@@ -374,7 +374,7 @@
        }

        //排序字段
        String orderByResult = OrderByEnums.LIGHT_TASK_UPDATE_TIME.getCode();
        String orderByResult = "task_id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java

@@ -64,7 +64,7 @@
        Long clientId = SecurityUtils.getClientId();

        //排序字段
        String orderByResult = OrderByEnums.POLE_GROUP_UPDATE_TIME.getCode();
        String orderByResult = "group_id";
        //正序、倒叙
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {