细节调整

liuhaonan

2021-12-17 05ff6ba1e2ee63d3f5d3d36907da74e4110d678d

细节调整

 dao/src/main/java/com/sandu/ximon/dao/domain/AdvisementPlayerFile.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;

/**
 * å¹¿å‘Šæœºç´ æ
 * @TableName advisement_player_file
 */
@TableName(value ="advisement_player_file")
@Data
public class AdvisementPlayerFile implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * ä¸Šä¼ äººid
     */
    private Long userId;

    /**
     * ä¸Šä¼ äºº
     */
    private String userName;

    /**
     * 
     */
    private Long clientId;

    /**
     * æ–‡ä»¶åç§°
     */
    private String fileName;

    /**
     * æ–‡ä»¶å¤§å°
     */
    private Double fileSize;

    /**
     * 
     */
    private String fileBase64;

    /**
     * 
     */
    private String fileType;

    /**
     * åˆ›å»ºæ—¶é—´
     */
    private LocalDateTime createTime;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 dao/src/main/java/com/sandu/ximon/dao/domain/AdvisementPlayerMission.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;

/**
 * LCD广告机任务
 * @TableName advisement_player_mission
 */
@TableName(value ="advisement_player_mission")
@Data
public class AdvisementPlayerMission implements Serializable {
    /**
     * 
     */
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * 
     */
    private Long userId;

    /**
     * 
     */
    private String userName;

    /**
     * 
     */
    private Long clientId;

    /**
     * ä»»åŠ¡åç§°
     */
    private String missionName;

    /**
     * æ–‡ä»¶åç§°
     */
    private String fileName;

    /**
     * æ–‡ä»¶id
     */
    private Long fileId;

    /**
     * ä»»åŠ¡å¤‡æ³¨
     */
    private String missionRemark;

    /**
     * 
     */
    private LocalDateTime createTime;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;
}

 dao/src/main/java/com/sandu/ximon/dao/mapper/AdvisementPlayerFileMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.domain.AdvisementPlayerFile;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Entity com.sandu.ximon.dao.domain.AdvisementPlayerFile
 */
@Mapper
public interface AdvisementPlayerFileMapper extends BaseMapper<AdvisementPlayerFile> {

}





 dao/src/main/java/com/sandu/ximon/dao/mapper/AdvisementPlayerMissionMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.domain.AdvisementPlayerMission;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

/**
 * @Entity com.sandu.ximon.dao.domain.AdvisementPlayerMission
 */
@Mapper
public interface AdvisementPlayerMissionMapper extends BaseMapper<AdvisementPlayerMission> {

}





 dao/src/main/resources/mapper/AdvisementPlayerFileMapper.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.AdvisementPlayerFileMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AdvisementPlayerFile">
            <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="clientId" column="client_id" jdbcType="BIGINT"/>
            <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
            <result property="fileSize" column="file_size" jdbcType="DOUBLE"/>
            <result property="fileBase64" column="file_base64" jdbcType="VARCHAR"/>
            <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,user_id,user_name,
        client_id,file_name,file_size,
        file_base64,file_type,create_time
    </sql>
</mapper>

 dao/src/main/resources/mapper/AdvisementPlayerMissionMapper.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.AdvisementPlayerMissionMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.AdvisementPlayerMission">
            <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="clientId" column="client_id" jdbcType="BIGINT"/>
            <result property="missionName" column="mission_name" jdbcType="VARCHAR"/>
            <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
            <result property="fileId" column="file_id" jdbcType="BIGINT"/>
            <result property="missionRemark" column="mission_remark" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,user_id,user_name,
        client_id,mission_name,file_name,
        file_id,mission_remark,create_time
    </sql>
</mapper>

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

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

/**
 * @Author liuhaonan
 * @Date 2021/12/16 14:07
 * @Version 1.0
 * LCD广告机文件
 */
public class AdvisementPlayerFileController {
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.IpVolumeFileParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.AdvisementPlayerFile;
import com.sandu.ximon.dao.mapper.AdvisementPlayerFileMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

/**
 * @Author liuhaonan
 * @Date 2021/12/16 14:05
 * @Version 1.0
 */
@Service
@AllArgsConstructor
public class AdvisementPlayerFileService extends BaseServiceImpl<AdvisementPlayerFileMapper, AdvisementPlayerFile> {
    private final AdvisementPlayerFileMapper advisementPlayerFileMapper;
    private final ClientService clientService;


