2021与蓝度共同重构项目,服务端
liuhaonan
2021-12-21 58568157827e900d0bfb32efdd31ea1bf9254e5c
LED节目完善
已修改7个文件
已添加10个文件
已删除4个文件
已重命名1个文件
728 ■■■■■ 文件已修改
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgram.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlanNv.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/PushToLed.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/mapper/LEDProgramMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/mapper/PlayPlanMapper.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/mapper/PlayPlanNvMapper.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/ChargingPileMapper.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/LEDProgramFileMapper.xml 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/LEDProgramMapper.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/PlayPlanMapper.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/resources/mapper/PlayPlanNvMapper.xml 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramFileParam.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/param/PlayPlanParam.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanService.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgram.java
@@ -27,24 +27,24 @@
    private Long userId;
    /**
     *
     */
    private String userName;
    /**
     * èŠ‚ç›®åç§°
     */
    private String name;
    /**
     * å¤§å°
     * é¢„览图
     */
    private Double size;
    private String preview;
    /**
     * å°ºå¯¸
     * pages实体
     */
    private String pixel;
    /**
     *
     */
    private String programBase64;
    private String pages;
    /**
     * é€‚用型号 0:N 1:S
@@ -56,6 +56,11 @@
     */
    private LocalDateTime createTime;
    /**
     *
     */
    private LocalDateTime updateTime;
    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}
dao/src/main/java/com/sandu/ximon/dao/domain/LEDProgramFile.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package com.sandu.ximon.dao.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
/**
 * LED节目表
 * @TableName led_program_file
 */
@TableName(value ="led_program_file")
@Data
public class LEDProgramFile implements Serializable {
    /**
     *
     */
    @TableId(type = IdType.AUTO)
    private Long id;
    /**
     *
     */
    private Long userId;
    /**
     *
     */
    private String userName;
    /**
     * æ–‡ä»¶åç§°
     */
    private String name;
    /**
     * å¤§å°
     */
    private String size;
    /**
     * æ–‡ä»¶ç±»åž‹
     */
    private String fileType;
    /**
     * é“¾æŽ¥
     */
    private String fileUrl;
    /**
     * é€‚用型号 0:N 1:S
     */
    private Integer kind;
    /**
     *
     */
    private LocalDateTime createTime;
    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}
dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlanNv.java
ÎļþÃû´Ó dao/src/main/java/com/sandu/ximon/dao/domain/PlayPlan.java ÐÞ¸Ä
@@ -12,11 +12,11 @@
/**
 * æ’­æ”¾è®¡åˆ’表
 * @TableName play_plan
 * @TableName play_plan_nv
 */
