changes

liuhaonan

2022-09-08 39f6f31b5b5c6f646b60cf344c1300bb72c59147

changes

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

@@ -163,7 +163,7 @@
        if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_PLAYING.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(xiXunPlayerService.getByPid(lightemitId));
        return ResponseUtil.success(poleLightemitService.getProgram(lightemitId));
    }



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

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

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -12,8 +14,10 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.*;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleLightemitEntityMapper;
@@ -49,6 +53,9 @@

    @Autowired
    PoleLightemitEntityMapper poleLightemitDao;

    @Autowired
    LedSFileService xiXunFileService;

    @PostConstruct
    public void init() {
@@ -547,4 +554,14 @@
        lightemitUtils.setBrightness(lightemitControlCode, brightness);
    }

    public Object getProgram(Long lightemitId) {
        PoleLightemitEntity xiXun = getById(lightemitId);

        String requestBody = xiXun.getRequestBody();

        Map map = JSON.parseObject(requestBody, Map.class);
        ProgramPro pro;

        return map;
    }
}