Merge remote-tracking branch 'origin/master'

MercuryZ

2022-10-18 ea94079e74182be590b9fff356c97f522d9a7828

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java

@@ -3,14 +3,12 @@
import com.alibaba.fastjson.JSON;
import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.config.BroadcastAPI;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.utils.request.CommonRequestParams;
import com.sandu.ximon.admin.utils.response.CommonResponseVO;
import com.sandu.ximon.admin.utils.response.DataResponseVO;
import com.sandu.ximon.admin.vo.ListDataResponseVO;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.vo.TerminalVO;
import jodd.bean.BeanCopy;
import jodd.bean.BeanUtil;
import org.springframework.beans.BeanUtils;

import java.util.ArrayList;
@@ -25,13 +23,7 @@
     * @return
     */
    public static TerminalDto getTerminalInfo(Integer terminalId) {
        DataResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams().put("id", terminalId).getParams(),
                        BroadcastAPI.GET_TERMINAL.getUrl(),
                        CharUtils.GBK),
                DataResponseVO.class
        );
        DataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.GET_TERMINAL.getUrl(), CharUtils.GBK), DataResponseVO.class);

        TerminalVO bean = responseVO.convert(TerminalVO.class);

@@ -49,13 +41,7 @@
     * 获取终端服务器对象列表
     */
    public static List<TerminalDto> getTerminalList() {
        ListDataResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams().getParams(),
                        BroadcastAPI.GET_TERMINAL_LIST.getUrl(),
                        CharUtils.GBK),
                ListDataResponseVO.class
        );
        ListDataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().getParams(), BroadcastAPI.GET_TERMINAL_LIST.getUrl(), CharUtils.GBK), ListDataResponseVO.class);

        List<TerminalDto> list = new ArrayList<>();
        if (responseVO.covertTerminalList() != null) {
@@ -81,16 +67,7 @@
     * @return
     */
    public static boolean updateTerminal(Integer terminalId, TerminalVO terminalVO, Long userId) {
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id", terminalId)
                                .put("data", JSON.toJSONString(terminalVO))
                                .getParams(),
                        BroadcastAPI.UPDATE_TERMINAL.getUrl(),
                        CharUtils.GBK),
                CommonResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", JSON.toJSONString(terminalVO)).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
        if (responseVO.isOK()) {
//            log("修改播放终端(id:"+terminalId+", name:"+terminalVO.getName()+")",userId,null);
            return true;
@@ -107,15 +84,7 @@
     * @return
     */
    public static boolean delTerminal(Integer terminalId, Long userId) {
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id", terminalId)
                                .getParams(),
                        BroadcastAPI.DEL_TERMINAL.getUrl(),
                        CharUtils.GBK),
                CommonResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.DEL_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
        if (responseVO.isOK()) {
//            log("删除播放终端(id:"+terminalId+")",userId,null);
            return true;
@@ -136,17 +105,10 @@
            throw new BusinessException("IP音柱硬件设备不存在");
        }
        terminalInfo.setDefaultVolumn(defaultVolumn);
        terminalInfo.setVolumn(defaultVolumn);
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id", terminalId)
                                .put("data", terminalInfo)
                                .getParams(),
                        BroadcastAPI.UPDATE_TERMINAL.getUrl(),
                        CharUtils.GBK),
                CommonResponseVO.class
        );
        terminalInfo.setVolume(defaultVolumn);

        CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", terminalInfo).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
        System.out.println(responseVO + " response");
        if (responseVO.isOK()) {
            return true;
        }