Merge remote-tracking branch 'origin/master' into master

1、升級成2.8.1

blade-biz-common/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-biz-common</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-gateway/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-gateway</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-ops-api/blade-stream-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>blade-ops-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-stream-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-ops-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-ops-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.7.2.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
 
     <modules>

blade-ops/blade-mq-rabbit/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-mq-rabbit</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-biz-common</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-ops/blade-stream-consumer/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-stream-consumer</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-stream-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-biz-common</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-ops/blade-stream-provider/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-stream-provider</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -31,12 +31,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-stream-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-biz-common</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
     </dependencies>

blade-ops/blade-websocket/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-websocket</artifactId>
-    <version>2.7.2.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>

blade-ops/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-ops</artifactId>
-    <version>2.7.2.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
 
     <modules>

blade-service-api/community-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,27 +14,27 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>system-expand-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>estate-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>person-api</artifactId>
-            <version>2.7.2.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>person-api</artifactId>-->
+<!--            <version>2.8.1.RELEASE</version>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>enterprise-api</artifactId>
-            <version>2.7.2.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>enterprise-api</artifactId>-->
+<!--            <version>2.8.1.RELEASE</version>-->
+<!--        </dependency>-->
     </dependencies>
 
 

blade-service-api/device-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -35,17 +35,17 @@
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-support</artifactId>
-            <version>2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-support</artifactId>
-            <version>2.3.3</version>
-            <scope>compile</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-support</artifactId>-->
+<!--            <version>2.3</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-support</artifactId>-->
+<!--            <version>2.3.3</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
 
 
     </dependencies>

blade-service-api/enterprise-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/estate-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,30 +15,30 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>system-expand-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springblade</groupId>-->
 <!--            <artifactId>community-api</artifactId>-->
-<!--            <version>2.7.2.RELEASE</version>-->
+<!--            <version>2.8.1.RELEASE</version>-->
 <!--        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>device-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-support</artifactId>
-            <version>2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-support</artifactId>
-            <version>2.3.3</version>
-            <scope>compile</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-support</artifactId>-->
+<!--            <version>2.3</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-support</artifactId>-->
+<!--            <version>2.3.3</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
     </dependencies>
 
 

blade-service-api/grid-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,17 +15,17 @@
         <dependency>
             <artifactId>blade-user-api</artifactId>
             <groupId>org.springblade</groupId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-service-api/person-api/pom.xml

@@ -5,17 +5,17 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>person-api</artifactId>
     <dependencies>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-            <version>3.4.2</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-extension</artifactId>-->
+<!--            <version>3.4.2</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.baomidou</groupId>

blade-service-api/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.7.2.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

blade-service-api/smart-party-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/system-expand-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,13 +15,13 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-service-api/third-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,25 +25,25 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>device-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>work-order-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>

blade-service-api/device-api/src/main/java/org/springblade/device/vo/ElevatorApiResultBean.java → blade-service-api/third-api/src/main/java/org/springblade/third/elevator/bean/ElevatorApiResultBean.java

@@ -1,4 +1,4 @@
-package org.springblade.device.vo;
+package org.springblade.third.elevator.bean;
 
 import lombok.Getter;
 import lombok.Setter;

blade-service-api/third-api/src/main/java/org/springblade/third/elevator/bean/ElevatorInfoResultBean.java

@@ -0,0 +1,26 @@
+package org.springblade.third.elevator.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springblade.device.entity.ElevatorDevice;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author lidexi
+ * @create 2021/01/30 19:25
+ * 第三方接口的通用返回值
+ */
+
+@Setter
+@Getter
+public class ElevatorInfoResultBean<T> implements Serializable {
+
+	//0 成功
+    private Integer code;
+    private List<ElevatorDevice> data;
+    private String message;
+    private Boolean success;
+
+}

blade-service-api/third-api/src/main/java/org/springblade/third/elevator/feign/ElevatorDeviceClientFallback.java

@@ -0,0 +1,47 @@
+package org.springblade.third.elevator.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springblade.device.entity.ElevatorDevice;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class ElevatorDeviceClientFallback implements IElevatorDeviceClient{
+	@Override
+	public List<ElevatorDevice> sync() {
+		return null;
+	}
+
+	@Override
+	public R getRealvideo(String registerCode) {
+		return null;
+	}
+
+	@Override
+	public R getLiftHisAlarm(String registerCodes) {
+		return null;
+	}
+
+
+	@Override
+	public R getAlarmVideo(String alarmCode) {
+		return null;
+	}
+
+	@Override
+	public R getLiftStatus(String registerCode) {
+		return null;
+	}
+
+	@Override
+	public R getLiftPointData(String registerCode) {
+		return null;
+	}
+
+	@Override
+	public R subscribeAlarmData(String webHookUrl) {
+		return null;
+	}
+
+}

