熙讯

liuhaonan

2022-03-15 58ef959cca3a0a21c421efe9c16645aaeed3c4de

熙讯

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

@@ -6,15 +6,11 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

/**
 * 
 * @TableName pole_xixun_player
 * 熙讯节目实体
 */
@TableName(value ="pole_xixun_player")
@Data
@@ -55,14 +51,24 @@
     */
    private String requestBody;

    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private String creatTime;
    /**
     * 
     */
    private LocalDateTime creatTime;

    /**
     * 
     */
    private String screenShot;

    /**
     * 
     */
    private Long createUserId;

    /**
     * 
     */
    private Long clientId;

    @TableField(exist = false)

 dao/src/main/resources/mapper/PoleXixunPlayerEntityMapper.xml

@@ -13,6 +13,7 @@
            <result property="height" column="height" jdbcType="BIGINT"/>
            <result property="requestBody" column="request_body" jdbcType="VARCHAR"/>
            <result property="creatTime" column="creat_time" jdbcType="TIMESTAMP"/>
            <result property="screenShot" column="screen_shot" jdbcType="VARCHAR"/>
            <result property="createUserId" column="create_user_id" jdbcType="BIGINT"/>
            <result property="clientId" column="client_id" jdbcType="BIGINT"/>
    </resultMap>
@@ -20,6 +21,7 @@
    <sql id="Base_Column_List">
        program_id,program_code,program_name,
        total_size,width,height,
        request_body,creat_time,create_user_id
        request_body,creat_time,screen_shot,
        create_user_id,client_id
    </sql>
</mapper>

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

@@ -3,6 +3,7 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.MenuParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.MenuService;
import com.sandu.ximon.dao.bo.MenuNode;
import lombok.AllArgsConstructor;
@@ -20,6 +21,8 @@
@RequestMapping("/admin/menu")
public class MenuController {

    private PermissionConfig permissionConfig;

    private final MenuService menuService;

//    @GetMapping("treeMenuList")
@@ -32,6 +35,10 @@

    @GetMapping("/treeList")
    public ResponseVO<Object> treeList() {

        if(!permissionConfig.check("菜单列表")){
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<MenuNode> menuTrees = menuService.treeList();
        return ResponseUtil.success(menuTrees);
    }

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

@@ -12,6 +12,7 @@
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
import com.sandu.ximon.admin.param.PoleStatesParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.admin.service.IpVolumeService;
import com.sandu.ximon.admin.service.MonitorService;
@@ -37,6 +38,7 @@
    private MonitorService monitorService;
    private IpVolumeService broadcastTerminalV2Service;
    private AirEquipmentService airEquipmentService;
    private final PermissionConfig permissionConfig;

    @PostMapping("/add")
    public ResponseVO<Object> addPole(@RequestBody @Validated PoleParam param) {
@@ -55,6 +57,9 @@

    @PostMapping("/list")
    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
        if(!permissionConfig.check("路灯列表")){
            return ResponseUtil.fail("缺少对应用户权限");
        }
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Pole> results = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),param);
        CommonPage commonPage = CommonPage.restPage(results);

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

@@ -48,7 +48,7 @@
     * @param vnnoxWebRequest
     * @return
     */
    @GetMapping("/screenShot")
    @PostMapping("/screenShot")
    public ResponseVO<Object> screenShot(@RequestBody VnnoxParam vnnoxWebRequest) {
        Map<String, String> map = vnnoxService.getScreenShotUrl(vnnoxWebRequest.getId());
        if(map.get("code").equals("500")) {

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

@@ -23,6 +23,7 @@
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.*;
@@ -62,7 +63,7 @@
     */
    @PostMapping("/updateProgram")
    // @RequiresPermissions("pole:polexixunplayer:update")
    public ResponseVO<Object> update(@RequestBody ProgramPro programPro) {
    public ResponseVO<Object> update(@RequestBody  ProgramPro programPro) {
        PoleXixunPlayerEntity byId = xiXunPlayerService.getById(programPro.getProgramId());
        if (byId == null) {
            throw new BusinessException("未选择LED屏");

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

@@ -2,6 +2,7 @@

import lombok.Data;

import javax.validation.constraints.NotEmpty;
import java.util.List;

@Data
@@ -9,6 +10,7 @@
    private Long programId;
    private String  _id;                    //请使用UUID赋值
    private String name;                    //好记的名字
    private String ScreenShot;
    private Long width;                    //节目宽
    private Long height;                    //节目高度
    private List<LayerPro> layers;            //所有素材都包含在该list中
@@ -16,4 +18,5 @@
    //如果为true，则该节目来自第三方接口，不是来自我们自己的web，二次开发请务必赋值为true
    private boolean isOthers=true;
    private int version;                    //2为简易节目，9为定点节目，其他为高级节目，请赋值其他。

}

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

@@ -33,6 +33,7 @@
    private final LightemitUtils lightemitUtils;
    private final RealtimeServerBean realtimeServerBean;
    private final PoleLightemitService poleLightemitService;
    private final ClientService clientService;


    public boolean insert(ProgramPro programPro) {
@@ -46,8 +47,13 @@
//        programPro.setProgramId(poleXixunPlayer.getProgramId());
//        System.out.println(poleXixunPlayer.getProgramId());
        poleXixunPlayer.setRequestBody(json);
        poleXixunPlayer.setScreenShot(programPro.getScreenShot());
        //  poleXixunPlayer.setCreatTime(sdf.format(date));
        poleXixunPlayer.setCreateUserId(SecurityUtils.getClientId());
        poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
        if(!clientService.findClientId()){
            poleXixunPlayer.setClientId(clientService.getClientId());
        }


        return this.save(poleXixunPlayer);
    }
@@ -70,6 +76,7 @@
        try {
            programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
            programPro.setProgramId(pid);
            programPro.setScreenShot(byId.getScreenShot());
        } catch (Exception e) {
            e.printStackTrace();
        }