fix

zhanzhiqin

2022-01-12 260a53822948a58ec1fda283d6bf71744cfc51e6

fix

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

@@ -33,11 +33,16 @@
    public ResponseVO<Object> getBroadcastTerminalList(BaseConditionVO baseConditionVO,
                                                       @RequestBody(required = false) BroadcastTerminalV2Param broadcastTerminalV2Param) {
        List<BroadcastTerminalV2EntityBo> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, broadcastTerminalV2Param);
        return ResponseUtil.successPage(list);

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

    @GetMapping("/changeVol")
    public ResponseVO<Object> changeVol(BroadcastTerminalV2Param broadcastTerminalV2Param) {
    @PostMapping("/changeVol")
    public ResponseVO<Object> changeVol(@RequestBody BroadcastTerminalV2Param broadcastTerminalV2Param) {
        boolean flag = broadcastTerminalV2Service.changeVol(broadcastTerminalV2Param);
        if (flag) {
            return ResponseUtil.success("成功修改音量！");

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/BroadcastTerminalV2Param.java

@@ -11,4 +11,6 @@
    private String keyword;
    @NotEmpty
    private Integer bindingState;
    @NotEmpty
    private Integer workState;
}

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

@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@@ -61,9 +62,14 @@
            broadcastTerminalV2Param = new BroadcastTerminalV2Param();
        }
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        //在线状态全部的话需要分页
        if (2 == broadcastTerminalV2Param.getWorkState()) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }

        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos_final = new ArrayList<>();
        //绑定状态：已绑定/未绑定/全部
        if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
            //全部
@@ -73,20 +79,34 @@
            broadcastTerminalV2EntityBos = broadcastV2TaskTerminalMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
        }

        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
            TerminalVO terminalVO = TerminalAPIUtils.getTerminalInfo(bean.getId());
            bean.setStatus(terminalVO.getStatus());
            bean.setIp(terminalVO.getIp());
            bean.setVolumn(terminalVO.getVolumn());
            bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
            bean.setPower(terminalVO.getPower());
            bean.setDefaultPower(terminalVO.getDefaultPower());
            bean.setLast(terminalVO.getLast());
            bean.setTaskType(terminalVO.getTaskType());
            bean.setTaskID(terminalVO.getTaskID());
            for (TerminalVO terminalVO : list) {
                if (bean.getId().equals(terminalVO.getId())) {
                    bean.setStatus(terminalVO.getStatus());
                    bean.setIp(terminalVO.getIp());
                    bean.setVolumn(terminalVO.getVolumn());
                    bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
                    bean.setPower(terminalVO.getPower());
                    bean.setDefaultPower(terminalVO.getDefaultPower());
                    bean.setLast(terminalVO.getLast());
                    bean.setTaskType(terminalVO.getTaskType());
                    bean.setTaskID(terminalVO.getTaskID());

                    if (0 == broadcastTerminalV2Param.getWorkState() && 0 == terminalVO.getStatus()) {
                        broadcastTerminalV2EntityBos_final.add(bean);
                    } else if (1 == broadcastTerminalV2Param.getWorkState() && 1 == terminalVO.getStatus()) {
                        broadcastTerminalV2EntityBos_final.add(bean);
                    }
                    break;
                }
            }
        }
        return broadcastTerminalV2EntityBos;
        if (2 == broadcastTerminalV2Param.getWorkState()) {
            return broadcastTerminalV2EntityBos;
        } else {
            return broadcastTerminalV2EntityBos_final;
        }
    }

    /**