blade-service-api/third-api/src/main/java/org/springblade/third/elevator/feign/IElevatorDeviceClient.java

@@ -0,0 +1,62 @@
+package org.springblade.third.elevator.feign;
+
+import io.swagger.annotations.ApiOperation;
+import org.springblade.core.tool.api.R;
+import org.springblade.device.entity.DoorDevice;
+import org.springblade.device.entity.ElevatorDevice;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(value = "cyzh-third",path = "/feign/third/elevator")
+public interface IElevatorDeviceClient {
+
+	/**
+	 * 同步云梯信息
+	 */
+	@PostMapping("/sync")
+	List<ElevatorDevice> sync();
+
+	/**
+	 * 同步云梯信息
+	 */
+	@GetMapping("/getRealvideo")
+	R getRealvideo(@RequestParam(value = "registerCode") String registerCode);
+
+	/**
+	 * 获取电梯历史告警信息(云梯接口)
+	 */
+	@GetMapping("/getLiftHisAlarm")
+	R getLiftHisAlarm(String registerCodes);
+
+	/**
+	 * 获取电梯实时监控信息
+	 */
+	@GetMapping("/getAlarmVideo")
+	R getAlarmVideo(String alarmCode);
+
+	/**
+	 * 获取电梯当前状态
+	 */
+	@GetMapping("/getLiftStatus")
+	@ApiOperation(value = "获取电梯当前状态")
+	R getLiftStatus(String registerCode);
+
+	/**
+	 * 获取电梯环境监测数据
+	 */
+	@GetMapping("/getLiftPointData")
+	@ApiOperation(value = "获取电梯环境监测数据", notes = "传入registerCode")
+	R getLiftPointData(String registerCode);
+
+
+	@PostMapping("/subscribeAlarmData")
+	@ApiOperation(value = "电梯告警订阅")
+	R subscribeAlarmData(String webHookUrl);
+
+}

blade-service-api/work-order-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

blade-service/community/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
@@ -105,7 +105,7 @@
         <!--<dependency>-->
             <!--<groupId>org.springblade</groupId>-->
             <!--<artifactId>person</artifactId>-->
-            <!--<version>2.7.2.RELEASE</version>-->
+            <!--<version>2.8.1.RELEASE</version>-->
         <!--</dependency>-->
     </dependencies>
 

blade-service/device/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,18 +21,18 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>third-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>estate-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
 

blade-service/device/src/main/java/org/springblade/device/conf/ElevatorConfig.java

@@ -1,18 +0,0 @@
-package org.springblade.device.conf;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Data
-@Configuration
-public class ElevatorConfig {
-
-	@Value("${yunti.url}")
-	private String url;
-	@Value("${yunti.appKey}")
-	private String appKey;
-	@Value("${yunti.appSecret}")
-	private String appSecret;
-
-}

blade-service/device/src/main/java/org/springblade/device/controller/ElevatorDeviceController.java

@@ -16,10 +16,6 @@
  */
 package org.springblade.device.controller;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
@@ -29,7 +25,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
-import org.apache.commons.lang.StringUtils;
 import org.springblade.community.entity.Residential;
 import org.springblade.community.feign.IResidentialClient;
 import org.springblade.community.vo.ResidentialVO;
@@ -40,11 +35,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.device.entity.ElevatorAlarmSetting;
 import org.springblade.device.service.IElevatorAlarmSettingService;
-import org.springblade.device.util.ElevatorUtil;
-import org.springblade.device.vo.ElevatorApiResultBean;
-import org.springblade.device.vo.ElevatorInfoResultBean;
 import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.util.QueryWrapperUtil;
