Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-04 d72e7d16776d31c2fd29b60929e896bccded3029

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

@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -11,6 +12,8 @@
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.mapper.BroadcastTerminalV2EntityMapper;
import com.sandu.ximon.dao.mapper.BroadcastV2TaskTerminalMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,21 +22,24 @@
import java.util.List;

@Service
public class BroadcastTerminalV2Service extends BaseServiceImpl<BroadcastV2TaskTerminalMapper, BroadcastV2TaskTerminal> {
public class BroadcastTerminalV2Service extends BaseServiceImpl<BroadcastTerminalV2EntityMapper, BroadcastTerminalV2Entity> {
    //    private final BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalDao;
//    @Autowired
//    private SysUserRoleService sysUserRoleService;
//    @Autowired
//    private SysUserCompanyService sysUserCompanyService;
//    @Autowired
//    private BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalMapper;
    @Autowired
    private BroadcastV2TaskTerminalMapper broadcastV2TaskTerminalMapper;
    private BroadcastTerminalV2EntityMapper broadcastTerminalV2EntityMapper;

    /**
     * 同步终端
     */
    public void synchTerminal() {
        List<BroadcastTerminalV2Entity> server = broadcastV2TaskTerminalMapper.listAll("");
        List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll("");
        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        System.out.println(list);
        list.stream().forEach(item -> {
            //  音柱服务器终端ID
            Integer id = item.getId();
@@ -52,7 +58,8 @@
                b.setTerminalName(item.getName());
                b.setStreetlightId(0L);
                b.setExist(1);
                broadcastV2TaskTerminalMapper.insert(b);
//                save(b);
                broadcastTerminalV2EntityMapper.insert(b);
            }
        });
    }
@@ -74,9 +81,9 @@
        if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
            //全部
            int bindingState = 2;
            broadcastTerminalV2EntityBos = broadcastV2TaskTerminalMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
        } else {
            broadcastTerminalV2EntityBos = broadcastV2TaskTerminalMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
        }

        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
@@ -110,6 +117,29 @@
    }

    /**
     * 修改设备绑定状态
     *
     * @param flag true为绑定  false 为解绑
     */
    public void updateBingdingState(boolean flag, int deviceCode) {
        if (flag) {//绑定
            BroadcastTerminalV2Entity broadcastTerminalV2Entity = getOne(Wrappers.lambdaQuery(BroadcastTerminalV2Entity.class).eq(BroadcastTerminalV2Entity::getId, deviceCode));
            if (broadcastTerminalV2Entity == null) {
                return;
            }
            broadcastTerminalV2Entity.setBindStates(1);
            updateById(broadcastTerminalV2Entity);
        } else {//解绑
            BroadcastTerminalV2Entity broadcastTerminalV2Entity = getOne(Wrappers.lambdaQuery(BroadcastTerminalV2Entity.class).eq(BroadcastTerminalV2Entity::getId, deviceCode));
            if (broadcastTerminalV2Entity == null) {
                return;
            }
            broadcastTerminalV2Entity.setBindStates(0);
            updateById(broadcastTerminalV2Entity);
        }
    }

    /**
     * 修改终端
     * @param params
     * @return 0:成功 1:名称不能为空