@TableName(value ="play_plan")
@TableName(value ="play_plan_nv")
@Data
public class PlayPlan implements Serializable {
public class PlayPlanNv implements Serializable {
    /**
     * 
     */
@@ -24,7 +24,7 @@
    private Long id;
    /**
     *
     *
     */
    private Long userId;
@@ -56,12 +56,12 @@
    /**
     * æ—¥æœŸèŒƒå›´/开
     */
    private String onDateRange;
    private String startDate;
    /**
     * æ—¥æœŸèŒƒå›´/关
     */
    private String offDateRange;
    private String endDate;
    /**
     * è®¡åˆ’执行状态  1未执行  2执行中  3已失效
@@ -72,16 +72,22 @@
     * æ˜ŸæœŸèŒƒå›´
     */
    @TableField(typeHandler = JsonIntegerArrayTypeHandler.class)
    private Integer[] weekRange;
    private Integer[] weekDays;
    /**
     * å¼€æ’­æ—¶é—´
     */
    private String onTime;
    private String startTime;
    /**
     * ä¸‹æ’­æ—¶é—´
     */
    private String offTime;
    private String endTime;
    /**
     * schedule实体
     */
    private String schedule;
    /**
     * åˆ›å»ºæ—¶é—´
dao/src/main/java/com/sandu/ximon/dao/domain/PushToLed.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.sandu.ximon.dao.domain;
import lombok.Data;
import java.io.Serializable;
/**
 * @Author liuhaonan
 * @Date 2021/12/21 14:31
 * @Version 1.0
 * èŠ‚ç›®æŽ¨é€çš„å†…å®¹å°è£…
 */
@Data
public class PushToLed implements Serializable {
    private String schedule;
    private String pages;
}
dao/src/main/java/com/sandu/ximon/dao/mapper/LEDProgramMapper.java
@@ -2,6 +2,7 @@
import com.sandu.ximon.dao.domain.LEDProgram;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.domain.PushToLed;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -10,6 +11,7 @@
@Mapper
public interface LEDProgramMapper extends BaseMapper<LEDProgram> {
}
dao/src/main/java/com/sandu/ximon/dao/mapper/PlayPlanMapper.java
ÎļþÒÑɾ³ý
dao/src/main/java/com/sandu/ximon/dao/mapper/PlayPlanNvMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.sandu.ximon.dao.mapper;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sandu.ximon.dao.domain.PushToLed;
import org.apache.ibatis.annotations.Mapper;
/**
 * @Entity com.sandu.ximon.dao.domain.PlayPlanNv
 */
@Mapper
public interface PlayPlanNvMapper extends BaseMapper<PlayPlanNv> {
    PushToLed pushToLed(Long planId);
}
dao/src/main/resources/mapper/ChargingPileMapper.xml
ÎļþÒÑɾ³ý
dao/src/main/resources/mapper/LEDProgramFileMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.LEDProgramFileMapper">
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LEDProgramFile">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="size" column="size" jdbcType="VARCHAR"/>
            <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
            <result property="fileUrl" column="file_url" jdbcType="VARCHAR"/>
            <result property="kind" column="kind" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,user_id,user_name,
        name,size,file_type,
        file_url,kind,create_time
    </sql>
</mapper>
dao/src/main/resources/mapper/LEDProgramMapper.xml
@@ -7,17 +7,19 @@
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LEDProgram">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="userId" column="user_id" jdbcType="BIGINT"/>
            <result property="userName" column="user_name" jdbcType="VARCHAR"/>
            <result property="name" column="name" jdbcType="VARCHAR"/>
            <result property="size" column="size" jdbcType="DOUBLE"/>
            <result property="pixel" column="pixel" jdbcType="VARCHAR"/>
            <result property="programBase64" column="program_base64" jdbcType="VARCHAR"/>
            <result property="preview" column="preview" jdbcType="VARCHAR"/>
            <result property="pages" column="pages" jdbcType="VARCHAR"/>
            <result property="kind" column="kind" jdbcType="INTEGER"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,user_id,name,
        size,pixel,program_base64,
        kind,create_time
        id,user_id,user_name,
        name,preview,pages,
        kind,create_time,update_time
    </sql>
</mapper>
dao/src/main/resources/mapper/PlayPlanMapper.xml
ÎļþÒÑɾ³ý
dao/src/main/resources/mapper/PlayPlanNvMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sandu.ximon.dao.mapper.PlayPlanNvMapper">
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.PlayPlanNv">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
        <result property="ledProgramId" column="led_program_id" jdbcType="BIGINT"/>
        <result property="ledProgramName" column="led_program_name" jdbcType="VARCHAR"/>
        <result property="volume" column="volume" jdbcType="VARCHAR"/>
        <result property="applySeries" column="apply_series" jdbcType="INTEGER"/>
        <result property="startDate" column="start_date" jdbcType="VARCHAR"/>
        <result property="endDate" column="end_date" jdbcType="VARCHAR"/>
        <result property="status" column="status" jdbcType="INTEGER"/>
        <result property="weekDays" column="week_days" typeHandler="com.sandu.common.mybatis.JsonStringArrayTypeHandler"/>
        <result property="startTime" column="start_time" jdbcType="VARCHAR"/>
        <result property="endTime" column="end_time" jdbcType="VARCHAR"/>
        <result property="schedule" column="schedule" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>
    <sql id="Base_Column_List">
        id,user_id,name,
        led_program_id,led_program_name,volume,
        apply_series,start_date,end_date,
        status,week_days,start_time,
        end_time,schedule,create_time,
        update_time
    </sql>
    <select id="pushToLed" resultType="com.sandu.ximon.dao.domain.PushToLed" parameterType="java.lang.Long">
        SELECT
            t1.SCHEDULE,
            t2.pages
        FROM
            play_plan_nv t1
                LEFT JOIN led_program t2 ON t1.led_program_id = t2.id
        WHERE
            t1.id =#{planId}
    </select>
</mapper>
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -1,26 +1,18 @@
package com.sandu.ximon.admin.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.param.LampPostParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LEDProgramService;
import com.sandu.ximon.dao.domain.LEDProgram;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
 * led节目
 * LED节目处理
 */
@RestController
@AllArgsConstructor
@@ -30,9 +22,7 @@
    @PostMapping("/add")
    public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
   // public ResponseVO<Object> addLEDProgram(@RequestParam(name = "name") @Validated String name,@RequestParam(name = "kind") @Validated Integer kind,@RequestParam(name = "programBase64") @Validated String programBase64) {
        return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
        //return ResponseUtil.success(ledProgramService.addProgram(name,kind,programBase64));
    }
    @PostMapping("/update")
@@ -72,7 +62,7 @@
        }
       // List<LEDProgram> list = ledProgramService.list(wrapper);
        // List<LEDProgram> list = ledProgramService.list(wrapper);
        return ResponseUtil.success(ledProgramService.list(wrapper));
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LEDProgramFileParam;
import com.sandu.ximon.admin.service.LEDProgramFileService;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
 * @Author liuhaonan
 * @Date 2021/12/21 11:35
 * @Version 1.0
 * LED文件处理
 */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/ledFile")
