From 5c87a6a19e76ce8ae9b276532e1c4c53f5cf800b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 04 七月 2022 10:53:54 +0800
Subject: [PATCH] changes
---
ximon-admin/pom.xml | 15 +++++++++++++--
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 2 +-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/pom.xml b/ximon-admin/pom.xml
index 222e6bc..046861c 100644
--- a/ximon-admin/pom.xml
+++ b/ximon-admin/pom.xml
@@ -68,12 +68,17 @@
<version>2.2.10</version>
</dependency>
<!--闃块噷浜戠墿鑱旂綉 -->
+ <!--娣诲姞minio鐨勪緷璧�-->
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>7.1.0</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/minio-7.1.0-all.jar</systemPath>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>net.minidev</groupId>
@@ -93,6 +98,12 @@
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
<version>4.1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
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 e68119d..b1bde7f 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
@@ -7,7 +7,6 @@
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.param.PoleBindParam;
@@ -104,6 +103,7 @@
return ResponseUtil.success(commonPage);
}
+ //宸插惎鐢�
@GetMapping("/listPoleAndState")
public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "groupid", required = false) Long groupid) {
--
Gitblit v1.9.3