From 78c7b03e279cad29a6123e83da738edc1f00280c Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 23 六月 2022 16:55:41 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java
index 674d261..580baa6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;
+import com.google.gson.internal.$Gson$Preconditions;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.security.annotation.AnonymousAccess;
@@ -8,9 +9,11 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.param.RemotePrarm;
import com.sandu.ximon.admin.param.RemoteUpdateParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.RemoteUpdateService;
import com.sandu.ximon.admin.utils.HexUtils;
import com.sandu.ximon.admin.utils.StringUtil;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,23 +32,49 @@
@RequestMapping("/v1/remoteupdate")
public class RemoteUpdateController {
private RemoteUpdateService remoteUpdateService;
+ private PermissionConfig permissionConfig;
- @AnonymousAccess
+
@PostMapping("/add")
public ResponseVO<Object> addRemoteUpdateFile(@RequestBody @Validated RemoteUpdateParam param) {
+ if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_FILE_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean flag = remoteUpdateService.addRemoteUpdateFile(param.getFilename(), param.getFileType()
, param.getSoftwareVersion(), param.getHardwareVersion(), param.getAliAddress(), param.getFileLength());
return ResponseUtil.success(flag);
}
- @AnonymousAccess
+ /**
+ * 淇敼鍥轰欢鍗囩骇鏂囦欢鍚嶇О
+ *
+ * @param remoteFileId
+ * @param remoteFileName
+ * @return
+ */
+ @GetMapping("/updateRemoteFileName")
+ public ResponseVO<Object> updateRemoteFileName(@RequestParam(required = false, value = "remoteFileId") String remoteFileId,
+ @RequestParam(required = false, value = "remoteFileName") String remoteFileName) {
+ if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_FILE_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ String result = remoteUpdateService.updateRemoteFileName(remoteFileId, remoteFileName);
+ return ResponseUtil.success(result);
+ }
+
@GetMapping("/getRemoteFileList")
public ResponseVO<Object> getRemoteFileList() {
+ if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_FILE_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(remoteUpdateService.getRemoteFileList());
}
@GetMapping("/getRemoteUpdateTypeList")
public ResponseVO<Object> getRemoteUpdateTypeList() {
+ if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_TYPE_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(remoteUpdateService.getRemoteUpdateTypeList());
}
@@ -54,10 +83,11 @@
*
* @return
*/
- //TODO
- @AnonymousAccess
@PostMapping("/StartRemoteUpdate")
public ResponseVO<Object> startRemoteUpdate(@RequestBody @Validated RemotePrarm remotePrarm) {
+ if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_START.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
String orderType;
boolean UpdateFlag = false;
@@ -118,9 +148,11 @@
* @param remotePrarm
* @return
*/
- @AnonymousAccess
@PostMapping("/searchUpdateResult")
public ResponseVO<Object> searchUpdateResult(@RequestBody RemotePrarm remotePrarm) {
+ if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_VERSION.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (remotePrarm.getMac() == null || remotePrarm.getDeviceType() == null) {
throw new BusinessException("缂哄皯鐩稿叧鍙傛暟锛�");
}
@@ -154,9 +186,11 @@
* @param remotePrarm
* @return
*/
- @AnonymousAccess
@PostMapping("/stopUpdate")
public ResponseVO<Object> stopUpdate(@RequestBody RemotePrarm remotePrarm) {
+ if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_STOP.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (remotePrarm.getMac() == null || remotePrarm.getDeviceType() == null) {
throw new BusinessException("缂哄皯鐩稿叧鍙傛暟锛�");
}
--
Gitblit v1.9.3