From eee4c5490f9c34f5d80b32fc2215783a77499d25 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 05 七月 2022 17:17:10 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 5 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java | 2 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 4 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java | 1 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 4 +---
5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
index 53743b6..d5fad78 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BannerController.java
@@ -64,6 +64,7 @@
}
}
+ //鍓嶇骞舵湭璋冪敤
@GetMapping("/{bannerId}")
public ResponseVO<Object> detailBanner(@PathVariable Long bannerId) {
if (!permissionConfig.check(MenuEnum.BANNER_DETAIL.getCode())) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
index fe5fa1c..03e6259 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
@@ -18,7 +18,7 @@
* @Author liuhaonan
* @Date 2021/12/21 11:35
* @Version 1.0
- * LED鏂囦欢澶勭悊
+ * 璇虹摝LED鏂囦欢澶勭悊
*/
@RestController
@AllArgsConstructor
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index dda2b8f..5864c4d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -1,8 +1,6 @@
package com.sandu.ximon.admin.controller;
import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.file.FileUploadDto;
import com.sandu.common.file.impl.AliOssFileServiceImpl;
@@ -67,7 +65,7 @@
}
@PostMapping("/uploading/{dateType}")
- public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file, @PathVariable Integer dateType) {
+ public ResponseVO<Object> uploadingFile(@RequestParam("file") MultipartFile file, @RequestParam(value = "dateType", required = false) Integer dateType) {
FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
if ("mp4".equals(fileUploadDto.getFileType())) {
fileUploadDto.setScreenShot(fileUploadDto.getFileUrl() + "?x-oss-process=video/snapshot,t_10000,m_fast");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index b1bde7f..881bef7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -202,7 +202,7 @@
}
/**
- * 鐏潌缁戝畾璁惧
+ * 鐏潌瑙ｇ粦璁惧
*/
@PostMapping("/unBind/{poleId}")
public ResponseVO<Object> unBindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
@@ -295,7 +295,7 @@
}
/**
- * 鏌ョ湅鐏潌缁戝畾鐨勮澶�
+ * 鏌ョ湅鐏潌缁戝畾鐨勮澶� //宸插悎骞跺埌鍒楄〃鍔熻兘 姝ゆ帴鍙ｅ凡搴熷純
*/
@PostMapping("/getPoleBindDevice/{poleId}")
public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index 4b7ad99..263c6dc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -202,6 +202,11 @@
}
+ /**
+ * 灞忓箷璇︽儏 //鍓嶇鏈彂鐜拌皟鐢�
+ * @param sn
+ * @return
+ */
@GetMapping("/getVnnoxInfo/{sn}")
public ResponseVO<Object> getBySnAndPlayerId(@PathVariable String sn) {
return ResponseUtil.success(ledPlayerEntityService.getBySnAndPlayerSn(sn));
--
Gitblit v1.9.3