ip音柱文件上传

liuhaonan

2022-04-08 df67e2b6894130662f0a3b42f4b965aedb90869e

ip音柱文件上传

 pom.xml

@@ -126,14 +126,6 @@
                <artifactId>poi-ooxml</artifactId>
                <version>3.17</version>
            </dependency>

            <!-- MinIO服务器 -->
            <dependency>
                <groupId>io.minio</groupId>
                <artifactId>minio</artifactId>
                <version>7.1.0</version>
            </dependency>

        </dependencies>
    </dependencyManagement>


 ximon-admin/pom.xml

@@ -68,6 +68,14 @@
            <version>2.2.10</version>
        </dependency>
        <!--阿里云物联网 -->

        <!-- MinIO服务器 -->
        <dependency>
            <groupId>io.minio</groupId>
            <artifactId>minio</artifactId>
            <version>7.1.0</version>
        </dependency>

    </dependencies>

    <!-- Maven控制Spring Profile -->

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

@@ -110,6 +110,16 @@
        return ResponseUtil.success(ipVolumeMissionService.playTask(taskId));
    }

    @GetMapping("/continueTask/{taskId}")
    public ResponseVO<Object> continueTask(@PathVariable Integer taskId) {
        return ResponseUtil.success(ipVolumeMissionService.continueTask(taskId));
    }

    @GetMapping("/pauseTask/{taskId}")
    public ResponseVO<Object> pauseTask(@PathVariable Integer taskId) {
        return ResponseUtil.success(ipVolumeMissionService.pauseTask(taskId));
    }

    @GetMapping("/stopTask/{taskId}")
    public ResponseVO<Object> stopTask(@PathVariable Integer taskId) {
        return ResponseUtil.success(ipVolumeMissionService.stopTask(taskId));

 ximon-admin/src/main/java/com/sandu/ximon/admin/minio/entity/MinIoConstant.java

@@ -3,7 +3,7 @@
public enum MinIoConstant {

    //  log
    LOG("log",0),
    LOG("log", 0),
    //  测试文件桶
    TEST("test", 1),
    //  串口文件桶前缀
@@ -11,14 +11,13 @@
    //  音柱文件桶前缀
    BROADCAST_FILE("ipvolume.", 3),
    //  管理员音柱文件桶前缀
    ADMIN_BROADCAST_FILE("adminipvolume", 3)
    ADMIN_BROADCAST_FILE("adminipvolume", 3);

    ;

    MinIoConstant(String bucketName, Integer type){
    MinIoConstant(String bucketName, Integer type) {
        this.bucketName = bucketName;
        this.type = type;
    }

    private String bucketName;

    private Integer type;
@@ -36,6 +35,7 @@
    public static String getAbsolutePath(MinIoConstant minIoConstant, String fileName) {
        return SERVER_ABSOLUTE_PATH + minIoConstant.getBucketName() + "/" + fileName;
    }

    public static String getAbsolutePath(String bucketName, String fileName) {
        return SERVER_ABSOLUTE_PATH + bucketName + "/" + fileName;
    }

 ximon-admin/src/main/java/com/sandu/ximon/admin/minio/utils/MinIoUtil.java

@@ -1,12 +1,13 @@
package com.sandu.ximon.admin.minio.utils;

import com.alibaba.fastjson.JSONObject;

import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.minio.config.MinIoPolicy;
import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.SpringContextUtils;


import io.minio.*;
import io.minio.errors.*;
import io.minio.messages.Bucket;

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

@@ -96,7 +96,7 @@
            if (fileEntity == null) {
                throw new BusinessException("fileId为" + fileId + "的文件不存在");
            }
            if(fileEntity.getUserId()==null&&fileEntity.getClientId()!=null){
            if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
                fileEntity.setUserId(fileEntity.getClientId());
            }
            String absolutePath;
@@ -104,7 +104,7 @@
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if(fileEntity.getUserId()==null&&fileEntity.getClientId()==null){
            if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
                absolutePath = MinIoConstant.getAbsolutePath(
                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                        fileEntity.getFileName()
@@ -434,12 +434,44 @@

    }

    /**
     * 推送
     *
     * @param taskId
     * @return
     */
    public boolean playTask(Integer taskId) {
        return TaskAPIUtils.playTask(taskId);
    }


    /**
     * 停止
     *
     * @param taskId
     * @return
     */
    public boolean stopTask(Integer taskId) {
        return TaskAPIUtils.stopTask(taskId);
    }

    /**
     * 暂停
     *
     * @param taskId
     * @return
     */
    public boolean pauseTask(Integer taskId) {
        return TaskAPIUtils.pauseTask(taskId);
    }

    /**
     * 继续
     *
     * @param taskId
     * @return
     */
    public boolean continueTask(Integer taskId) {
        return TaskAPIUtils.continueTask(taskId);
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/BroadcastPostUtils.java

@@ -46,6 +46,7 @@
     * m 1 1 1
     * f 1 1 1
     * y 1
     *
     * @param in
     * @param encoding
     * @return

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TaskAPIUtils.java

@@ -8,7 +8,9 @@
import com.sandu.ximon.admin.utils.request.LoginRequestParams;
import com.sandu.ximon.admin.utils.response.CommonResponseVO;
import com.sandu.ximon.admin.utils.response.DataResponseVO;
import com.sandu.ximon.admin.vo.*;
import com.sandu.ximon.admin.vo.IDResponseVO;
import com.sandu.ximon.admin.vo.LoginResponseVO;
import com.sandu.ximon.admin.vo.TaskVO;


public class TaskAPIUtils {
@@ -29,20 +31,20 @@
                        ).getParams(),
                        BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                )
                ,LoginResponseVO.class
                , LoginResponseVO.class
        );

        IDResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("data",taskVO)
                                .put("data", taskVO)
                                .getKey(responseVO1),
                        BroadcastAPI.ADD_TASK.getUrl(),
                        CharUtils.UTF8),
                IDResponseVO.class
        );

        if("access id 错误".equals(responseVO.getMsg())){
        if ("access id 错误".equals(responseVO.getMsg())) {
            //去获取TOKEN或者ID
            LoginResponseVO responseVO3 = JSON.parseObject(
                    BroadcastPostUtils.Post(
@@ -52,7 +54,7 @@
                            ).getParams(),
                            BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                    )
                    ,LoginResponseVO.class
                    , LoginResponseVO.class
            );
            System.out.println(responseVO1);
            System.out.println("---------------------------------------------------------");
@@ -60,7 +62,7 @@
            IDResponseVO responseVO2 = JSON.parseObject(
                    BroadcastPostUtils.Post(
                            new CommonRequestParams()
                                    .put("data",taskVO)// responseVO1.toString(),
                                    .put("data", taskVO)// responseVO1.toString(),
                                    .getKey(responseVO1),
                            BroadcastAPI.ADD_TASK.getUrl(),
                            CharUtils.UTF8),
@@ -70,7 +72,7 @@
            //重新请求数据
        }

        if(responseVO.isOK()){
        if (responseVO.isOK()) {
            return responseVO.getId();
        }
        return 0;
@@ -86,19 +88,19 @@
                        ).getParams(),
                        BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                )
                ,LoginResponseVO.class
                , LoginResponseVO.class
        );
        DataResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id",taskId)
                                .put("id", taskId)
                                .getKey(responseVO1),
                        BroadcastAPI.GET_TASK.getUrl(),
                        CharUtils.UTF8),
                DataResponseVO.class
        );

        if(responseVO.isOK()){
        if (responseVO.isOK()) {
            TaskVO taskVO = responseVO.convert(TaskVO.class);
            return taskVO;
        }
@@ -107,18 +109,19 @@

    /**
     * 删除任务
     *
     * @param taskId
     * @return 0: 成功 1：任务不处于空闲状态 2:服务器删除失败
     */
    public static Integer delTask(Integer taskId) {

        TaskVO task = getTask(taskId);
        if(task == null) {
        if (task == null) {
            return 0;
        }
        if(0 != task.getExe()) {
        if (0 != task.getExe()) {
            return 1;
        }else {
        } else {
            LoginResponseVO responseVO1 = JSON.parseObject(
                    BroadcastPostUtils.Post(
                            new LoginRequestParams(
@@ -127,20 +130,20 @@
                            ).getParams(),
                            BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                    )
                    ,LoginResponseVO.class
                    , LoginResponseVO.class
            );
            CommonResponseVO responseVO = JSON.parseObject(
                    BroadcastPostUtils.Post(
                            new CommonRequestParams()
                                    .put("id",taskId)
                                    .put("id", taskId)
                                    .getKey(responseVO1),
                            BroadcastAPI.DEL_TASK.getUrl(),
                            CharUtils.UTF8),
                    CommonResponseVO.class
            );
            if(responseVO.isOK()){
            if (responseVO.isOK()) {
                return 0;
            }else{
            } else {
                return 2;
            }
        }
@@ -156,18 +159,18 @@
                        ).getParams(),
                        BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                )
                ,LoginResponseVO.class
                , LoginResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id",taskId)
                                .put("id", taskId)
                                .getKey(responseVO1),
                        BroadcastAPI.RUN_TASK.getUrl(),
                        CharUtils.UTF8),
                CommonResponseVO.class
        );
        if(responseVO.isOK()){
        if (responseVO.isOK()) {
            return true;
        }
        return false;
@@ -182,18 +185,18 @@
                        ).getParams(),
                        BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                )
                ,LoginResponseVO.class
                , LoginResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id",taskId)
                                .put("id", taskId)
                                .getKey(responseVO1),
                        BroadcastAPI.END_TASK.getUrl(),
                        CharUtils.UTF8),
                CommonResponseVO.class
        );
        if(responseVO.isOK()){
        if (responseVO.isOK()) {
            return true;
        }
        return false;
@@ -201,6 +204,7 @@

    /**
     * 暂停
     *
     * @param taskId
     * @return
     */
@@ -213,18 +217,18 @@
                        ).getParams(),
                        BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                )
                ,LoginResponseVO.class
                , LoginResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id",taskId)
                                .put("id", taskId)
                                .getKey(responseVO1),
                        BroadcastAPI.PAUSE_TASK.getUrl(),
                        CharUtils.UTF8),
                CommonResponseVO.class
        );
        if(responseVO.isOK()){
        if (responseVO.isOK()) {
            return true;
        }
        return false;
@@ -232,6 +236,7 @@

    /**
     * 继续
     *
     * @param taskId
     * @return
     */
@@ -244,18 +249,18 @@
                        ).getParams(),
                        BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                )
                ,LoginResponseVO.class
                , LoginResponseVO.class
        );
        CommonResponseVO responseVO = JSON.parseObject(
                BroadcastPostUtils.Post(
                        new CommonRequestParams()
                                .put("id",taskId)
                                .put("id", taskId)
                                .getKey(responseVO1),
                        BroadcastAPI.PLAY_TASK.getUrl(),
                        CharUtils.UTF8),
                CommonResponseVO.class
        );
        if(responseVO.isOK()){
        if (responseVO.isOK()) {
            return true;
        }
        return false;
@@ -263,12 +268,12 @@

    public static Integer updateTask(Integer taskId, Integer defaultVolumn) {
        TaskVO task = getTask(taskId);
        if(task == null) {
        if (task == null) {
            return 0;
        }
        if(0 != task.getExe()) {
        if (0 != task.getExe()) {
            return 1;
        }else {
        } else {
            task.setVol(defaultVolumn);
            LoginResponseVO responseVO1 = JSON.parseObject(
                    BroadcastPostUtils.Post(
@@ -278,21 +283,21 @@
                            ).getParams(),
                            BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                    )
                    ,LoginResponseVO.class
                    , LoginResponseVO.class
            );
            CommonResponseVO responseVO = JSON.parseObject(
                    BroadcastPostUtils.Post(
                            new CommonRequestParams()
                                    .put("id",taskId)
                                    .put("data",task)
                                    .put("id", taskId)
                                    .put("data", task)
                                    .getKey(responseVO1),
                            BroadcastAPI.UPDATE_TASK.getUrl(),
                            CharUtils.UTF8),
                    CommonResponseVO.class
            );
            if(responseVO.isOK()){
            if (responseVO.isOK()) {
                return 0;
            }else{
            } else {
                return 2;
            }
        }
@@ -300,20 +305,21 @@

    /**
     * 更新任务
     *
     * @param taskId
     * @param
     * @return  0：成功 1：服务器无该任务 2：任务正在执行，无法修改 3：服务器修改失败
     * @return 0：成功 1：服务器无该任务 2：任务正在执行，无法修改 3：服务器修改失败
     */
    public static Integer updateTask(//
            Integer taskId, IpVolumeMissionParam param) {
                                     Integer taskId, IpVolumeMissionParam param) {

        TaskVO task = getTask(taskId);
        if(task == null) {
        if (task == null) {
            return 1;
        }
        if(0 != task.getExe()) {
        if (0 != task.getExe()) {
            return 2;
        }else {
        } else {
            task.setName(param.getMissionName());
            task.setVol(param.getMissionVolume());
            task.setBdate(param.getOnDate());
@@ -330,21 +336,21 @@
                            ).getParams(),
                            BroadcastAPI.LOGIN.getUrl(), CharUtils.UTF8
                    )
                    ,LoginResponseVO.class
                    , LoginResponseVO.class
            );
            CommonResponseVO responseVO = JSON.parseObject(
                    BroadcastPostUtils.Post(
                            new CommonRequestParams()
                                    .put("id",taskId)
                                    .put("data",task)
                                    .put("id", taskId)
                                    .put("data", task)
                                    .getKey(responseVO1),
                            BroadcastAPI.UPDATE_TASK.getUrl(),
                            CharUtils.UTF8),
                    CommonResponseVO.class
            );
            if(responseVO.isOK()){
            if (responseVO.isOK()) {
                return 0;
            }else{
            } else {
                return 3;
            }
        }

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java

@@ -1,9 +1,7 @@
package com.sandu.ximon.admin.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.sandu.ximon.admin.dto.BroadcastTaskType;
import com.sandu.ximon.admin.param.IPTaskParam;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import lombok.Data;

@@ -123,8 +121,8 @@

    private String weeks;

    private List<Integer> fileIds=new ArrayList<>();
    private List<Integer> fileIds = new ArrayList<>();

    private List<Integer> TerminalIds=new ArrayList<>();
    private List<Integer> TerminalIds = new ArrayList<>();

}