Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-03-09 ac9062273a48330cd77e7cddfd2061b523f3e4c1

Merge remote-tracking branch 'origin/master'

 dao/src/main/java/com/sandu/ximon/dao/domain/LedPlayerEntity.java

@@ -11,7 +11,7 @@

/**
 * 
 * @TableName led诺瓦
 * @TableName led诺瓦设备
 */
@Data
@TableName(value = "led")

 sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java

@@ -107,6 +107,8 @@
                .antMatchers("/webjars/**").permitAll()
                .antMatchers("/*/api-docs").permitAll()
                .antMatchers("/v2/api-docs-ext").permitAll()
                .antMatchers("/serv/vnnox/screenshot").permitAll()
                .antMatchers("/serv/vnnox/progress").permitAll()
                //.antMatchers("/api/wxmp/**").permitAll()

                // æ–‡ä»¶

 ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java

@@ -17,8 +17,8 @@
    public static final Long REDIS_MAX_SAVE_TIME = 180 * 24 * 60 * 60L;
    public static final Long SCREEN_SHOT_TIMEOUT = 30 * 60L;

    public static final String NOTIFY_URL = "http://112.74.63.130:6379/XMPoleManager/serv/vnnox/progress";
    public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:6379/XMPoleManager/serv/vnnox/screenshot"; //要改
    public static final String NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/progress";
    public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/screenshot"; //要改

    public static final String username = "zhxm";
    public static final String password = "xm2512209.";

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.param.VnnoxProgressParam;
import com.sandu.ximon.admin.param.VnnoxScreenShotParam;
import com.sandu.ximon.admin.utils.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/serv/vnnox")
public class ServVnnoxController {

    @Autowired
    private RedisUtils redisUtils;

    @PostMapping("/screenshot")
    public ResponseVO<Object> screenshot(@RequestBody VnnoxScreenShotParam vnnoxScreenShot) {
        String url = vnnoxScreenShot.getScreenShotUrl().replace("&amp;", "&");
        redisUtils.set(VnnoxConstant.REDIS_SCREEN_SHOT + vnnoxScreenShot.getPlayerId(), url, VnnoxConstant.SCREEN_SHOT_TIMEOUT);
        return ResponseUtil.success("ok");
    }

    @PostMapping("/progress")
    public ResponseVO<Object> progress(@RequestBody VnnoxProgressParam vnnoxProgress) {
        redisUtils.set(VnnoxConstant.REDIS_PROGRESS + vnnoxProgress.getPlayerId(), vnnoxProgress.getPrecess());
        return ResponseUtil.success("ok");
    }

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxProgressParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.sandu.ximon.admin.param;

import lombok.Data;

@Data
public class VnnoxProgressParam {

    private String playerId;

    private Double precess;

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxScreenShotParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
package com.sandu.ximon.admin.param;

import lombok.Data;

@Data
public class VnnoxScreenShotParam {
    //  å¯¹åº”的播放器id
    private String playerId;
    //  å½“前播放器的时间信息
    private String playerTime;
    //  å½“前播放器的屏幕截图图片地址,图片链接失效时间为2小时
    private String screenShotUrl;

}

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

@@ -36,14 +36,6 @@


    public boolean insert(ProgramPro programPro) {
        //  SimpleDateFormat sdf=new SimpleDateFormat("yy-MM-dd HH:mm:ss");
        // Date date = new Date();
//        Program program = new Program();
//        try {
//            program = JsonUtil.convertJsonStringToObject(json,Program.class);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
        String json = JsonUtil.jsonObj2Sting(programPro);
        PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
        poleXixunPlayer.setProgramCode(programPro.get_id());
@@ -84,6 +76,11 @@
        return  programPro;
    }

    /**
     * æŽ¨é€èŠ‚ç›®
     * @param programId
     * @param lightemitIds
     */
    public void videoXixunPlayer(long programId, List<Long> lightemitIds) {

        ProgramPro pro = new ProgramPro();