排序

liuhaonan

2022-05-27 b99665b30cce4b623c702c9221af897ccd873ba0

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

@@ -8,6 +8,7 @@
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.admin.vo.TerminalVO;
@@ -31,13 +32,7 @@
     * 同步终端
     */
    public void synchTerminal() {
        List<BroadcastTerminalV2Entity> server;
        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            server = broadcastTerminalV2EntityMapper.listAll(null);
        } else {
            server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId());
        }
        List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll();

        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        System.out.println(list);
@@ -62,12 +57,46 @@
                save(b);
            }
        });
        /**
         * IP音柱同步 日志记录开始
         */
        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱同步", "IP音柱同步设备");
        /**
         * IP音柱同步 日志记录结束
         */
    }

    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()) {
@@ -147,42 +176,26 @@
    }

    /**
     * 修改终端
     * @param params
     * @return 0:成功 1:名称不能为空
     *//*
    public Integer updateTerminal(BroadcastParams params, Long userId) {

        // 校验名称合法性
        if(null == params.getTerminalName() || "".equals(params.getTerminalName())){
            return 1;
        }
        if(null == params.getDefaultVolumn() || params.getDefaultVolumn() < 0) {
            params.setDefaultVolumn(0);
        }

        BroadcastTerminalV2Entity b = new BroadcastTerminalV2Entity();
        b.setId(params.getTerminalId());
        b.setTerminalName(params.getTerminalName());
        b.setStreetlightId(params.getStreetlightId());
        b.setExist(1);
        //  API调用修改终端音量
        TerminalAPIUtils.changeVol(params.getTerminalId(),params.getDefaultVolumn(),userId);

        broadcastTerminalV2Dao.update(b);
        return 0;
    }

    */

    /**
     * 音量修改
     *
     * @param params
     * @return
     */
    public boolean changeVol(BroadcastTerminalV2Param params) {
        return TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
        if (params.getId() == null || params.getDefaultVolumn() == null || params.getDefaultVolumn() < 0) {
            throw new BusinessException("设备ID或修改的音量值不正确");
        }

        boolean flag = TerminalAPIUtils.changeVol(params.getId(), params.getDefaultVolumn());
        /**
         * IP音柱音量修改 日志记录开始
         */
//        String content = "{设备Id:" + params.getId() + "，修改后音量：" + params.getDefaultVolumn() + "}";
//        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱音量修改", content);
        /**
         * IP音柱音量修改 日志记录结束
         */
        return flag;
    }

    /**
@@ -235,6 +248,9 @@
     * @return
     */
    public boolean updateBroadcastTerminalName(String name, Integer id) {
        if (name == null || name.trim().length() == 0) {
            throw new BusinessException("设备名不能为空");
        }
        BroadcastTerminalV2Entity byId = getById(id);
        if (byId == null) {
            throw new BusinessException("终端不存在");
@@ -244,6 +260,15 @@
            throw new BusinessException("该设备不属于您,不能修改设备信息");
        }
        byId.setTerminalName(name);
        return updateById(byId);
        boolean flag = updateById(byId);
        /**
         * IP音柱修改设备名称日志记录开始
         */
        String content = "{设备Id:" + id + "，修改后名称：" + name + "}";
        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱修改设备名", content);
        /**
         * IP音柱改设备名称日志记录结束
         */
        return flag;
    }
}