节目/文件归属问题

liuhaonan

2022-04-18 652bbc43722b3eed164609d10dc6967989b253d5

节目/文件归属问题

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

@@ -64,7 +64,9 @@


    public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }
        List<LedPlayerEntity> list;
        //超管
        if (SecurityUtils.getClientId() == null) {
@@ -75,4 +77,14 @@
        return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
    }

//    public List<LedPlayerEntity> ledPlayerEntityList() {
//        List<LedPlayerEntity> list;
//        //超管
//        if (SecurityUtils.getClientId() == null) {
//            list = ledPlayerEntityMapper.ledPlayerEntityList(null, null);
//        } else {
//            list = ledPlayerEntityMapper.ledPlayerEntityList(null, SecurityUtils.getUserId());
//        }
//        return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
//    }
}

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

@@ -34,6 +34,7 @@
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.domain.PoleGroupRelation;
@@ -115,10 +116,11 @@

    /**
     * 统计在线灯杆数量
     *
     * @return
     */
    public Map<String,Integer> poleCount() {
        Map<String,Integer> result = new HashMap<>();
    public Map<String, Integer> poleCount() {
        Map<String, Integer> result = new HashMap<>();
        List<Pole> list = new ArrayList<>();
        LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
        if (SecurityUtils.getClientId() == null) {
@@ -129,10 +131,26 @@
                        w.eq(Pole::getUserId, SecurityUtils.getUserId());
                    });
        }
        //灯杆
        list = list(wrapper);
        List<Pole> poles = isOnLine(list);
        result.put("poleOnlineCount",poles.size());
        result.put("poleTotalCount",list.size());
        result.put("poleOnlineCount", poles.size());
        result.put("poleTotalCount", list.size());
        //诺瓦
        // SpringContextHolder.getBean(LightService.class).listLight(SecurityUtils.getUserId(), SecurityUtils.getClientId());
        List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null);
        int munber = 0;
        for (LedPlayerEntity bean : ledPlayerEntities) {
            if (bean.getOnlineStatus() == 1) {
                munber++;
            }
        }
        result.put("novaOnlineCount", munber);
        result.put("novaTotalCount", ledPlayerEntities.size());

        SpringContextHolder.getBean(C3ChargingService.class).list();


        return result;
    }

@@ -155,6 +173,7 @@
            );
        }

        PageHelper.startPage(pageNo, pageSize);
        list = list(wrapper);
        if (param.getGroupid() != null) {
            //  List<Long> poleIds = new ArrayList<>();