    public boolean addFile(IpVolumeFileParam fileParam) {
        AdvisementPlayerFile file = new AdvisementPlayerFile();
        file.setUserId(SecurityUtils.getClientId());
        file.setUserName(SecurityUtils.getUsername());
        file.setClientId(clientService.getClientId());
        file.setFileName(fileParam.getFileName());
        file.setFileSize(fileParam.getFileSize());
        file.setFileBase64(fileParam.getFileBase64());
        return save(file);
    }

    public boolean deleteFile(Long fileId) {
        AdvisementPlayerFile byId = getById(fileId);
        if (byId == null) {
            throw new BusinessException("找不到对应文件");
        }
        return removeById(fileId);
    }

    public LambdaQueryWrapper<AdvisementPlayerFile> listFile(ReceiveParam receiveParam) {
        LambdaQueryWrapper<AdvisementPlayerFile> wrapper = Wrappers.lambdaQuery(AdvisementPlayerFile.class).eq(AdvisementPlayerFile::getClientId, clientService.getClientId());
        if (receiveParam.getKeyWord() == null) {
            return wrapper;
        } else {
            return wrapper.like(AdvisementPlayerFile::getFileName, receiveParam.getKeyWord());
        }
    }
}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.LCDMissionparam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.dao.domain.AdvisementPlayerMission;
import com.sandu.ximon.dao.mapper.AdvisementPlayerMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @Author liuhaonan
 * @Date 2021/12/16 14:32
 * @Version 1.0
 */
@Service
@AllArgsConstructor
public class AdvisementPlayerMissionService extends BaseServiceImpl<AdvisementPlayerMissionMapper, AdvisementPlayerMission> {
    private final AdvisementPlayerMissionMapper advisementPlayerMissionMapper;
    private final ClientService clientService;

    public boolean addMission(LCDMissionparam missionparam) {
        AdvisementPlayerMission mission = new AdvisementPlayerMission();

        mission.setUserId(SecurityUtils.getUserId());
        mission.setUserName(SecurityUtils.getUsername());
        mission.setClientId(clientService.getClientId());
        mission.setMissionName(missionparam.getMissionName());
        mission.setFileId(missionparam.getMissionFileId());
        mission.setFileName(missionparam.getMissionFileName());
        mission.setMissionRemark(missionparam.getMissionRemark());

        return save(mission);
    }

    public boolean updateMission(Long missionId, LCDMissionparam missionparam) {
        AdvisementPlayerMission byId = getById(missionId);
        if (byId == null) {
            throw new BusinessException("未找到该任务");
        }
        AdvisementPlayerMission mission = new AdvisementPlayerMission();
        mission.setId(missionId);
      /*  mission.setUserId(SecurityUtils.getUserId());
        mission.setUserName(SecurityUtils.getUsername());
        mission.setClientId(clientService.getClientId());*/
        mission.setMissionName(missionparam.getMissionName());
        mission.setFileId(missionparam.getMissionFileId());
        mission.setFileName(missionparam.getMissionFileName());
        mission.setMissionRemark(missionparam.getMissionRemark());


        return updateById(mission);
    }

    public boolean deleteMission(Long missionId) {
        AdvisementPlayerMission byId = getById(missionId);
        if (byId == null) {
            throw new BusinessException("未找到该任务");
        }
        return removeById(missionId);
    }

    public List<AdvisementPlayerMission> listMission(ReceiveParam receiveParam) {

        LambdaQueryWrapper<AdvisementPlayerMission> wrapper = Wrappers.lambdaQuery(AdvisementPlayerMission.class).eq(AdvisementPlayerMission::getClientId, SecurityUtils.getUserId()).like(AdvisementPlayerMission::getMissionName, receiveParam.getKeyWord());

        return list(wrapper);
    }

}

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

@@ -9,6 +9,7 @@
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
@@ -78,4 +79,11 @@
    }


    public void NovaTraffic(String ip, int port){
        NovaTraffic novaTraffic = new NovaTraffic("192.168.0.220", 5000);



    }

}