XMPoleManager.git

			@@ -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>

			@@ -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) {

	ximon-admin/pom.xml	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史