+import org.springblade.third.elevator.feign.IElevatorDeviceClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -70,9 +63,9 @@ public class ElevatorDeviceController extends BladeController {
 
 	private final IElevatorDeviceService elevatorDeviceService;
 	private final IOrgPositionClient orgPositionClient;
-	private final ElevatorUtil elevatorUtil;
 	private final IResidentialClient residentialClient;
 	private final IElevatorAlarmSettingService elevatorAlarmSettingService;
+	private final IElevatorDeviceClient elevatorDeviceClient;
 
 	/**
 	 * 详情
@@ -194,41 +187,25 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "同步云梯信息", notes = "")
 	public R syncElevator(){
-
-		List<String> registerCodeList = new ArrayList<>();
-
-		ElevatorApiResultBean liftRegCodes = elevatorUtil.getLiftRegCodes();
-		Object data = liftRegCodes.getData();
-		if (data != null){
-			JSONArray jsonArray = JSONUtil.parseArray(data);
-			jsonArray.forEach(item -> {
-				JSONObject jsonObject = JSONUtil.parseObj(item);
-				Object registerCode = jsonObject.get("registerCode");
-				if (registerCode != null){
-					registerCodeList.add(registerCode.toString());
+		List<ElevatorDevice> list = elevatorDeviceClient.sync();
+		if(list != null && list.size() > 0){
+			list.forEach(item -> {
+				ElevatorDevice wrapper = new ElevatorDevice();
+				wrapper.setRegisterCode(item.getRegisterCode());
+				ElevatorDevice one = this.elevatorDeviceService.getOne(Condition.getQueryWrapper(wrapper));
+				if (one != null){
+					item.setId(one.getId());
+				}else{
+					item.setOrgPosition("/");
+					item.setTenantId("000000");
 				}
+
 			});
+			boolean saveResult = this.elevatorDeviceService.saveOrUpdateBatch(list);
+			return R.status(saveResult);
+		}else{
+			return R.status(true);
 		}
-		Assert.isTrue(registerCodeList.size() > 0, "暂无同步信息！");
-
-		ElevatorInfoResultBean liftInfo = elevatorUtil.getLiftInfo(registerCodeList);
-		List<ElevatorDevice> list = liftInfo.getData();
-
-		list.forEach(item -> {
-			ElevatorDevice wrapper = new ElevatorDevice();
-			wrapper.setRegisterCode(item.getRegisterCode());
-			ElevatorDevice one = this.elevatorDeviceService.getOne(Condition.getQueryWrapper(wrapper));
-			if (one != null){
-				item.setId(one.getId());
-			}else{
-				item.setOrgPosition("/");
-				item.setTenantId("000000");
-			}
-
-		});
-
-		boolean saveResult = this.elevatorDeviceService.saveOrUpdateBatch(list);
-		return R.status(saveResult);
 	}
 
 	/**
@@ -238,9 +215,8 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入elevator")
 	public R getRealvideo(String registerCode) {
-		Map<String, String> params = new HashMap<>();
-		params.put("registerCode", registerCode);
-		return R.data(elevatorUtil.getRealvideoAuthorization(params));
+		R realvideo = elevatorDeviceClient.getRealvideo(registerCode);
+		return realvideo;
 	}
 
 	/**
@@ -250,16 +226,8 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入elevator")
 	public R getLiftHisAlarm(String registerCodes) {
-		Map<String, Object> params = new HashMap<>();
-		params.put("registerCodes", registerCodes.split(","));
-
-		ElevatorApiResultBean resultBean = elevatorUtil.getLiftHisAlarm(params);
-
-		if (resultBean.getCode() != null && resultBean.getCode().equals(0)){
-			return R.data(resultBean.getData());
-		}else{
-			return R.fail(resultBean.getMessage());
-		}
+		R liftHisAlarm = elevatorDeviceClient.getLiftHisAlarm(registerCodes);
+		return liftHisAlarm;
 	}
 
 
@@ -271,7 +239,6 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperation(value = "详情", notes = "传入elevator")
 	public R getListWithYtelevatorXq() {
 		List<Long> residentialIds = elevatorDeviceService.getResidentialIds();
-
 		List<Residential> list = residentialClient.getListWithYtelevatorXq(residentialIds);
 		return R.data(list);
 	}
@@ -283,9 +250,8 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "获取电梯实时监控信息", notes = "传入alarmCode")
 	public R getAlarmVideo(String alarmCode) {
-		Map<String, String> params = new HashMap<>();
-		params.put("alarmCode", alarmCode);
-		return R.data(elevatorUtil.getAlarmVideoAuthorization(params));
+		R alarmVideo = elevatorDeviceClient.getAlarmVideo(alarmCode);
+		return alarmVideo;
 	}
 
 	/**
@@ -295,8 +261,8 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "获取电梯当前状态", notes = "传入elevator")
 	public R getLiftStatus(String registerCode) {
-		ElevatorApiResultBean liftStatus = elevatorUtil.getLiftStatus(registerCode);
-		return R.data(liftStatus);
+		R liftStatus = elevatorDeviceClient.getLiftStatus(registerCode);
+		return liftStatus;
 	}
 
 	/**
@@ -306,8 +272,8 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "获取电梯环境监测数据", notes = "传入registerCode")
 	public R getLiftPointData(String registerCode) {
-		ElevatorApiResultBean liftPointData = elevatorUtil.getLiftPointData(registerCode);
-		return R.data(liftPointData);
+		R liftPointData = elevatorDeviceClient.getLiftPointData(registerCode);
+		return liftPointData;
 	}
 
 	/**
@@ -326,14 +292,14 @@ public class ElevatorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "电梯告警订阅", notes = "传入webHookUrl")
 	public R subscribeAlarmData(String webHookUrl) {
-		ElevatorApiResultBean subscribeResult = elevatorUtil.subscribeAlarmData(webHookUrl);
+		R subscribeResult = elevatorDeviceClient.subscribeAlarmData(webHookUrl);
 		ElevatorAlarmSetting setting = elevatorAlarmSettingService.getById(1L);
-		if (subscribeResult.getCode().equals(0)){
+		if (subscribeResult.isSuccess()){
 			//订阅或者取消订阅成功
 			setting.setWebHookUrl(webHookUrl);
-			boolean b = elevatorAlarmSettingService.updateById(setting);
+			elevatorAlarmSettingService.updateById(setting);
 		}
-		return R.data(subscribeResult);
+		return subscribeResult;
 	}
 
 	/**

blade-service/device/src/main/java/org/springblade/device/util/ElevatorUtil.java

@@ -1,365 +0,0 @@
-package org.springblade.device.util;
-
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springblade.device.conf.ElevatorConfig;
-import org.springblade.device.contants.ElevatorConstants;
-import org.springblade.device.vo.ElevatorApiResultBean;
-import org.springblade.device.vo.ElevatorInfoResultBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import java.net.URI;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Slf4j
-@Component
-//@AllArgsConstructor
-public class ElevatorUtil {
-
-	@Autowired
-	private ElevatorConfig elevatorConfig;
-	@Autowired
-	private RedisTemplate<String,String> redisTemplate;
-
-
-	/**
-	 * 获取电梯注册码列表
-	 * @return
-	 */
-	public ElevatorApiResultBean getLiftRegCodes(){
-		RestTemplate restTemplate = new RestTemplate();
-
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_LIFT_REGCODES + token;
-		HttpHeaders headers = createHttpHeaders();
-		HttpEntity<String> requestEntity = new HttpEntity<>("", headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		return response.getBody();
-	}
-
-	/**
-	 * 获取电梯基本信息
-	 * @return
-	 */
-	public ElevatorInfoResultBean getLiftInfo(List<String> registerCodes){
-		RestTemplate restTemplate = new RestTemplate();
-
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_LIFT_INFO + token;
-		HttpHeaders headers = createHttpHeaders();
-
-		Map<String, Object> params = new HashMap<>();
-		params.put("registerCodes", registerCodes);
-
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorInfoResultBean> reference = new ParameterizedTypeReference<ElevatorInfoResultBean>() {};
-		ResponseEntity<ElevatorInfoResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		return response.getBody();
-	}
-
-	/**
-	 * 获取相机信息
-	 * @return
-	 */
-	public ElevatorApiResultBean getCameraInfo(List<String> registerCodes){
-		RestTemplate restTemplate = new RestTemplate();
-
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_CAMERA_INFO + token;
-		HttpHeaders headers = createHttpHeaders();
-
-		Map<String, Object> params = new HashMap<>();
-		params.put("registerCodes", registerCodes);
-
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		return response.getBody();
-	}
-
-	/**
-	 * 获取电梯历史报警（7天内的电梯历史告警）
-	 * @return
-	 */
-	public ElevatorApiResultBean getLiftHisAlarm(Map<String, Object> params){
-
-		Long endTime = 0L, beginTime = 0L;
-		if (params.get("beginTime") == null && params.get("endTime") == null){
-			endTime = System.currentTimeMillis() / 1000;
-			beginTime = endTime - (7 * 24 * 3600);
-		}else{
-			if (params.get("beginTime") == null && params.get("endTime") != null){
-				endTime = Long.parseLong(params.get("endTime").toString());
-				beginTime = endTime - (7 * 24 * 3600);
-			}
-			if (params.get("endTime") == null && params.get("beginTime") != null){
-				beginTime = Long.parseLong(params.get("beginTime").toString());
-				endTime = beginTime + (7 * 24 * 3600);
-			}
-		}
-		params.put("beginTime", beginTime.toString());
-		params.put("endTime", endTime.toString());
-		if (params.get("PageIndex") == null){
-			params.put("PageIndex", 1);
-		}
-		if (params.get("PageSize") == null){
-			params.put("PageSize", 100);
-		}
-
-		RestTemplate restTemplate = new RestTemplate();
-
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_LIFT_HIS_ALARM + token;
-		HttpHeaders headers = createHttpHeaders();
-
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		return response.getBody();
-	}
-
-	/**
-	 * 请求实时视频授权
-	 * @return
-	 * @param params
-	 */
-	public ElevatorApiResultBean getRealvideoAuthorization(Map<String, String> params){
-		RestTemplate restTemplate = new RestTemplate();
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_REAL_VIDEO_AUTHORIZATION + token;
-		HttpHeaders headers = createHttpHeaders();
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-		return response.getBody();
-	}
-
-	/**
-	 * 请求历史告警视频授权
-	 * @return
-	 * @param params
-	 */
-	public ElevatorApiResultBean getAlarmVideoAuthorization(Map<String, String> params){
-		params.put("authType", "token");
-		RestTemplate restTemplate = new RestTemplate();
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_ALARM_VIDEO + token;
-		HttpHeaders headers = createHttpHeaders();
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-		return response.getBody();
-	}
-
-	/**
-	 * 获取电梯当前状态
-	 * @return
-	 */
-	public ElevatorApiResultBean getLiftStatus(String registerCode){
-		RestTemplate restTemplate = new RestTemplate();
-
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_LIFT_STATUS + token;
-		HttpHeaders headers = createHttpHeaders();
-
-		Map<String, Object> params = new HashMap<>();
-		params.put("registerCode", registerCode);
-
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		return response.getBody();
-	}
-
-	/**
-	 * 获取电梯环境监测数据
-	 * @return
-	 */
-	public ElevatorApiResultBean getLiftPointData(String registerCode){
-		RestTemplate restTemplate = new RestTemplate();
-
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_LIFT_POINT_DATA + token;
-		HttpHeaders headers = createHttpHeaders();
-
-		Map<String, Object> params = new HashMap<>();
-		params.put("registerCode", registerCode);
-
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		return response.getBody();
-	}
-
-	/**
-	 * 电梯告警订阅
-	 * @return
-	 */
-	public ElevatorApiResultBean subscribeAlarmData(String webHookUrl){
-		RestTemplate restTemplate = new RestTemplate();
-
-		String token = this.getEffectiveToken();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.SUBSCRIBE_ALARM_DATA + token;
-		HttpHeaders headers = createHttpHeaders();
-
-		Map<String, Object> params = new HashMap<>();
-		if (StringUtils.isNotBlank(webHookUrl)){
-			params.put("webHookUrl", webHookUrl);
-		}
-
-		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		return response.getBody();
-	}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-	/**
-	 * 从接口获取token
-	 * @return
-	 */
-	public Map<String, Object> getToken(){
-		HttpHeaders headers = createHttpHeaders();
-		RestTemplate restTemplate = new RestTemplate();
-		String url = elevatorConfig.getUrl() + ElevatorConstants.GET_TOKEN;
-
-		Map<String, String> map = new HashMap<>();
-		map.put("appKey", elevatorConfig.getAppKey());
-		map.put("appSecret", elevatorConfig.getAppSecret());
-
-		String params = JSONUtil.toJsonStr(map);
-		log.warn("getOpenDoorLogs body >>>>>>>>>> " + params);
-
-		HttpEntity<String> requestEntity = new HttpEntity<>(params, headers);
-		URI uri = URI.create(url);
-		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
-		ResponseEntity<ElevatorApiResultBean> response = null;
-		response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
-
-		ElevatorApiResultBean responseBody = response.getBody();
-		if (responseBody != null && responseBody.getCode().equals(0)){
-			 Map<String, Object> data = (Map<String, Object>) responseBody.getData();
-			 return data;
-		}
-
-		return null;
-	}
-
-	/**
-	 * 获取有效的token（优先拿缓存）
-	 * @return
-	 * @throws ParseException
-	 */
-	public String getEffectiveToken() {
-		String accessToken = null;
-//		redisTemplate.opsForValue().get();
-//		redisTemplate.opsForValue().set();
-
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		simpleDateFormat.setTimeZone(TimeZone.getTimeZone("Etc/GMT-8"));
-
-		if (redisTemplate.hasKey(ElevatorConstants.TOKEN_KEY)){
-			// 有缓存
-			String tokenObjStr = redisTemplate.opsForValue().get(ElevatorConstants.TOKEN_KEY);
-			JSONObject jsonObject = JSONUtil.parseObj(tokenObjStr);
-			accessToken = jsonObject.get("accessToken").toString();
-			String expiresTimeStr = jsonObject.get("expiresTime").toString();
-
-			try {
-				Date expiresTime = simpleDateFormat.parse(expiresTimeStr);
-				Date now = new Date();
-				if (now.before(expiresTime)){
-					// 未失效
-				}else{
-					// 已失效
-					accessToken = this.getAndSet2Redis(simpleDateFormat);
-				}
-
-			}catch (ParseException e){
-				log.error( "时间转换错误！" + e.getMessage());
-			}
-		}else{
-			// 无缓存
-			accessToken = this.getAndSet2Redis(simpleDateFormat);
-		}
-
-		return accessToken;
-	}
-
-	/**
-	 * 获取token并存储到redis
-	 * @param simpleDateFormat
-	 * @return
-	 */
-	public String getAndSet2Redis(SimpleDateFormat simpleDateFormat){
-		String accessToken = null;
-		Map<String, Object> tokenObj = this.getToken();
-		Integer expiresTime;
-		if (tokenObj != null){
-			accessToken = tokenObj.get("accessToken").toString();
-
-			expiresTime = (Integer) tokenObj.get("expiresTime");
-			// 把失效时间提前两个小时
-			String format = simpleDateFormat.format(new Date((expiresTime - 2 * 3600L) * 1000L));
-			tokenObj.replace("expiresTime", format);
-			redisTemplate.opsForValue().set(ElevatorConstants.TOKEN_KEY, JSONUtil.toJsonStr(tokenObj));
-		}
-		return accessToken;
-	}
-
-	private HttpHeaders createHttpHeaders(){
-		HttpHeaders httpHeaders = new HttpHeaders();
-		httpHeaders.add(HttpHeaders.CONTENT_TYPE, "application/json");
-//		httpHeaders.add("appKey", elevatorConfig.getAppKey());
-//		httpHeaders.add("appSecret", elevatorConfig.getAppSecret());
-		return httpHeaders;
-	}
-
-
-}

blade-service/enterprise/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springblade</groupId>
@@ -60,19 +60,19 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>system-expand-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>device-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
     </dependencies>
 

blade-service/estate/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>person-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -57,13 +57,13 @@
         <!--<dependency>-->
             <!--<groupId>org.springblade</groupId>-->
             <!--<artifactId>third</artifactId>-->
-            <!--<version>2.7.2.RELEASE</version>-->
+            <!--<version>2.8.1.RELEASE</version>-->
         <!--</dependency>-->
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>device</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
     </dependencies>

blade-service/grid/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>grid-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

blade-service/person/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -34,22 +34,28 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>estate-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>person-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>enterprise-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-support</artifactId>
+            <version>2.3.3</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

blade-service/person/src/main/java/org/springblade/person/controller/HouseUserController.java

@@ -45,6 +45,7 @@ import org.springblade.person.wrapper.HouserUserWrapper;
 import org.springblade.system.expand.entity.OrgPosition;
 import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.system.expand.feign.IOrgPositionClient;
+import org.springblade.system.expand.util.QueryWrapperUtil;
 import org.springblade.system.expand.vo.OrgPositionVO;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -107,19 +108,32 @@ public class HouseUserController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicInfo")
 	public R<IPage<HouseUserVO>> list(@RequestParam Map<String,Object> basicInfo, Query query, BladeUser bladeUser) {
-		LambdaQueryWrapper<HouseUser> wrapper = Condition.getQueryWrapper(basicInfo,HouseUser.class).lambda();
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		for(int i=0;i<deptIds.length;i++){
-			OrgPosition orgPosition = new OrgPosition();
-			orgPosition.setOrgId(Long.valueOf(deptIds[i]));
-			OrgPositionVO orgPositionVO = orgPositionClient.detail(orgPosition);
-			if(i ==0){
-				wrapper.like(HouseUser::getOrgPosition,orgPositionVO.getOrgPosition());
-			}else{
-				wrapper.or().like(HouseUser::getOrgPosition,orgPositionVO.getOrgPosition());
-			}
+//		LambdaQueryWrapper<HouseUser> wrapper = Condition.getQueryWrapper(basicInfo,HouseUser.class).lambda();
+//		String deptId = bladeUser.getDeptId();
+//		String[] deptIds = deptId.split(",");
+//		for(int i=0;i<deptIds.length;i++){
+//			OrgPosition orgPosition = new OrgPosition();
+//			orgPosition.setOrgId(Long.valueOf(deptIds[i]));
+//			OrgPositionVO orgPositionVO = orgPositionClient.detail(orgPosition);
+//			if(i ==0){
+//				wrapper.like(HouseUser::getOrgPosition,orgPositionVO.getOrgPosition());
+//			}else{
+//				wrapper.or().like(HouseUser::getOrgPosition,orgPositionVO.getOrgPosition());
+//			}
+//		}
+		Integer checkState = null;
+		Long residentialId = null;
+		if(basicInfo.get("checkState") != null){
+			checkState = Integer.parseInt(String.valueOf(basicInfo.get("checkState")));
+			basicInfo.remove("checkState");
+		}
+		if(basicInfo.get("residentialId") != null){
+			residentialId = Long.parseLong(String.valueOf(basicInfo.get("residentialId")));
+			basicInfo.remove("residentialId");
 		}
+		LambdaQueryWrapper<HouseUser> wrapper = new QueryWrapperUtil<HouseUser>().getBasicQueryWrapperByMap(HouseUser::getOrgPosition, basicInfo, new HouseUser(), bladeUser, orgPositionClient);
+		wrapper.eq(checkState != null, HouseUser::getCheckState, checkState);
+		wrapper.eq(residentialId != null, HouseUser::getResidentialId, residentialId);
 		IPage<HouseUser> pages = houseUserService.page(Condition.getPage(query),wrapper);
 		return R.data(HouserUserWrapper.build().pageVO(pages));
 	}

blade-service/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX-Biz</artifactId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.7.2.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
 
     <modules>

blade-service/smart-party/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
@@ -53,43 +53,43 @@
 <!--        <dependency>-->
 <!--            <groupId>org.springblade</groupId>-->
 <!--            <artifactId>person</artifactId>-->
-<!--            <version>2.7.2.RELEASE</version>-->
+<!--            <version>2.8.1.RELEASE</version>-->
 <!--            <scope>compile</scope>-->
 <!--        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>person-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>enterprise-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <!--        <dependency>-->
 <!--            <groupId>org.springblade</groupId>-->
 <!--            <artifactId>enterprise-api</artifactId>-->
-<!--            <version>2.7.2.RELEASE</version>-->
+<!--            <version>2.8.1.RELEASE</version>-->
 <!--            <scope>compile</scope>-->
 <!--        </dependency>-->
         <!--        <dependency>-->
 <!--            <groupId>org.springblade</groupId>-->
 <!--            <artifactId>community</artifactId>-->
-<!--            <version>2.7.2.RELEASE</version>-->
+<!--            <version>2.8.1.RELEASE</version>-->
 <!--            <scope>compile</scope>-->
 <!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>org.springblade</groupId>-->
 <!--            <artifactId>enterprise</artifactId>-->
-<!--            <version>2.7.2.RELEASE</version>-->
+<!--            <version>2.8.1.RELEASE</version>-->
 <!--            <scope>compile</scope>-->
 <!--        </dependency>-->
     </dependencies>

blade-service/system-expand/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>system-expand-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-dict-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.google.http-client</groupId>

blade-service/third/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,17 +15,17 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>third-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>estate-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.nepxion</groupId>

blade-service/third/src/main/java/org/springblade/third/elevator/feign/ElevatorDeviceClient.java

@@ -0,0 +1,125 @@
+package org.springblade.third.elevator.feign;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.tool.api.R;
+import org.springblade.device.entity.ElevatorDevice;
+import org.springblade.third.elevator.bean.ElevatorApiResultBean;
+import org.springblade.third.elevator.bean.ElevatorInfoResultBean;
+import org.springblade.third.elevator.util.ElevatorUtil;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/feign/third/elevator")
+@AllArgsConstructor
+public class ElevatorDeviceClient implements IElevatorDeviceClient {
+
+	private final ElevatorUtil elevatorUtil;
+
+	/**
+	 * 同步云梯信息
+	 */
+	@Override
+	@PostMapping("/sync")
+	public List<ElevatorDevice> sync(){
+		List<String> registerCodeList = new ArrayList<>();
+		ElevatorApiResultBean liftRegCodes = elevatorUtil.getLiftRegCodes();
+		Object data = liftRegCodes.getData();
+		if (data != null){
+			JSONArray jsonArray = JSONUtil.parseArray(data);
+			jsonArray.forEach(item -> {
+				JSONObject jsonObject = JSONUtil.parseObj(item);
+				Object registerCode = jsonObject.get("registerCode");
+				if (registerCode != null){
+					registerCodeList.add(registerCode.toString());
+				}
+			});
+		}
+		Assert.isTrue(registerCodeList.size() > 0, "暂无同步信息！");
+		ElevatorInfoResultBean liftInfo = elevatorUtil.getLiftInfo(registerCodeList);
+		List<ElevatorDevice> list = liftInfo.getData();
+		return list;
+	}
+
+	/**
+	 * 同步云梯信息
+	 */
+	@Override
+	@GetMapping("/getRealvideo")
+	public R getRealvideo(@RequestParam(value = "registerCode") String registerCode){
+		Map<String, String> params = new HashMap<>();
+		params.put("registerCode", registerCode);
+		return R.data(elevatorUtil.getRealvideoAuthorization(params));
+	}
+
+	/**
+	 * 获取电梯历史告警信息(云梯接口)
+	 */
+	@Override
+	@GetMapping("/getLiftHisAlarm")
+	public R getLiftHisAlarm(@RequestParam(value = "registerCode")String registerCodes){
+		Map<String, Object> params = new HashMap<>();
+		params.put("registerCodes", registerCodes.split(","));
+
+		ElevatorApiResultBean resultBean = elevatorUtil.getLiftHisAlarm(params);
+
+		if (resultBean.getCode() != null && resultBean.getCode().equals(0)){
+			return R.data(resultBean.getData());
+		}else{
+			return R.fail(resultBean.getMessage());
+		}
+	}
+
+	/**
+	 * 获取电梯实时监控信息
+	 */
+	@Override
+	@GetMapping("/getAlarmVideo")
+	public R getAlarmVideo(@RequestParam(value = "registerCode")String alarmCode){
+		Map<String, String> params = new HashMap<>();
+		params.put("alarmCode", alarmCode);
+		return R.data(elevatorUtil.getAlarmVideoAuthorization(params));
+	}
+
+	/**
+	 * 获取电梯当前状态
+	 */
+	@Override
+	@GetMapping("/getLiftStatus")
+	@ApiOperation(value = "获取电梯当前状态")
+	public R getLiftStatus(@RequestParam(value = "registerCode")String registerCode){
+		ElevatorApiResultBean liftStatus = elevatorUtil.getLiftStatus(registerCode);
+		return R.data(liftStatus);
+	}
+
+	@Override
+	@GetMapping("/getLiftPointData")
+	@ApiOperation(value = "获取电梯环境监测数据", notes = "传入registerCode")
+	public R getLiftPointData(@RequestParam(value = "registerCode")String registerCode) {
+		ElevatorApiResultBean liftPointData = elevatorUtil.getLiftPointData(registerCode);
+		return R.data(liftPointData);
+	}
+
+
+	@Override
+	@PostMapping("/subscribeAlarmData")
+	@ApiOperation(value = "电梯告警订阅")
+	public R subscribeAlarmData(String webHookUrl){
+		ElevatorApiResultBean subscribeResult = elevatorUtil.subscribeAlarmData(webHookUrl);
+		if (subscribeResult.getCode().equals(0)){
+			return R.status(true);
+		}else{
+			return R.status(false);
+		}
+	}
+
+}

blade-service/third/src/main/java/org/springblade/third/elevator/util/ElevatorUtil.java

@@ -3,6 +3,7 @@ package org.springblade.third.elevator.util;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springblade.third.elevator.bean.ElevatorApiResultBean;
 import org.springblade.third.elevator.bean.ElevatorInfoResultBean;
 import org.springblade.third.elevator.conf.ElevatorConfig;
@@ -24,7 +25,6 @@ import java.util.*;
 
 @Slf4j
 @Component
-//@AllArgsConstructor
 public class ElevatorUtil {
 
 	@Autowired
@@ -217,6 +217,30 @@ public class ElevatorUtil {
 		return response.getBody();
 	}
 
+	/**
+	 * 电梯告警订阅
+	 * @return
+	 */
+	public ElevatorApiResultBean subscribeAlarmData(String webHookUrl){
+		RestTemplate restTemplate = new RestTemplate();
+
+		String token = this.getEffectiveToken();
+		String url = elevatorConfig.getUrl() + org.springblade.device.contants.ElevatorConstants.SUBSCRIBE_ALARM_DATA + token;
+		HttpHeaders headers = createHttpHeaders();
+
+		Map<String, Object> params = new HashMap<>();
+		if (StringUtils.isNotBlank(webHookUrl)){
+			params.put("webHookUrl", webHookUrl);
+		}
+
+		HttpEntity<String> requestEntity = new HttpEntity<>(JSONUtil.toJsonStr(params), headers);
+		URI uri = URI.create(url);
+		ParameterizedTypeReference<ElevatorApiResultBean> reference = new ParameterizedTypeReference<ElevatorApiResultBean>() {};
+		ResponseEntity<ElevatorApiResultBean> response = restTemplate.exchange(uri, HttpMethod.POST, requestEntity, reference);
+
+		return response.getBody();
+	}
+
 
 
 

blade-service/work-order/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,23 +20,23 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-flow-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>work-order-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>device-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

community-app-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springblade</groupId>
@@ -108,30 +108,35 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>person-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>estate-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>third-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>enterprise-api</artifactId>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
 
@@ -142,7 +147,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>person-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <scope>compile</scope>
         </dependency>
 
@@ -169,11 +174,11 @@
             <version>2.5.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-support</artifactId>
-            <version>2.3</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-support</artifactId>-->
+<!--            <version>2.3</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.baomidou</groupId>

park-app-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.7.2.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>device</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springblade</groupId>
@@ -96,41 +96,41 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>system-expand-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>person-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-resource-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-user-api</artifactId>
-            <version>2.8.0.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>estate-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>community-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>third-api</artifactId>
-            <version>${bladex.project.version}</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
 
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>smart-party-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
 
         </dependency>
 
@@ -182,12 +182,12 @@
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>enterprise-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>work-order-api</artifactId>
-            <version>2.7.2.RELEASE</version>
+            <version>2.8.1.RELEASE</version>
         </dependency>
 
     </dependencies>

pom.xml

@@ -5,11 +5,11 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Biz</artifactId>
-    <version>2.7.2.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.project.version>2.7.2.RELEASE</bladex.project.version>
+        <bladex.project.version>2.8.1.RELEASE</bladex.project.version>
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

script/docker/app/.env

@@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.7.2.RELEASE
+TAG=2.8.1.RELEASE