public class LEDProgramFileController {
    private final LEDProgramFileService ledProgramFileService;
    @PostMapping("/add")
    public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramFileParam param) {
        return ResponseUtil.success(ledProgramFileService.addProgramFile(param));
    }
    @PostMapping("/delete{fileId}")
    public ResponseVO<Object> addLEDProgram(@PathVariable Long fileId) {
        return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.service.PlayPlanNvService;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
 * @Author liuhaonan
 * @Date 2021/12/21 13:58
 * @Version 1.0
 */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/ledPlan")
public class PlayPlanNvController {
    private final PlayPlanNvService playPlanNvService;
    @PostMapping("/add")
    public ResponseVO<Object> addLEDPlan(@RequestBody @Validated PlayPlanParam param) {
        return ResponseUtil.success(playPlanNvService.addPlan(param));
    }
    @PostMapping("/update")
    public ResponseVO<Object> updateLEDPlan(@RequestBody @Validated Long planId, PlayPlanParam param) {
        return ResponseUtil.success(playPlanNvService.updatePlan(planId, param));
    }
    @PostMapping("/delete/{plianId}")
    public ResponseVO<Object> deleteLEDPlan(@PathVariable Long plianId) {
        return ResponseUtil.success(playPlanNvService.deletePlan(plianId));
    }
    @PostMapping("/push{plianId}")
    public ResponseVO<Object> pushToLed(@PathVariable Long plianId) {
        return ResponseUtil.success(playPlanNvService.pushToLed(plianId));
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramFileParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
package com.sandu.ximon.admin.param;
import lombok.Data;
import javax.validation.constraints.NotNull;
@Data
public class LEDProgramFileParam {
    @NotNull(message = "节目名称不能为空")
    private String name;
    /**
     * å¤§å°
     */
    private String size;
    /**
     * æ–‡ä»¶ç±»åž‹
     */
    private String fileType;
    /**
     * é“¾æŽ¥
     */
    @NotNull(message = "文件内容不能为空")
    private String fileUrl;
}
ximon-admin/src/main/java/com/sandu/ximon/admin/param/LEDProgramParam.java
@@ -9,23 +9,19 @@
public class LEDProgramParam {
    private Long id;
    @NotNull(message = "节目名称不能为空")
    private String name;
    @NotNull(message = "适用设备类型不能为空")
    private Integer kind;
    /**
     * é¢„览图
     */
    private String previewUrl;
    /*大小*/
    private Double size;
    /*尺寸*/
    private String pixel;
    @NotNull(message = "节目内容不能为空")
    private String programBase64;
    /**
     * pages实体
     */
    private String pages;
}
ximon-admin/src/main/java/com/sandu/ximon/admin/param/PlayPlanParam.java
@@ -12,11 +12,12 @@
public class PlayPlanParam {
    @NotEmpty(message = "播放计划名称不能为空")
    private String name;
    @NotEmpty(message = "节目名称不能为空")
    private String ledProgramName;
    @NotEmpty(message = "节目id不能为空")
    @NotNull(message = "节目id不能为空")
    private Long ledProgramId;
    @NotEmpty(message = "音量不能为空")
    //音量
@@ -31,32 +32,37 @@
     * æ—¥æœŸèŒƒå›´/开
     */
    @NotEmpty
    private String onDateRange;
    private String startDate;
    /**
     * æ—¥æœŸèŒƒå›´/关
     */
    @NotEmpty
    private String offDateRange;
    private String endDate;
    /**
     * æ˜ŸæœŸèŒƒå›´
     */
    @NotNull
    @TableField(typeHandler = JsonIntegerArrayTypeHandler.class)
    private Integer[] weekRange;
    private Integer[] weekDays;
    /**
     * schedule实体
     */
    private String schedule;
    /**
     * å¼€æ’­æ—¶é—´
     */
    @NotEmpty
    private String onTime;
    private String startTime;
    /**
     * ä¸‹æ’­æ—¶é—´
     */
    @NotEmpty
    private String offTime;
    private String endTime;
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
package com.sandu.ximon.admin.service;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.LEDProgramFileParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.LEDProgramFile;
import com.sandu.ximon.dao.mapper.LEDProgramFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@Service
@AllArgsConstructor
public class LEDProgramFileService extends BaseServiceImpl<LEDProgramFileMapper, LEDProgramFile> {
    private final LEDProgramFileMapper ledProgramFileMapper;
    public boolean addProgramFile(LEDProgramFileParam param) {
        LEDProgramFile file = new LEDProgramFile();
        BeanUtils.copyProperties(param, file);
        file.setUserId(SecurityUtils.getClientId());
        if (SecurityUtils.getClientId() != null) {
            file.setUserName(SecurityUtils.getUsername());
        }
        return save(file);
    }
    public boolean deleteFile(Long id) {
        LEDProgramFile byId = getById(id);
        if (byId == null) {
            throw new BusinessException("未找到该节目");
        }
        return removeById(id);
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -9,31 +9,24 @@
import com.sandu.ximon.dao.domain.LEDProgram;
import com.sandu.ximon.dao.mapper.LEDProgramMapper;
import lombok.AllArgsConstructor;
import nova.traffic.utils.NovaTraffic;
import org.springframework.stereotype.Service;
@Service
@AllArgsConstructor
public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
    private final LEDProgramMapper ledProgramMapper;
    public boolean addProgram(LEDProgramParam receiveParam) {
  //  public boolean addProgram(String name,Integer kind,String url ) {
        LEDProgram led = new LEDProgram();
        led.setUserId(SecurityUtils.getClientId());
        led.setPixel(receiveParam.getPixel());
        led.setSize(receiveParam.getSize());
        if (SecurityUtils.getClientId() != null) {
            led.setUserName(SecurityUtils.getUsername());
        }
        led.setName(receiveParam.getName());
        led.setKind(receiveParam.getKind());
        led.setProgramBase64(receiveParam.getProgramBase64());
      /*  LEDProgram led = new LEDProgram();
        led.setUserId(SecurityUtils.getClientId());
        led.setName(name);
        led.setKind(kind);
        led.setProgramBase64(url);*/
        led.setPreview(receiveParam.getPreviewUrl());
        led.setPages(receiveParam.getPages());
        return save(led);
    }
@@ -48,11 +41,9 @@
        LEDProgram led = new LEDProgram();
        led.setId(receiveParam.getId());
        //led.setUserId(SecurityUtils.getClientId());
        led.setPixel(receiveParam.getPixel());
        led.setSize(receiveParam.getSize());
        led.setName(receiveParam.getName());
        led.setKind(receiveParam.getKind());
        led.setProgramBase64(receiveParam.getProgramBase64());
        led.setPreview(receiveParam.getPreviewUrl());
        led.setPages(receiveParam.getPages());
        return updateById(led);
    }
@@ -69,27 +60,11 @@
    public LambdaQueryWrapper<LEDProgram> listProgram() {
       // LambdaQueryWrapper<LEDProgram> wrapper= new LambdaQueryWrapper<>();
       /* if(SecurityUtils.getClientId()!=null){
            return list(Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId()));
        }else {
            return list(Wrappers.lambdaQuery(LEDProgram.class));
        }*/
        if(SecurityUtils.getClientId()!=null){
          return   Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId,SecurityUtils.getClientId());
        }else {
          return   Wrappers.lambdaQuery(LEDProgram.class);
        if (SecurityUtils.getClientId() != null) {
            return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId());
        } else {
            return Wrappers.lambdaQuery(LEDProgram.class);
        }
    }
    public void NovaTraffic(String ip, int port){
        NovaTraffic novaTraffic = new NovaTraffic("192.168.0.220", 5000);
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,105 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.domain.PushToLed;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlayPlanNvMapper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * æ’­æ”¾è®¡åˆ’
 */
@Service
@AllArgsConstructor
public class PlayPlanNvService extends BaseServiceImpl<PlayPlanNvMapper, PlayPlanNv> {
    private final PlayPlanNvMapper playPlanMapper;
    public boolean addPlan(PlayPlanParam playPlanParam) {
        PlayPlanNv playPlan = new PlayPlanNv();
        if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
            playPlan.setUserId(SecurityUtils.getUserId());
        }
        playPlan.setName(playPlanParam.getName());
       /* playPlan.setLedProgramName(playPlanParam.getLedProgramName());
        playPlan.setLedProgramId(playPlanParam.getLedProgramId());
        playPlan.setVolume(playPlanParam.getVolume());
        playPlan.setApplySeries(playPlanParam.getApplySeries());
        playPlan.setStartDate(playPlanParam.getStartDate());
        playPlan.setEndDate(playPlanParam.getEndDate());
        playPlan.setWeekDays(playPlanParam.getWeekDays());
        playPlan.setSchedule(playPlanParam.getSchedule());
        playPlan.setStartTime(playPlanParam.getStartTime());
        playPlan.setEndTime(playPlanParam.getEndTime());*/
        BeanUtils.copyProperties(playPlanParam, playPlan);
        return save(playPlan);
    }
    public boolean updatePlan(Long id, PlayPlanParam playPlanParam) {
        PlayPlanNv byId = getById(id);
        if (byId == null) {
            throw new BusinessException("操作对象不存在");
        }
        PlayPlanNv playPlan = new PlayPlanNv();
        playPlan.setId(id);
        playPlan.setName(playPlanParam.getName());
        playPlan.setLedProgramName(playPlanParam.getLedProgramName());
        playPlan.setLedProgramId(playPlanParam.getLedProgramId());
        playPlan.setVolume(playPlanParam.getVolume());
        playPlan.setApplySeries(playPlanParam.getApplySeries());
        playPlan.setStartDate(playPlanParam.getStartDate());
        playPlan.setEndDate(playPlanParam.getEndDate());
        playPlan.setWeekDays(playPlanParam.getWeekDays());
        playPlan.setSchedule(playPlanParam.getSchedule());
        playPlan.setStartTime(playPlanParam.getStartTime());
        playPlan.setEndTime(playPlanParam.getEndTime());
        return updateById(playPlan);
    }
    public boolean deletePlan(Long id) {
        PlayPlanNv byId = getById(id);
        if (byId == null) {
            throw new BusinessException("操作对象不存在");
        }
        return removeById(id);
    }
    public Map<String, Object> pushToLed(Long planId){
        PushToLed pushToLed = playPlanMapper.pushToLed(planId);
        if(pushToLed==null){
            throw new BusinessException("未找到该播放计划");
        }
        List<String> playerIds=new ArrayList<>();
        playerIds.add("led的编号");
        List<Map<String,Object>> pages = JSON.parseObject(pushToLed.getPages(), List.class);
        Map schedule = JSON.parseObject(pushToLed.getSchedule(), Map.class);
        Map<String,Object> push=new HashMap<>();
        push.put("playerIds",playerIds);
        push.put("pages",pages);
        push.put("schedule",schedule);
        push.put("noticeUrl","这里是回调地址");
        return push;
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanService.java
ÎļþÒÑɾ³ý