排序

liuhaonan

2022-05-27 b99665b30cce4b623c702c9221af897ccd873ba0

排序

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

@@ -2,7 +2,6 @@

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.param.ReceiveParam;
@@ -38,11 +37,13 @@

    @PostMapping("/getBroadcastTerminalList")
    public ResponseVO<Object> getBroadcastTerminalList(BaseConditionVO baseConditionVO,
                                                       @RequestParam(value = "order", required = false) Integer order,
                                                       @RequestParam(value = "seq", required = false) Integer seq,
                                                       @RequestBody(required = false) BroadcastTerminalV2Param broadcastTerminalV2Param) {
        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<BroadcastTerminalV2EntityBo> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, broadcastTerminalV2Param);
        List<BroadcastTerminalV2EntityBo> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, order, seq, broadcastTerminalV2Param);

        if (2 != broadcastTerminalV2Param.getWorkState()) {
            return ResponseUtil.success(list);

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

@@ -98,13 +98,15 @@
    }

    @GetMapping("/list")
    public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
            , @RequestParam(value = "orderBy", required = false) String orderBy) {
    public ResponseVO<Object> listMission(BaseConditionVO baseConditionVO,
                                          @RequestParam(value = "keyword", required = false) String keyword,
                                          @RequestParam(value = "order", required = false) Integer order,
                                          @RequestParam(value = "seq", required = false) Integer seq) {
        if (!permissionConfig.check(MenuEnum.IP_BROADCAST_TASK_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword,orderBy));
        return ResponseUtil.successPage(ipVolumeMissionService.missionList(baseConditionVO, keyword,order,seq));
    }

    //获取任务详情

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

@@ -365,16 +365,35 @@
    }


    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, String orderBy) {
        if (orderBy.isEmpty() || orderBy == null) {
            orderBy = "id desc";
        }
    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order,Integer seq) {

        if ("createTime-1".equals(orderBy)) {
            orderBy = "create_time asc";
        } else if ("createTime-2".equals(orderBy)) {
            orderBy = "create_time desc";

        //排序字段
        String orderByResult = "create_time";
        //正序、倒叙
        String orderBySeq = "ASC";
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = "create_time";
                    break;
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);

        List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();

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

@@ -66,10 +66,37 @@
         */
    }

    public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
    public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, Integer order, Integer seq, BroadcastTerminalV2Param broadcastTerminalV2Param) {
        if (broadcastTerminalV2Param == null) {
            broadcastTerminalV2Param = new BroadcastTerminalV2Param();
        }
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq = "ASC";
        if (order != null) {
            switch (order) {
                case 1:
                    orderByResult = "create_time";
                    break;
                case 2:
                    orderByResult = "create_time";
                default:
            }
        }
        if (seq != null) {
            switch (seq) {
                case 1:
                    orderBySeq = " ASC";
                    break;
                case 2:
                    orderBySeq = " DESC";
                    break;
                default:
                    break;
            }
        }


        //在线状态全部的话需要分页
        if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {