fix

zhanzhiqin

2022-05-26 d8d6ef0d3031053361284b04ddafb48ef99ae679

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SourcePro.java

@@ -10,23 +10,23 @@

    private String _type;

    private String md5;                //素材如果有大小需要计算它的md5
    private String md5;                //素材如果有大小需要计算它的md5

    private String name;                //素材名字
    private String name;                //素材名字

    private int left;                //显示在左上角的坐标
    private int left;                //显示在左上角的坐标

    private int top;

    private int width;                //宽高
    private int width;                //宽高

    private int height;

    private long size;                //文件大小
    private long size;                //文件大小

    private int playTime;            //起始播放时间
    private int playTime;            //起始播放时间

    private int timeSpan;            //持续播放时长
    private int timeSpan;            //持续播放时长

    private String fileExt = "";

@@ -50,11 +50,13 @@

    private String backgroundColor = "";            // 多行文本背景颜色

    private String language ;  //时钟语言
    private String language;  //时钟语言

    private Integer timezone;   //时钟时区

    private String city;  //天气城市

    private Integer code; //城市代码

    private String url; //资源文件下载地址
}

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

@@ -69,6 +69,18 @@
    }

    public boolean insert(ProgramPro programPro) {
        programPro.getLayers().forEach(
                layerPro -> {
                    layerPro.getSources().forEach(
                            sourcePro -> {
                                long fileId = Long.parseLong(sourcePro.getId());
                                LedSFile file = xiXunFileService.getById(fileId);
                                sourcePro.setUrl(file.getFileUrl());
                                sourcePro.setMd5(file.getMd5());
                            }
                    );
                }
        );
        String json = JsonUtil.jsonObj2Sting(programPro);
        PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
        poleXixunPlayer.setProgramCode(programPro.get_id());
@@ -148,36 +160,6 @@
    }


//    public Object getProgram(String json) {
////        PoleXixunPlayerEntity byId = getById(pid);
//        List<Long> fileIds = new ArrayList<>();
//        List<LedSFile> file = new ArrayList<>();
//        if (json == null) {
//            throw new BusinessException("未找到该节目");
//        }
//        ProgramPro programPro = new ProgramPro();
//        try {
//            programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
//            programPro.setProgramId(pid);
//            programPro.setScreenShot(byId.getScreenShot());
//            programPro.getLayers().forEach(
//                    layerPro -> {
//                        layerPro.getSources().forEach(
//                                sourcePro -> {
//                                    long fileId = Long.parseLong(sourcePro.getId());
//                                    file.add(xiXunFileService.getById(fileId));
//                                }
//                        );
//                    }
//            );
//            programPro.setFileList(file);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//        return programPro;
//    }


    /**
     * 推送节目
     *
@@ -214,10 +196,10 @@
        list2.add(items);
        taskPro.setItems(list2);
        command.setId(UUID.randomUUID().toString());
        //这里是下方的post回调地址，需要修改IP地址
        command.setNotificationURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/getJSON");
//        //这里是下方的post回调地址，需要修改IP地址
        command.setNotificationURL("");
        //资源下载链接的请求头
        command.setPreDownloadURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/downliadFileById/");
        command.setPreDownloadURL("");
        command.setTask(taskPro);
        xixun.set_id(UUID.randomUUID().toString());
        xixun.setCommand(command);
@@ -314,7 +296,7 @@

                    /**
                     * 熙汛大气数据推送日志记录开始
//                     */
                     //                     */
//                    String content = "{设备code：" + lightemitControlCode
//                            + "， 推送内容：" + body
//                            + " }";