1、aep对接

blade-biz-common/src/main/java/org/springblade/common/constant/AepConstant.java

@@ -7,6 +7,6 @@ package org.springblade.common.constant;
 
 public class AepConstant {
 
-	public static final String APPKEY = "lAcNAWcVwxb";
-	public static final String APPSECRET = "apjeandFrK";
+	public static final String APPKEY = "k7qtlsz1zmg";
+	public static final String APPSECRET = "9CFx4rM0iK";
 }

blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -150,7 +150,7 @@ public interface CommonConstant {
 	@Getter
 	enum TenantType {
 
-		COMMUNITY("社区",0),
+		COMMUNITY("园区",0),
 		PARK("园区",1);
 		private Integer value;
 		private String name;
@@ -176,7 +176,7 @@ public interface CommonConstant {
 	@Getter
 	enum THIRDPLATFORM {
 
-		AEP("aep平台","aep"),
+		AEP("AEP平台","AEP"),
 		PERCEPTION("感知平台","scepctwing");
 		private String value;
 		private String name;

blade-biz-common/src/main/java/org/springblade/common/constant/Constants.java

@@ -23,7 +23,7 @@ public interface Constants {
 	public final static String REDIS_GUEST_EFFECTIVE_TIME_JVT = "ycwg:facedevice:effectivetime:jvt:";
 
 	/**
-	 * 党支部关联资源类型：社区
+	 * 党支部关联资源类型：园区
 	 */
 
 	public final static int BRANCH_RELATE_AGENCY = 1;

blade-biz-common/src/main/java/org/springblade/common/constant/DeviceConstant.java

@@ -18,11 +18,7 @@ public interface DeviceConstant {
 
 	//设备厂商
 
-
-	public static String DEVICE_FACTROY_JVT = "JVT";
-
-
-	public static String DEVICE_FACTORY_QINLIN = "qinlin";
+	public static String DEVICE_FACTORY_ZONGHENG = "zongheng";
 
 	@Getter
 	enum DeviceStatus{

blade-biz-common/src/main/java/org/springblade/common/constant/ServicesName.java

@@ -5,7 +5,7 @@ public interface ServicesName  {
 	//物业服务
 	String ESTATE_SERVICE = "cyzh-estate";
 
-	//社区服务（园区）
+	//园区服务（园区）
 	String COMMUNITY_SERVICE = "cyzh-community";
 
 	//人员系统
@@ -29,7 +29,7 @@ public interface ServicesName  {
 	//设备服务
 	String DEVICE_SERVICE = "cyzh-smart-device";
 
-	//社区小程序网关
+	//园区小程序网关
 	String COMMUNITY_APP_SERVICE = "community-app-service";
 
 	//园区小程序网关

blade-service-api/community-api/src/main/java/org/springblade/community/dto/PlatformBillsDTO.java

@@ -21,7 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 社区平台账单数据传输对象实体类
+ * 园区平台账单数据传输对象实体类
  *
  * @author BladeX
  * @since 2021-09-14

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Agency.java

@@ -38,9 +38,9 @@ public class Agency extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 社区名称
+	* 园区名称
 	*/
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String name;
 	/**
 	* 所属省
@@ -123,9 +123,9 @@ public class Agency extends BaseEntity {
 		@ApiModelProperty(value = "车辆数量")
 		private Integer carCount;
 	/**
-	* 社区背景图
+	* 园区背景图
 	*/
-		@ApiModelProperty(value = "社区背景图")
+		@ApiModelProperty(value = "园区背景图")
 		private String pic;
 	/**
 	* 备注

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Building.java

@@ -45,15 +45,15 @@ public class Building extends BaseEntity {
 		@ApiModelProperty(value = "楼栋名称")
 		private String name;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 	/**
-	* 社区名称
+	* 园区名称
 	*/
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String agencyName;
 	/**
 	* 小区id

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Floor.java

@@ -45,15 +45,15 @@ public class Floor extends BaseEntity {
 		@ApiModelProperty(value = "楼层名称")
 		private String name;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 	/**
-	* 社区名称
+	* 园区名称
 	*/
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String agencyName;
 	/**
 	* 小区id

blade-service-api/community-api/src/main/java/org/springblade/community/entity/PlatformBills.java

@@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
- * 社区平台账单实体类
+ * 园区平台账单实体类
  *
  * @author BladeX
  * @since 2021-09-14
@@ -36,7 +36,7 @@ import java.math.BigDecimal;
 @Data
 @TableName("community_platform_bills")
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "PlatformBills对象", description = "社区平台账单")
+@ApiModel(value = "PlatformBills对象", description = "园区平台账单")
 public class PlatformBills extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Residential.java

@@ -45,15 +45,15 @@ public class Residential extends BaseEntity {
 		@ApiModelProperty(value = "小区名字")
 		private String name;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 	/**
-	* 社区名称
+	* 园区名称
 	*/
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String agencyName;
 	/**
 	* 省（id）

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Room.java

@@ -46,15 +46,15 @@ public class Room extends BaseEntity {
 		@ApiModelProperty(value = "房间名称")
 		private String name;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 	/**
-	* 社区名称
+	* 园区名称
 	*/
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String agencyName;
 	/**
 	* 小区id

blade-service-api/community-api/src/main/java/org/springblade/community/entity/Unit.java

@@ -46,15 +46,15 @@ public class Unit extends BaseEntity {
 		@ApiModelProperty(value = "单元名称")
 		private String name;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 	/**
-	* 社区名称
+	* 园区名称
 	*/
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String agencyName;
 	/**
 	* 小区id

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IAgencyClient.java

@@ -44,7 +44,7 @@ public interface IAgencyClient  {
 	 * 查询
 	 */
 	@GetMapping("/listWithOutToken")
-	List<AgencyVO> listWithOutToken(Agency agency);
+	List<AgencyVO> listWithOutToken(@SpringQueryMap Agency agency);
 
 
 

blade-service-api/community-api/src/main/java/org/springblade/community/feign/ICommunityClient.java

@@ -13,13 +13,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface ICommunityClient {
 
 	/**
-	 * 新增住户时为社区-小区-楼栋-单元-楼层-房间加人数1
+	 * 新增住户时为园区-小区-楼栋-单元-楼层-房间加人数1
 	 */
 	@GetMapping("/addPersonNum")
 	boolean addPersonNum(@RequestParam(value = "agencyId", required = false) Long agencyId,@RequestParam(value = "residentialId", required = false) Long residentialId,@RequestParam(value = "buildingId", required = false) Long buildingId,@RequestParam(value = "unitId", required = false) Long unitId,@RequestParam(value = "floorId", required = false) Long floorId,@RequestParam(value = "roomId") Long roomId);
 
 	/**
-	 * 删除住户时为社区-小区-楼栋-单元-楼层-房间减人数1
+	 * 删除住户时为园区-小区-楼栋-单元-楼层-房间减人数1
 	 */
 	@GetMapping("/subPersonNum")
 	boolean subPersonNum(@RequestParam(value = "agencyId", required = false) Long agencyId,@RequestParam(value = "residentialId", required = false) Long residentialId,@RequestParam(value = "buildingId", required = false) Long buildingId,@RequestParam(value = "unitId", required = false) Long unitId,@RequestParam(value = "floorId", required = false) Long floorId,@RequestParam(value = "roomId") Long roomId);

blade-service-api/community-api/src/main/java/org/springblade/community/feign/IPlatformBillsClient.java

@@ -13,7 +13,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 社区平台账单 Feign
+ * 园区平台账单 Feign
  *
  * @author lianghanqiang
  * @since 2021-09-14
@@ -28,7 +28,7 @@ public interface IPlatformBillsClient  {
     PlatformBillsVO detail(@SpringQueryMap PlatformBills platformBills);
 
 	/**
-	 * 查询 社区平台账单
+	 * 查询 园区平台账单
 	 */
 	@GetMapping("/list")
     List<PlatformBillsVO> list(@SpringQueryMap PlatformBills platformBills);
@@ -36,26 +36,26 @@ public interface IPlatformBillsClient  {
 
 
 	/**
-	 * 新增 社区平台账单
+	 * 新增 园区平台账单
 	 */
 	@PostMapping("/save")
 	boolean save(@Valid @RequestBody PlatformBills platformBills);
 
 	/**
-	 * 修改 社区平台账单
+	 * 修改 园区平台账单
 	 */
 	@PostMapping("/update")
     boolean update(@Valid @RequestBody PlatformBills platformBills);
 
 	/**
-	 * 新增或修改 社区平台账单
+	 * 新增或修改 园区平台账单
 	 */
 	@PostMapping("/submit")
     boolean submit(@Valid @RequestBody PlatformBills platformBills);
 
 
 	/**
-	 * 删除 社区平台账单
+	 * 删除 园区平台账单
 	 */
 	@PostMapping("/remove")
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);

blade-service-api/community-api/src/main/java/org/springblade/community/feign/PlatformBillsClientFallback.java

@@ -17,7 +17,7 @@ public class PlatformBillsClientFallback implements IPlatformBillsClient {
         }
 
         /**
-         * 查询 社区平台账单
+         * 查询 园区平台账单
          */
         @Override
         public List<PlatformBillsVO> list(PlatformBills platformBills) {
@@ -27,7 +27,7 @@ public class PlatformBillsClientFallback implements IPlatformBillsClient {
 
 
         /**
-         * 新增 社区平台账单
+         * 新增 园区平台账单
          */
         @Override
         public boolean save( PlatformBills platformBills) {
@@ -35,7 +35,7 @@ public class PlatformBillsClientFallback implements IPlatformBillsClient {
         }
 
         /**
-         * 修改 社区平台账单
+         * 修改 园区平台账单
          */
         @Override
         public boolean update( PlatformBills platformBills) {
@@ -43,7 +43,7 @@ public class PlatformBillsClientFallback implements IPlatformBillsClient {
         }
 
         /**
-         * 新增或修改 社区平台账单
+         * 新增或修改 园区平台账单
          */
         @Override
         public boolean submit( PlatformBills platformBills) {
@@ -52,7 +52,7 @@ public class PlatformBillsClientFallback implements IPlatformBillsClient {
 
 
         /**
-         * 删除 社区平台账单
+         * 删除 园区平台账单
          */
         @Override
         public boolean remove( String ids) {

blade-service-api/community-api/src/main/java/org/springblade/community/vo/PlatformBillsVO.java

@@ -22,14 +22,14 @@ import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
 /**
- * 社区平台账单视图实体类
+ * 园区平台账单视图实体类
  *
  * @author BladeX
  * @since 2021-09-14
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "PlatformBillsVO对象", description = "社区平台账单")
+@ApiModel(value = "PlatformBillsVO对象", description = "园区平台账单")
 public class PlatformBillsVO extends PlatformBills {
 	private static final long serialVersionUID = 1L;
 

blade-service-api/device-api/src/main/java/org/springblade/device/dto/Gb28181DeviceDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.device.dto;
+
+import org.springblade.device.entity.Gb28181Device;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Gb28181DeviceDTO extends Gb28181Device {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/dto/GbDeviceChannelDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.device.dto;
+
+import org.springblade.device.entity.GbDeviceChannel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2021-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class GbDeviceChannelDTO extends GbDeviceChannel {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/dto/IotDeviceDTO.java

@@ -17,9 +17,10 @@
 package org.springblade.device.dto;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import org.springblade.device.entity.IotDevice;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
+import org.springblade.device.entity.IotDevice;
 
 /**
  * 智能设备数据传输对象实体类
@@ -37,6 +38,10 @@ public class IotDeviceDTO extends IotDevice {
 	//企业查询时穿企业的creditCode
 	private String creditCode;
 
+	private Query query;
+
+
+
 
 
 }

blade-service-api/device-api/src/main/java/org/springblade/device/entity/DoorDevice.java

@@ -134,9 +134,9 @@ public class DoorDevice extends BaseEntity {
 		@ApiModelProperty(value = "机构路径")
 		private String orgPosition;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		private Long agencyId;
 
 	/**

blade-service-api/device-api/src/main/java/org/springblade/device/entity/ElectricMeterStatic.java

@@ -38,9 +38,9 @@ public class ElectricMeterStatic extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 园区或社区id
+	* 园区或园区id
 	*/
-		@ApiModelProperty(value = "园区或社区id")
+		@ApiModelProperty(value = "园区或园区id")
 		private Long agencyId;
 	/**
 	* 当前用电总量

blade-service-api/device-api/src/main/java/org/springblade/device/entity/Gb28181Device.java

@@ -0,0 +1,114 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.device.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-12-06
+ */
+@Data
+@TableName("smart_gb_device")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GbDevice对象", description = "GbDevice对象")
+public class Gb28181Device extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 设备编号
+	*/
+		@ApiModelProperty(value = "设备编号")
+		private String deviceId;
+	/**
+	* 设备名称
+	*/
+		@ApiModelProperty(value = "设备名称")
+		private String name;
+	/**
+	* 厂商名称
+	*/
+		@ApiModelProperty(value = "厂商名称")
+		private String manufacturer;
+	/**
+	* 型号
+	*/
+		@ApiModelProperty(value = "型号")
+		private String model;
+	/**
+	* 传输协议 UDP/TCP
+	*/
+		@ApiModelProperty(value = "传输协议 UDP/TCP")
+		private String transport;
+	/**
+	* 数据流传输模式，UDP:udp传输，TCP-ACTIVE：tcp主动模式，TCP-PASSIVE：tcp被动模式
+	*/
+		@ApiModelProperty(value = "数据流传输模式，UDP:udp传输，TCP-ACTIVE：tcp主动模式，TCP-PASSIVE：tcp被动模式")
+		private String streamMode;
+	/**
+	* 在线状态，1：在线
+	*/
+		@ApiModelProperty(value = "在线状态，1：在线")
+		private Integer online;
+	/**
+	* 注册时间
+	*/
+		@ApiModelProperty(value = "注册时间")
+		private String registerTime;
+	/**
+	* 心跳时间
+	*/
+		@ApiModelProperty(value = "心跳时间")
+		private String keepaliveTime;
+	/**
+	* wan地址_ip
+	*/
+		@ApiModelProperty(value = "wan地址_ip")
+		private String ip;
+	/**
+	* wan地址_port
+	*/
+		@ApiModelProperty(value = "wan地址_port")
+		private Integer port;
+	/**
+	* wan地址（ip+port）
+	*/
+		@ApiModelProperty(value = "wan地址（ip+port）")
+		private String hostAddress;
+	/**
+	* 园区ID
+	*/
+		@ApiModelProperty(value = "园区ID")
+		private Long agencyId;
+	/**
+	* 区域ID
+	*/
+		@ApiModelProperty(value = "区域ID")
+		private Long residentialId;
+
+		private String tenantId;
+
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/entity/GbDeviceChannel.java

@@ -0,0 +1,123 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.device.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.springblade.core.mp.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2021-12-06
+ */
+@Data
+@TableName("smart_gb_device_channel")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GbDeviceChannel对象", description = "GbDeviceChannel对象")
+public class GbDeviceChannel extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	* 通道ID
+	*/
+		@ApiModelProperty(value = "通道ID")
+		private String channelId;
+	/**
+	* 设备ID，设备可以是IPC或者NVR
+	*/
+	@NotBlank
+		@ApiModelProperty(value = "设备ID，设备可以是IPC或者NVR")
+		private String deviceId;
+	/**
+	* 通道名称
+	*/
+		@ApiModelProperty(value = "通道名称")
+		private String name;
+	/**
+	* 通道厂家
+	*/
+		@ApiModelProperty(value = "通道厂家")
+		private String manufacture;
+	/**
+	* 型号
+	*/
+		@ApiModelProperty(value = "型号")
+		private String model;
+	/**
+	* 通道地址
+	*/
+		@ApiModelProperty(value = "通道地址")
+		private String address;
+	/**
+	* 父级ID
+	*/
+		@ApiModelProperty(value = "父级ID")
+	private String parentId;
+	/**
+	* IP
+	*/
+		@ApiModelProperty(value = "IP")
+	private String ipAddress;
+	/**
+	* 端口号
+	*/
+		@ApiModelProperty(value = "端口号")
+		private Integer port;
+	/**
+	* 云台类型：0 - 未知, 1 - 球机, 2 - 半球，3 - 固定枪机, 4 - 遥控枪机
+	*/
+		@ApiModelProperty(value = "云台类型：0 - 未知, 1 - 球机, 2 - 半球，3 - 固定枪机, 4 - 遥控枪机")
+		private Integer ptzType;
+	/**
+	* 经度
+	*/
+		@ApiModelProperty(value = "经度")
+		private String longitude;
+	/**
+	* 纬度
+	*/
+		@ApiModelProperty(value = "纬度")
+		private String latitude;
+	/**
+	* 流唯一编号，存在表示正在直播
+	*/
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+		@ApiModelProperty(value = "流唯一编号，存在表示正在直播")
+	private String streamId;
+	/**
+	* 是否有子设备，1有, 0没有
+	*/
+		@ApiModelProperty(value = "是否有子设备，1有, 0没有")
+		private Integer parental;
+	/**
+	* 是否有音频，0无，1有
+	*/
+		@ApiModelProperty(value = "是否有音频，0无，1有")
+	private Boolean hasAudio;
+
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/entity/IotAlarm.java

@@ -79,7 +79,7 @@ public class IotAlarm extends BaseEntity {
 	* 设备类型
 	*/
 		@ApiModelProperty(value = "设备类型")
-		private Integer deviceType;
+		private String deviceType;
 
 	/**
 	 * 设备类型名称

blade-service-api/device-api/src/main/java/org/springblade/device/entity/IotAlarmGroup.java

@@ -59,7 +59,7 @@ public class IotAlarmGroup extends BaseEntity {
 	* 标识
 	*/
 		@ApiModelProperty(value = "标识(设备类型)")
-		private Integer tag;
+		private String tag;
 	private String orgPosition;
 
 

blade-service-api/device-api/src/main/java/org/springblade/device/entity/IotDevice.java

@@ -16,10 +16,8 @@
  */
 package org.springblade.device.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import org.springblade.core.mp.base.BaseEntity;
-import java.time.LocalDateTime;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -29,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 智能设备实体类
  *
  * @author BladeX
- * @since 2021-04-19
+ * @since 2021-12-08
  */
 @Data
 @TableName("smart_iot_device")
@@ -55,16 +53,6 @@ public class IotDevice extends BaseEntity {
 		@ApiModelProperty(value = "IMEI号")
 		private String imei;
 	/**
-	* 设备注册平台标识,1:aep,2:华为,3:厂商
-	*/
-		@ApiModelProperty(value = "设备注册平台标识,1:aep,2:华为,3:厂商")
-		private Integer isAep;
-	/**
-	* 产品,对应 aep 产品的 apikey
-	*/
-		@ApiModelProperty(value = "产品,对应 aep 产品的 apikey")
-		private String masterKey;
-	/**
 	* 产品ID
 	*/
 		@ApiModelProperty(value = "产品ID")
@@ -73,133 +61,52 @@ public class IotDevice extends BaseEntity {
 	* 设备类型
 	*/
 		@ApiModelProperty(value = "设备类型")
-		private Integer deviceType;
-	/**
-	* 设备用途{10：居家设备，20：公共设备}
-	*/
-		@ApiModelProperty(value = "设备用途{10：居家设备，20：公共设备}")
-		private Integer deviceUsage;
-	/**
-	* 设备前缀
-	*/
-		@ApiModelProperty(value = "设备前缀")
-		private String prefix;
+		private String deviceType;
 	/**
 	* 安装位置
 	*/
 		@ApiModelProperty(value = "安装位置")
 		private String deviceInstallAddress;
 	/**
-	* 设备状态1 正常 2告警	3失联 4 停用(弃用) 5待布防
+	* 设备状态:0.已注册 1.已激活 2.已注销
 	*/
-		@ApiModelProperty(value = "设备状态1 正常 2告警	3失联 4 停用(弃用) 5待布防")
+		@ApiModelProperty(value = "设备状态:0.已注册 1.已激活 2.已注销")
 		private Integer deviceStatus;
 	/**
-	* 电池电量
+	* 设备在线状态，1在线，2不在线
 	*/
-		@ApiModelProperty(value = "电池电量")
-		private String battery;
+		@ApiModelProperty(value = "设备在线状态，1在线，2不在线")
+		private Integer deviceNetStatus;
 	/**
-	* 厂家名称
+	*  设备所在产品协议：	1.T-LINK协议  2.MQTT协议  3.LWM2M协议  4.TUP协议  5.HTTP协议  6.JT/T808  7.TCP协议  8.私有TCP(网关子设备协议)  9.私有UDP(网关子设备协议)  10.网关产品MQTT(网关产品协议)  11.南向云
 	*/
-		@ApiModelProperty(value = "厂家名称")
-		private String manufacturer;
+		@ApiModelProperty(value = " 设备所在产品协议：	1.T-LINK协议  2.MQTT协议  3.LWM2M协议  4.TUP协议  5.HTTP协议  6.JT/T808  7.TCP协议  8.私有TCP(网关子设备协议)  9.私有UDP(网关子设备协议)  10.网关产品MQTT(网关产品协议)  11.南向云")
+		private Integer productProtocol;
 	/**
-	* 厂商编号(附录)
+	* 经度
 	*/
-		@ApiModelProperty(value = "厂商编号(附录)")
-		private String manufacturersNo;
+		@ApiModelProperty(value = "经度")
+		private String longitude;
 	/**
-	* 最后更新时间
+	* 纬度
 	*/
-		@ApiModelProperty(value = "最后更新时间")
-		private LocalDateTime lastUpdateTime;
-	/**
-	* 心跳保护时间
-	*/
-		@ApiModelProperty(value = "心跳保护时间")
-		private LocalDateTime heartbeatTime;
-	/**
-	* IMSI
-	*/
-		@ApiModelProperty(value = "IMSI")
-		private String imsi;
+		@ApiModelProperty(value = "纬度")
+		private String latitude;
 	/**
-	* 设备通信协议	1NB,2LWM2M,3HTTP,4TCP,5MQTT,6 厂	商协议。如果协议与真实设备不匹配可能	导致无法正常接收数据
+	* 设备图片
 	*/
-		@ApiModelProperty(value = "设备通信协议	1NB,2LWM2M,3HTTP,4TCP,5MQTT,6 厂	商协议。如果协议与真实设备不匹配可能	导致无法正常接收数据")
-		private Integer protocolType;
-	/**
-	* 设备分组 tag， 设备创建时指定 tag 后可以	分 tag 获取对应的汇总信息，不传默认为	0-全部
-	*/
-		@ApiModelProperty(value = "设备分组 tag， 设备创建时指定 tag 后可以	分 tag 获取对应的汇总信息，不传默认为	0-全部")
-		private Integer tag;
-	/**
-	* 经纬度（仅记录）
-	*/
-		@ApiModelProperty(value = "经纬度（仅记录）")
-		private String latitudeLongitude;
-	/**
-	* 区域 id（仅记录）
-	*/
-		@ApiModelProperty(value = "区域 id（仅记录）")
-		private String area;
-	/**
-	* 组织 id（仅记录）
-	*/
-		@ApiModelProperty(value = "组织 id（仅记录）")
-		private String organization;
-	/**
-	* 图片 id（仅记录）
-	*/
-		@ApiModelProperty(value = "图片 id（仅记录）")
+		@ApiModelProperty(value = "设备图片")
 		private String deviceImage;
 	/**
-	* 人员 id（仅记录）
-	*/
-		@ApiModelProperty(value = "人员 id（仅记录）")
-		private String person;
-	/**
-	* 联系人电话
-	*/
-		@ApiModelProperty(value = "联系人电话")
-		private String personTel;
-	/**
-	* 证件号
+	* 区域ID
 	*/
-		@ApiModelProperty(value = "证件号")
-		private String idcard;
+		@ApiModelProperty(value = "区域ID")
+		private Long residentialId;
 	/**
-	* 区域位置（仅记录）
+	* 楼栋ID
 	*/
-		@ApiModelProperty(value = "区域位置（仅记录）")
-		private String distLocate;
-	/**
-	* 上线状态 1 已上线 2 未上线
-	*/
-		@ApiModelProperty(value = "上线状态 1 已上线 2 未上线")
-		private Integer defenseStatus;
-	/**
-	* 旧平台id
-	*/
-		@ApiModelProperty(value = "旧平台id")
-		private Long oldId;
-	private String uuid;
-	private String did;
-	private String appId;
-	private Long residentialId;
-	private Long buildingId;
-	private String orgPosition;
-	/**
-	* 企业ids
-	*/
-		@ApiModelProperty(value = "企业ids")
-		private String enterpriseIds;
-	/**
-	* 告警电话
-	*/
-		@ApiModelProperty(value = "告警电话")
-		private String alarmTel;
+		@ApiModelProperty(value = "楼栋ID")
+		private Long buildingId;
 	/**
 	* 单元id
 	*/
@@ -215,32 +122,41 @@ public class IotDevice extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "房间id")
 		private Long roomId;
-
 	/**
-	 * 租户id
-	 */
-	@ApiModelProperty(value = "租户id")
-	private String tenantId;
-
+	* 平台： aep
+	*/
+		@ApiModelProperty(value = "平台： aep")
+		private String platform;
 	/**
-	 * platform
-	 */
-	@ApiModelProperty(value = "平台")
-	private String platform;
-
+	* IMSI
+	*/
+		@ApiModelProperty(value = "IMSI")
+		private String imsi;
 	/**
-	 * 设备型号
-	 */
-	@ApiModelProperty("设备型号")
-	@TableField(exist = false)
-	private String deviceModel;
-
-	@ApiModelProperty(value = "设备型号-感知平台")
-	@TableField(exist = false)
-	private String deviceSpecld;
-
+	* 激活时间
+	*/
+		@ApiModelProperty(value = "激活时间")
+		private String activeTime;
+	/**
+	* 设备最后上线时间
+	*/
+		@ApiModelProperty(value = "设备最后上线时间")
+		private String lastOnlineAt;
+	/**
+	* 设备最后下线时间
+	*/
+		@ApiModelProperty(value = "设备最后下线时间")
+		private String lastOfflineAt;
+	/**
+	* 园区ID
+	*/
+		@ApiModelProperty(value = "园区ID")
+		private Long agencyId;
 
+	private String enterpriseIds;
 
+	private String tenantId;
 
+	private String orgPosition;
 
 }

blade-service-api/device-api/src/main/java/org/springblade/device/entity/TemperatureDevice.java

@@ -58,9 +58,9 @@ public class TemperatureDevice extends BaseEntity {
 		@ApiModelProperty(value = "安装位置")
 		private String installAddress;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		private Long agencyId;
 	/**
 	* 小区id

blade-service-api/device-api/src/main/java/org/springblade/device/feign/DoorDeviceClientFallback.java

@@ -101,4 +101,14 @@ public class DoorDeviceClientFallback implements IDoorDeviceClient {
 		return null;
 	}
 
+	@Override
+	public List<DoorDevice> getListByAgencyId(Long agencyId) {
+		return null;
+	}
+
+	@Override
+	public R remoteOpenDoor(String userId, String userName, Integer userType, String serialNum, String factory, boolean isOpen) {
+		return null;
+	}
+
 }

blade-service-api/device-api/src/main/java/org/springblade/device/feign/GbDeviceChannelClientFallback.java

@@ -0,0 +1,69 @@
+package org.springblade.device.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springblade.device.entity.GbDeviceChannel;
+import org.springblade.device.vo.GbDeviceChannelVO;
+import org.springframework.stereotype.Component;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Component
+public class GbDeviceChannelClientFallback implements IGbDeviceChannelClient {
+            /**
+         * 详情
+         */
+        @Override
+        public GbDeviceChannelVO detail(GbDeviceChannel gbDeviceChannel) {
+            return null;
+        }
+
+        /**
+         * 查询
+         */
+        @Override
+        public List<GbDeviceChannelVO> list(GbDeviceChannel gbDeviceChannel) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增
+         */
+        @Override
+        public boolean save( GbDeviceChannel gbDeviceChannel) {
+            return false;
+        }
+
+        /**
+         * 修改
+         */
+        @Override
+        public boolean update( GbDeviceChannel gbDeviceChannel) {
+            return false;
+        }
+
+        /**
+         * 新增或修改
+         */
+        @Override
+        public boolean submit( GbDeviceChannel gbDeviceChannel) {
+            return false;
+        }
+
+
+        /**
+         * 删除
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+	@Override
+	public R submitBatch(@Valid List<GbDeviceChannel> gbDeviceChannelList) {
+		return null;
+	}
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/feign/GbDeviceClientFallback.java

@@ -0,0 +1,67 @@
+package org.springblade.device.feign;
+
+import org.springblade.core.tool.api.R;
+import org.springblade.device.entity.Gb28181Device;
+import org.springblade.device.vo.Gb28181DeviceVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+@Component
+public class GbDeviceClientFallback implements IGbDeviceClient {
+            /**
+         * 详情
+         */
+        @Override
+        public Gb28181DeviceVO detail(Gb28181Device gb28181Device) {
+            return null;
+        }
+
+        /**
+         * 查询
+         */
+        @Override
+        public List<Gb28181DeviceVO> list(Gb28181Device gb28181Device) {
+            return null;
+        }
+
+
+
+        /**
+         * 新增
+         */
+        @Override
+        public boolean save( Gb28181Device gb28181Device) {
+            return false;
+        }
+
+        /**
+         * 修改
+         */
+        @Override
+        public boolean update( Gb28181Device gb28181Device) {
+            return false;
+        }
+
+        /**
+         * 新增或修改
+         */
+        @Override
+        public boolean submit( Gb28181Device gb28181Device) {
+            return false;
+        }
+
+
+        /**
+         * 删除
+         */
+        @Override
+        public boolean remove( String ids) {
+            return false;
+        }
+
+	@Override
+	public R bind(Gb28181Device gb28181Device) {
+		return null;
+	}
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IDoorDeviceClient.java

@@ -96,4 +96,10 @@ public interface IDoorDeviceClient  {
 
 	@GetMapping("/heartbeat")
 	R heartbeat(@RequestParam String serialNum);
+
+	@GetMapping("/getListByAgencyId")
+	List<DoorDevice> getListByAgencyId(@RequestParam Long agencyId);
+
+	@PostMapping("/remoteOpenDoor")
+	R remoteOpenDoor(@RequestParam String userId, @RequestParam String userName, @RequestParam Integer userType, @RequestParam String serialNum, @RequestParam String factory, @RequestParam boolean isOpen);
 }

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IGbDeviceChannelClient.java

@@ -0,0 +1,70 @@
+package org.springblade.device.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.core.tool.api.R;
+import org.springblade.device.entity.GbDeviceChannel;
+import org.springblade.device.vo.GbDeviceChannelVO;
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-12-06
+ */
+@FeignClient(value = "cyzh-smart-device",path = "/feign/gbdevicechannel")
+public interface IGbDeviceChannelClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    GbDeviceChannelVO detail(GbDeviceChannel gbDeviceChannel);
+
+	/**
+	 * 查询
+	 */
+	@GetMapping("/list")
+    List<GbDeviceChannelVO> list(GbDeviceChannel gbDeviceChannel);
+
+
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody GbDeviceChannel gbDeviceChannel);
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody GbDeviceChannel gbDeviceChannel);
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody GbDeviceChannel gbDeviceChannel);
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	/**
+	 * 批量新增或修改
+	 */
+	@PostMapping("/submitBatch")
+	R submitBatch(@Valid @RequestBody List<GbDeviceChannel> gbDeviceChannelList);
+
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IGbDeviceClient.java

@@ -0,0 +1,70 @@
+package org.springblade.device.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.core.tool.api.R;
+import org.springblade.device.entity.Gb28181Device;
+import org.springblade.device.vo.Gb28181DeviceVO;
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ *  Feign
+ *
+ * @author lianghanqiang
+ * @since 2021-12-06
+ */
+@FeignClient(value = "cyzh-smart-device",path = "/feign/gbdevice")
+public interface IGbDeviceClient  {
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+    Gb28181DeviceVO detail(Gb28181Device gb28181Device);
+
+	/**
+	 * 查询
+	 */
+	@GetMapping("/list")
+    List<Gb28181DeviceVO> list(Gb28181Device gb28181Device);
+
+
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	boolean save(@Valid @RequestBody Gb28181Device gb28181Device);
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+    boolean update(@Valid @RequestBody Gb28181Device gb28181Device);
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+    boolean submit(@Valid @RequestBody Gb28181Device gb28181Device);
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+    boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
+
+	/**
+	 * 设备绑定
+	 */
+	@PostMapping("/bind")
+	R bind(@RequestBody Gb28181Device gb28181Device);
+
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IIotDeviceClient.java

@@ -2,6 +2,7 @@ package org.springblade.device.feign;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import io.swagger.annotations.ApiParam;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.tool.api.R;
 import org.springblade.device.dto.IotDeviceDTO;
 import org.springblade.device.entity.IotDevice;
@@ -43,7 +44,7 @@ public interface IIotDeviceClient  {
 	 * 详情
 	 */
 	@PostMapping("/getList")
-	Page<IotDeviceVO> getList(@RequestBody IotDeviceDTO iotDeviceDTO);
+	BladePage<IotDeviceVO> getList(@RequestBody IotDeviceDTO iotDeviceDTO);
 
 	/**
 	 * 查询 智能设备

blade-service-api/device-api/src/main/java/org/springblade/device/feign/IotDeviceClientFallback.java

@@ -1,7 +1,7 @@
 package org.springblade.device.feign;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.tool.api.R;
 import org.springblade.device.dto.IotDeviceDTO;
 import org.springblade.device.entity.IotDevice;
@@ -29,7 +29,7 @@ public class IotDeviceClientFallback implements IIotDeviceClient {
 	}
 
 	@Override
-	public Page<IotDeviceVO> getList(IotDeviceDTO iotDeviceDTO) {
+	public BladePage<IotDeviceVO> getList(IotDeviceDTO iotDeviceDTO) {
 		return null;
 	}
 

blade-service-api/device-api/src/main/java/org/springblade/device/vo/Gb28181DeviceVO.java

@@ -0,0 +1,39 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.device.vo;
+
+import org.springblade.device.entity.Gb28181Device;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GbDeviceVO对象", description = "GbDeviceVO对象")
+public class Gb28181DeviceVO extends Gb28181Device {
+	private static final long serialVersionUID = 1L;
+
+	private String agencyName;
+	private String residentialName;
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/vo/GbDeviceChannelVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.device.vo;
+
+import org.springblade.device.entity.GbDeviceChannel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2021-12-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "GbDeviceChannelVO对象", description = "GbDeviceChannelVO对象")
+public class GbDeviceChannelVO extends GbDeviceChannel {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/device-api/src/main/java/org/springblade/device/vo/IotDeviceVO.java

@@ -178,5 +178,7 @@ public class IotDeviceVO extends IotDevice {
 	@ApiModelProperty("所属企业名称")
 	private String enterpriseNames;
 
-	private Long agencyId;
+	private String agencyName;
+
+	private String residentialName;
 }

blade-service-api/device-api/src/main/java/org/springblade/device/vo/SingleDeviceStatistics.java

@@ -34,18 +34,43 @@ public class SingleDeviceStatistics {
 	@ApiModelProperty("设备正常数")
 	private Integer normalCount = 0;
 
+	/**
+	 * 设备激活数
+	 */
+	@ApiModelProperty("激活数")
+	private Integer activeCount = 0;
+
+	/**
+	 * 设备注册数
+	 */
+	@ApiModelProperty("设备注册数")
+	private Integer registerCount = 0;
+
 	/**
 	 * 设备告警数
 	 */
 	@ApiModelProperty("设备告警数")
 	private Integer alertCount = 0;
 
+	/**
+	 * 设备在线数
+	 */
+	@ApiModelProperty("在线数")
+	private Integer onlineCount = 0;
+
+
 	/**
 	 * 设备失联数
 	 */
 	@ApiModelProperty("设备失联数")
 	private Integer outlineCount = 0;
 
+	/**
+	 * 设备离线数
+	 */
+	@ApiModelProperty("设备离线数")
+	private Integer offlineCount = 0;
+
 	/**
 	 * 设备停用数
 	 */
@@ -57,4 +82,10 @@ public class SingleDeviceStatistics {
 	 */
 	@ApiModelProperty("待布防")
 	private Integer armedCount = 0;
+
+	/**
+	 * 设备告警数
+	 */
+	@ApiModelProperty("设备告警数")
+	private Integer alarmCount = 0;
 }

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/feign/IStaffClient.java

@@ -19,7 +19,7 @@ import java.util.List;
  * @since 2021-03-30
  */
 @FeignClient(value = "cyzh-enterprise",path = "/feign/staff")
-public interface IStaffClient  {
+public interface IStaffClient {
 
 	@GetMapping("/getById")
 	Staff getById(@RequestParam Long id);
@@ -63,4 +63,6 @@ public interface IStaffClient  {
     boolean remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids);
 
 
+
+
 }

blade-service-api/enterprise-api/src/main/java/org/springblade/enterprise/vo/EnterpriseVO.java

@@ -33,4 +33,7 @@ import io.swagger.annotations.ApiModel;
 public class EnterpriseVO extends Enterprise {
 	private static final long serialVersionUID = 1L;
 
+	//企业类型名称
+	private String enterpriseTypeName;
+
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/dto/AccessRecordDTO.java

@@ -31,6 +31,4 @@ import lombok.EqualsAndHashCode;
 public class AccessRecordDTO extends AccessRecord {
 	private static final long serialVersionUID = 1L;
 
-	private Integer userType;
-
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/dto/GuestRecordDTO.java

@@ -17,6 +17,7 @@
 package org.springblade.estate.dto;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import org.springblade.core.mp.support.Query;
 import org.springblade.estate.entity.GuestRecord;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -37,6 +38,8 @@ public class GuestRecordDTO extends GuestRecord {
 
 	private List<Long> userIds = new ArrayList<>();
 
-	private Page<GuestRecord> page;
+	private Query query;
+
+	private Page page;
 
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/dto/NoticeDTO.java

@@ -36,13 +36,13 @@ public class NoticeDTO extends Notice {
 	@ApiModelProperty("要查询的小区id")
 	private Long residentialId;
 
-	@ApiModelProperty("要查询的社区/园区id")
+	@ApiModelProperty("要查询的园区/园区id")
 	private Long agencyId;
 
 	@ApiModelProperty("分页查询")
 	private Page<Notice> page;
 
-	@ApiModelProperty("园区/社区名称")
+	@ApiModelProperty("园区/园区名称")
 	private String agencyName;
 
 	@ApiModelProperty("小区/区域名称")

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/AccessRecord.java

@@ -50,9 +50,9 @@ public class AccessRecord extends BaseEntity {
 		@ApiModelProperty(value = "用户姓名")
 		private String userName;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		private Long agencyId;
 	/**
 	* 小区id
@@ -149,5 +149,9 @@ public class AccessRecord extends BaseEntity {
 	@ApiModelProperty(value = "失败原因")
 	private String failReason;
 
+	//2:企业员工，3服务人员，4访客，5管理员
+	@ApiModelProperty(value = "用户类型")
+	private Integer userType;
+
 
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/Bills.java

@@ -43,15 +43,15 @@ public class Bills extends BaseEntity {
 		private Long id;
 
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using = ToStringSerializer.class)
 		private Long agencyId;
 	/**
-	* 社区名称
+	* 园区名称
 	*/
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String agencyName;
 	/**
 	* 小区id

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/Car.java

@@ -80,16 +80,16 @@ public class Car extends BaseEntity {
 		@ApiModelProperty(value = "车主电话")
 		private String personPhone;
 	/**
-	* 社区ID
+	* 园区ID
 	*/
-		@ApiModelProperty(value = "社区ID")
+		@ApiModelProperty(value = "园区ID")
 		@JsonSerialize(using = ToStringSerializer.class)
 		private Long agencyId;
 
 	/**
-	 * 社区名称
+	 * 园区名称
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	* 小区id
@@ -125,9 +125,9 @@ public class Car extends BaseEntity {
 		@ApiModelProperty(value = "机构路径")
 		private String orgPosition;
 	/**
-	* 车主id:若为社区租户则为住户id，若为园区租户则为员工id
+	* 车主id:若为园区租户则为住户id，若为园区租户则为员工id
 	*/
-		@ApiModelProperty(value = "车主id:若为社区租户则为住户id，若为园区租户则为员工id")
+		@ApiModelProperty(value = "车主id:若为园区租户则为住户id，若为园区租户则为员工id")
 		@JsonSerialize(using = ToStringSerializer.class)
 		private Long personId;
 	/**

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/CarEnterRecord.java

@@ -96,16 +96,16 @@ public class CarEnterRecord extends BaseEntity {
 		@ApiModelProperty(value = "预约车位订单号")
 		private String reserveOrderNo;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 
 	/**
-	 * 社区/园区名称
+	 * 园区/园区名称
 	 */
-	@ApiModelProperty(value = "社区/园区名称")
+	@ApiModelProperty(value = "园区/园区名称")
 	private String agencyName;
 	/**
 	* 小区id

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/CarOutRecord.java

@@ -111,16 +111,16 @@ public class CarOutRecord extends BaseEntity {
 		@ApiModelProperty(value = "免费放行原因")
 		private String freeReason;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 
 	/**
-	 * 社区/园区名称
+	 * 园区/园区名称
 	 */
-	@ApiModelProperty(value = "社区/园区名称")
+	@ApiModelProperty(value = "园区/园区名称")
 	private String agencyName;
 	/**
 	* 小区id

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/Feedback.java

@@ -73,9 +73,9 @@ public class Feedback extends BaseEntity {
 		@ApiModelProperty(value = "用户头像")
 		private String avatar;
 	/**
-	* 社区/园区id
+	* 园区/园区id
 	*/
-		@ApiModelProperty(value = "社区/园区id")
+		@ApiModelProperty(value = "园区/园区id")
 		private Long agencyId;
 
 	/**

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/GuestAuthorize.java

@@ -100,16 +100,12 @@ public class GuestAuthorize extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "访问的住户姓名")
 		private String userName;
+
 	/**
-	* 开门密码--小区下面唯一 6位数字
-	*/
-		@ApiModelProperty(value = "开门密码--小区下面唯一 6位数字")
-		private Integer password;
-	/**
-	* 密码有效次数
+	* 有效次数
 	*/
-		@ApiModelProperty(value = "密码有效次数")
-		private Integer validCount;
+		@ApiModelProperty(value = "有效次数")
+		private Integer accessCount;
 	/**
 	* 密码有效开始时间
 	*/
@@ -147,6 +143,15 @@ public class GuestAuthorize extends BaseEntity {
 		@ApiModelProperty(value = "企业名称")
 		private String enterpriseName;
 
+	@ApiModelProperty(value = "来访人企业名称")
+	private String guestEnterpriseName;
+
+	@ApiModelProperty(value = "园区ID")
+	private Long agencyId;
+
+	@ApiModelProperty(value = "园区名称")
+	private Long agencyName;
+
 
 
 

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/GuestRecord.java

@@ -17,13 +17,16 @@
 package org.springblade.estate.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 实体类
@@ -60,14 +63,14 @@ public class GuestRecord extends BaseEntity {
 		@ApiModelProperty(value = "访问缘由")
 		private String guestReason;
 	/**
-	* 所属社区id
+	* 所属园区id
 	*/
-		@ApiModelProperty(value = "所属社区id")
+		@ApiModelProperty(value = "所属园区id")
 		private Long agencyId;
 	/**
-	* 所属社区名称
+	* 所属园区名称
 	*/
-		@ApiModelProperty(value = "所属社区名称")
+		@ApiModelProperty(value = "所属园区名称")
 		private String agencyName;
 	/**
 	* 所属小区id
@@ -100,16 +103,6 @@ public class GuestRecord extends BaseEntity {
 		@ApiModelProperty(value = "单元名称")
 		private String unitName;
 	/**
-	* 楼层id
-	*/
-		@ApiModelProperty(value = "楼层id")
-		private Long floorId;
-	/**
-	* 楼层名称
-	*/
-		@ApiModelProperty(value = "楼层名称")
-		private String floorName;
-	/**
 	* 所属房间id
 	*/
 		@ApiModelProperty(value = "所属房间id")
@@ -188,5 +181,35 @@ public class GuestRecord extends BaseEntity {
 	@ApiModelProperty(value = "租户id")
 	private String tenantId;
 
+	/**
+	 * 来访企业
+	 */
+	@ApiModelProperty(value = "来访企业")
+	private String guestEnterpriseName;
+
+	/**
+	 * 随访人数
+	 */
+	@ApiModelProperty(value = "随访人数")
+	private Integer guestCount;
+
+	/**
+	 * 1：小程序
+	 * 2：后台
+	 * 3：访客机
+	 */
+	@ApiModelProperty(value = "登记来源")
+	private Integer registerSource;
+
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "预约开始时间")
+	private Date beginTime;
+
+	@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "预约结束时间")
+	private Date endTime;
+
 
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/Notice.java

@@ -44,9 +44,9 @@ public class Notice extends BaseEntity {
 		@ApiModelProperty(value = "公告内容")
 		private String notice;
 	/**
-	* 公告类型： 1-社区 2-园区
+	* 公告类型： 1-园区 2-园区
 	*/
-//		@ApiModelProperty(value = "公告类型： 1-社区 2-园区")
+//		@ApiModelProperty(value = "公告类型： 1-园区 2-园区")
 //		private Integer type;
 	/**
 	* 文章标题

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/NoticePushRecord.java

@@ -45,9 +45,9 @@ public class NoticePushRecord extends BaseEntity {
 		@ApiModelProperty(value = "公告id")
 		private Long noticeId;
 	/**
-	* 下发的社区id
+	* 下发的园区id
 	*/
-		@ApiModelProperty(value = "下发的社区id")
+		@ApiModelProperty(value = "下发的园区id")
 		@JsonSerialize(using = ToStringSerializer.class)
 		private Long agencyId;
 	/**
@@ -60,7 +60,7 @@ public class NoticePushRecord extends BaseEntity {
 	/**
 	 * 下发的小区id
 	 */
-	@ApiModelProperty(value = "下发的社区名称")
+	@ApiModelProperty(value = "下发的园区名称")
 	private String agencyName;
 
 	/**

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/ParkingLot.java

@@ -51,16 +51,16 @@ public class ParkingLot extends BaseEntity {
 		@ApiModelProperty(value = "车场唯一编号")
 		private String parkKey;
 	/**
-	* 所属社区
+	* 所属园区
 	*/
-		@ApiModelProperty(value = "所属社区")
+		@ApiModelProperty(value = "所属园区")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 
 	/**
-	 * 社区名称
+	 * 园区名称
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	* 所属小区

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/GuestRecordClientFallback.java

@@ -1,7 +1,10 @@
 package org.springblade.estate.feign;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.plugins.Page;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
 import org.springblade.estate.dto.GuestRecordDTO;
 import org.springblade.estate.entity.GuestRecord;
 import org.springblade.estate.vo.GuestRecordVO;
@@ -28,7 +31,7 @@ public class GuestRecordClientFallback implements IGuestRecordClient {
         }
 
 	@Override
-	public Page<GuestRecordVO> page(GuestRecordDTO guestRecord) {
+	public BladePage<GuestRecordVO> page(GuestRecordDTO guestRecord) {
 		return null;
 	}
 
@@ -71,4 +74,9 @@ public class GuestRecordClientFallback implements IGuestRecordClient {
 		return null;
 	}
 
+	@Override
+	public R audit(GuestRecord guestRecord) {
+		return null;
+	}
+
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/IGuestRecordClient.java

@@ -1,8 +1,8 @@
 package org.springblade.estate.feign;
 
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiParam;
-import org.springblade.core.mp.support.Query;
+import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.tool.api.R;
 import org.springblade.estate.dto.GuestRecordDTO;
 import org.springblade.estate.entity.GuestRecord;
@@ -42,7 +42,7 @@ public interface IGuestRecordClient {
 	 * 查询
 	 */
 	@PostMapping("/page")
-	Page<GuestRecordVO> page(@RequestBody GuestRecordDTO guestRecordDTO);
+	BladePage<GuestRecordVO> page(@RequestBody GuestRecordDTO guestRecordDTO);
 
 
 
@@ -74,5 +74,8 @@ public interface IGuestRecordClient {
 	@GetMapping("/getById")
 	GuestRecord getById(@RequestParam Long id);
 
+	@PostMapping(value = "/audit")
+	R audit(@RequestBody GuestRecord guestRecord);
+
 
 }

blade-service-api/grid-api/src/main/java/org/springblade/community/grid/entity/GridResource.java

@@ -44,14 +44,14 @@ public class GridResource extends BaseEntity {
 	private  Long gridId;
 
 	/**
-	* 层级： 1-社区 2-小区
+	* 层级： 1-园区 2-小区
 	*/
-		@ApiModelProperty(value = "层级： 1-社区 2-小区")
+		@ApiModelProperty(value = "层级： 1-园区 2-小区")
 		private Integer level;
 	/**
-	* 若层级为1，则为社区id;若层级为2；则为小区id
+	* 若层级为1，则为园区id;若层级为2；则为小区id
 	*/
-		@ApiModelProperty(value = "若层级为1，则为社区id;若层级为2；则为小区id  多个用“，”隔开")
+		@ApiModelProperty(value = "若层级为1，则为园区id;若层级为2；则为小区id  多个用“，”隔开")
 		private String resourseIds;
 
 

blade-service-api/grid-api/src/main/java/org/springblade/community/grid/vo/GridStaticVO.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Getter
 public class GridStaticVO extends Grid {
 
-	@ApiModelProperty("社区统计对象")
+	@ApiModelProperty("园区统计对象")
 	private List<CommunityCount> communityCounts = new ArrayList<>();
 
 	@ApiModelProperty("设备类型列表")
@@ -27,7 +27,7 @@ public class GridStaticVO extends Grid {
 	@ApiModelProperty("物联网设备工单列表")
 	private List<DeviceJob> deviceJobList;
 
-	@ApiModelProperty("人口统计-按社区")
+	@ApiModelProperty("人口统计-按园区")
 	private List<AgencyPerson> agencyPerson = new ArrayList<>();
 }
 

blade-service-api/grid-api/src/main/java/org/springblade/community/grid/vo/Houseuser.java

@@ -55,14 +55,14 @@ public class Houseuser extends BaseEntity {
 		@ApiModelProperty(value = "所属房间名称")
 		private String roomName;
 	/**
-	* 所属社区id
+	* 所属园区id
 	*/
-		@ApiModelProperty(value = "所属社区id")
+		@ApiModelProperty(value = "所属园区id")
 		private Long agencyId;
 	/**
-	* 所属社区名称
+	* 所属园区名称
 	*/
-		@ApiModelProperty(value = "所属社区名称")
+		@ApiModelProperty(value = "所属园区名称")
 		private String agencyName;
 	/**
 	* 存储位置（通过该字段快速查询，所有的子节点）

blade-service-api/person-api/src/main/java/org/springblade/person/entity/Drug.java

@@ -62,9 +62,9 @@ public class Drug extends BaseEntity {
 		@ApiModelProperty(value = "毒品来源：黑市购买；亲朋提供；偷窃；医生处方；其他")
 		private String source;
 	/**
-	* 戒毒情况：强制戒毒；劳教戒毒；限期戒毒；自愿戒毒；社区戒毒；其他
+	* 戒毒情况：强制戒毒；劳教戒毒；限期戒毒；自愿戒毒；园区戒毒；其他
 	*/
-		@ApiModelProperty(value = "戒毒情况：强制戒毒；劳教戒毒；限期戒毒；自愿戒毒；社区戒毒；其他")
+		@ApiModelProperty(value = "戒毒情况：强制戒毒；劳教戒毒；限期戒毒；自愿戒毒；园区戒毒；其他")
 		private String detoxification;
 	/**
 	* 关注程度：0 - 一般；1 - 中等；2 - 严重
@@ -77,9 +77,9 @@ public class Drug extends BaseEntity {
 		@ApiModelProperty(value = "吸毒状态：0 - 在吸；1 - 停吸")
 		private Integer drugStatus;
 	/**
-	* 吸毒人员类型：在册类；社区矫正报道类；社区康复类；其他社会面吸毒人员
+	* 吸毒人员类型：在册类；园区矫正报道类；园区康复类；其他社会面吸毒人员
 	*/
-		@ApiModelProperty(value = "吸毒人员类型：在册类；社区矫正报道类；社区康复类；其他社会面吸毒人员")
+		@ApiModelProperty(value = "吸毒人员类型：在册类；园区矫正报道类；园区康复类；其他社会面吸毒人员")
 		private String type;
 	/**
 	* 吸毒后果：危害身体；危害家庭；其他

blade-service-api/person-api/src/main/java/org/springblade/person/entity/HouseUser.java

@@ -137,15 +137,15 @@ public class HouseUser extends BaseEntity {
 		@ApiModelProperty(value = "备注")
 		private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-		@ApiModelProperty(value = "社区Id")
+		@ApiModelProperty(value = "园区Id")
 		@JsonSerialize(using= ToStringSerializer.class)
 		private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-		@ApiModelProperty(value = "社区名称")
+		@ApiModelProperty(value = "园区名称")
 		private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/entity/KeyPeople.java

@@ -51,9 +51,9 @@ public class KeyPeople extends BaseEntity {
 		@ApiModelProperty(value = "姓名")
 		private String name;
 	/**
-	* 重点人员类型（可多种）：1刑释解教人员；2社区矫正人员；3吸毒人员；4精神病患者；5涉恐人员；6上访人员
+	* 重点人员类型（可多种）：1刑释解教人员；2园区矫正人员；3吸毒人员；4精神病患者；5涉恐人员；6上访人员
 	*/
-		@ApiModelProperty(value = "重点人员类型（可多种）：1刑释解教人员；2社区矫正人员；3吸毒人员；4精神病患者；5涉恐人员；6上访人员")
+		@ApiModelProperty(value = "重点人员类型（可多种）：1刑释解教人员；2园区矫正人员；3吸毒人员；4精神病患者；5涉恐人员；6上访人员")
 		private String type;
 	/**
 	* 1：需要援助；2：不需要援助

blade-service-api/person-api/src/main/java/org/springblade/person/vo/AdolescentVO.java

@@ -130,14 +130,14 @@ public class AdolescentVO extends Adolescent {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/AidsVO.java

@@ -130,14 +130,14 @@ public class AidsVO extends Aids {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/AllowancesPeopleVO.java

@@ -130,14 +130,14 @@ public class AllowancesPeopleVO extends AllowancesPeople {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/CorrectionalStaffVO.java

@@ -130,14 +130,14 @@ public class CorrectionalStaffVO extends CorrectionalStaff {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/DisablerVO.java

@@ -132,15 +132,15 @@ public class DisablerVO extends Disabler {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/DrugVO.java

@@ -132,15 +132,15 @@ public class DrugVO extends Drug {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/ElderlyPeopleVO.java

@@ -132,15 +132,15 @@ public class ElderlyPeopleVO extends ElderlyPeople {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/EstablishFilecardVO.java

@@ -132,15 +132,15 @@ public class EstablishFilecardVO extends EstablishFilecard {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/FertileWomanVO.java

@@ -132,15 +132,15 @@ public class FertileWomanVO extends FertileWoman {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/PrisonerVO.java

@@ -132,15 +132,15 @@ public class PrisonerVO extends Prisoner {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/PsychiatricVO.java

@@ -132,15 +132,15 @@ public class PsychiatricVO extends Psychiatric {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/person-api/src/main/java/org/springblade/person/vo/VeteransVO.java

@@ -132,15 +132,15 @@ public class VeteransVO extends Veterans {
 	@ApiModelProperty(value = "备注")
 	private String remark;
 	/**
-	 * 社区Id
+	 * 园区Id
 	 */
-	@ApiModelProperty(value = "社区Id")
+	@ApiModelProperty(value = "园区Id")
 	@JsonSerialize(using= ToStringSerializer.class)
 	private Long agencyId;
 	/**
-	 * 社区
+	 * 园区
 	 */
-	@ApiModelProperty(value = "社区名称")
+	@ApiModelProperty(value = "园区名称")
 	private String agencyName;
 	/**
 	 * 小区Id

blade-service-api/smart-party-api/src/main/java/org/springblade/party/entity/BranchRelation.java

@@ -38,14 +38,14 @@ public class BranchRelation extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 资源类型： 1-社区 2-小区  3-园区  4-企业
+	* 资源类型： 1-园区 2-小区  3-园区  4-企业
 	*/
-		@ApiModelProperty(value = "资源类型： 1-社区 2-小区  3-园区  4-企业")
+		@ApiModelProperty(value = "资源类型： 1-园区 2-小区  3-园区  4-企业")
 		private Integer resourceType;
 	/**
-	* 资源id ，若resouce_type为1，则为社区id；以此类推
+	* 资源id ，若resouce_type为1，则为园区id；以此类推
 	*/
-		@ApiModelProperty(value = "资源id ，若resouce_type为1，则为社区id；以此类推")
+		@ApiModelProperty(value = "资源id ，若resouce_type为1，则为园区id；以此类推")
 		private Long resourceId;
 	/**
 	* 支部id

blade-service-api/smart-party-api/src/main/java/org/springblade/party/vo/BranchRelationVO.java

@@ -36,9 +36,9 @@ public class BranchRelationVO extends BranchRelation {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 资源对象： 社区对象/小区对象/园区对象/企业对象
+	 * 资源对象： 园区对象/小区对象/园区对象/企业对象
 	 */
-	@ApiModelProperty(value = "资源对象： 社区对象/小区对象/园区对象/企业对象")
+	@ApiModelProperty(value = "资源对象： 园区对象/小区对象/园区对象/企业对象")
 	private Object object;
 
 	/**

blade-service-api/system-expand-api/src/main/java/org/springblade/system/expand/entity/OrgPosition.java

@@ -59,9 +59,9 @@ public class OrgPosition extends BaseEntity {
 		@ApiModelProperty(value = "街道行政编码")
 		private String streetCode;
 	/**
-	* 社区id
+	* 园区id
 	*/
-		@ApiModelProperty(value = "社区id")
+		@ApiModelProperty(value = "园区id")
 		private Long agencyId;
 	/**
 	* 小区id

blade-service-api/system-expand-api/src/main/java/org/springblade/system/expand/entity/TenantType.java

@@ -38,9 +38,9 @@ public class TenantType extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 租户类型{0：社区，1：园区}
+	* 租户类型{0：园区，1：园区}
 	*/
-		@ApiModelProperty(value = "租户类型{0：社区，1：园区}")
+		@ApiModelProperty(value = "租户类型{0：园区，1：园区}")
 		private Integer tenantType;
 	/**
 	* 前端端口号

blade-service-api/third-api/src/main/java/org/springblade/third/doordevice/dto/UserDeviceDTO.java

@@ -53,4 +53,8 @@ public class UserDeviceDTO {
 	//格式：2019-06-10 00:00:00
 	private String endTime;
 
+	@NotNull
+	//1：白名单、4：访客、3：黑名单
+	private Integer userType;
+
 }

blade-service-api/third-api/src/main/java/org/springblade/third/doordevice/feign/DoorDeviceButtFallback.java

@@ -48,6 +48,11 @@ public class DoorDeviceButtFallback implements IDoorDeviceButtClient {
 		return null;
 	}
 
+	@Override
+	public R deleteFaceToDevices(UserDeviceDTO userDeviceDTO) {
+		return null;
+	}
+
 	@Override
 	public R remoteOpenDoor(String serialNum, String factory, boolean isOpen) {
 		return null;

blade-service-api/third-api/src/main/java/org/springblade/third/doordevice/feign/IDoorDeviceButtClient.java

@@ -65,6 +65,13 @@ public interface IDoorDeviceButtClient {
 	@PostMapping("/pushFaceToDevices")
 	R pushFaceToDevices(@RequestBody UserDeviceDTO userDeviceDTO);
 
+	/**
+	 * 人脸删除
+	 * @param userDeviceDTO
+	 */
+	@PostMapping("/deleteFaceToDevices")
+	R deleteFaceToDevices(@RequestBody UserDeviceDTO userDeviceDTO);
+
 	/**
 	 * 远程开门
 	 * @param serialNum

blade-service-api/third-api/src/main/java/org/springblade/third/iotdevice/entity/IotAepProduct.java

@@ -18,7 +18,6 @@ package org.springblade.third.iotdevice.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import org.springblade.core.mp.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -28,7 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
  * 实体类
  *
  * @author BladeX
- * @since 2021-07-13
+ * @since 2021-12-09
  */
 @Data
 @TableName("third_iot_aep_product")
@@ -38,135 +37,38 @@ public class IotAepProduct extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	private String masterKey;
 	private Integer productId;
-	private String thirdId;
 	/**
-	* 接入类型（必填）: 1.设备直连，2.网关接入，3.南向云接入（只支持1）
-	*/
-		@ApiModelProperty(value = "接入类型（必填）: 1.设备直连，2.网关接入，3.南向云接入（只支持1）")
-		private String accessType;
-	/**
-	* 认证方式 1:特征串认证,2:SM9认证,3:证书认证,4:IMEI认证，5:SIMID认证，6:SM2认证，7:IPV6标识认证
-	*/
-		@ApiModelProperty(value = "认证方式 1:特征串认证,2:SM9认证,3:证书认证,4:IMEI认证，5:SIMID认证，6:SM2认证，7:IPV6标识认证 ")
-		private String authType;
-	/**
-	* dataEncryption：数据加密方式 1:sm1,2:sm2,3:sm4,4:dtls,5:明文（只支持MQTT/LWM2M）
-	*/
-		@ApiModelProperty(value = "dataEncryption：数据加密方式 1:sm1,2:sm2,3:sm4,4:dtls,5:明文（只支持MQTT/LWM2M）")
-		private String dataEncryption;
-	/**
-	* T/T808协议 设备型号
-	*/
-		@ApiModelProperty(value = "T/T808协议 设备型号")
-		private String deviceModel;
-	/**
-	* encryptionType：安全类型(只支持MQTT,TCP协议) 0:一机一密，1:一型一密"
-	*/
-		@ApiModelProperty(value = "encryptionType：安全类型(只支持MQTT,TCP协议) 0:一机一密，1:一型一密")
-		private String encryptionType;
-	/**
-	* Endpoint格式（LWM2M协议必填）:1.IMEI2.URN:IMEI:3.URN:IMEI-IMSI: 4.URN:IMEI+SM9
-	*/
-		@ApiModelProperty(value = "Endpoint格式（LWM2M协议必填）:1.IMEI2.URN:IMEI:3.URN:IMEI-IMSI: 4.URN:IMEI+SM9")
-		private String endpointFormat;
-	/**
-	* eDRX模式时间窗(LWM2M协议,当省电模式为3时,必填):20 ～ 10485.76 间的值,精确到小数点后两位
-	*/
-		@ApiModelProperty(value = "eDRX模式时间窗(LWM2M协议,当省电模式为3时,必填):20 ～ 10485.76 间的值,精确到小数点后两位")
-		private String lwm2mEdrxTime;
-	/**
-	* JT/T808协议 制造商ID
-	*/
-		@ApiModelProperty(value = "JT/T808协议 制造商ID")
-		private String manufacturerId;
-	/**
-	* 网络类型（必填）:1.WIFI,2.移动蜂窝数据3.NB-IoT,4.以太网,5.蓝牙,6.ZigBee（只支持1/2/3/4）
-	*/
-		@ApiModelProperty(value = "网络类型（必填）:1.WIFI,2.移动蜂窝数据3.NB-IoT,4.以太网,5.蓝牙,6.ZigBee（只支持1/2/3/4）")
-		private String networkType;
-	/**
-	* 节点类型（必填）：1.设备 ，2.网关
-	*/
-		@ApiModelProperty(value = "节点类型（必填）：1.设备 ，2.网关")
-		private String nodeType;
-	/**
-	* 消息格式 1:json，2:紧凑二进制
-	*/
-		@ApiModelProperty(value = "消息格式 1:json，2:紧凑二进制")
-		private String payloadFormat;
-	/**
-	* 省电模式（LWM2M协议必填）：1.PSM 2.DRX 3.eDRX
-	*/
-		@ApiModelProperty(value = "省电模式（LWM2M协议必填）：1.PSM 2.DRX 3.eDRX")
-		private String powerModel;
-	/**
-	* 产品描述（选填）：产品描述最多100个字符
-	*/
-		@ApiModelProperty(value = "产品描述（选填）：产品描述最多100个字符")
-		private String productDesc;
-	/**
-	* 产品名称（必填）：产品名称最多 64 个字符，产品名称必须包含数字或字母或汉字,产品名称租户内不能重复
-	*/
-		@ApiModelProperty(value = "产品名称（必填）：产品名称最多 64 个字符，产品名称必须包含数字或字母或汉字,产品名称租户内不能重复")
-		private String productName;
-	/**
-	* 产品协议（必填）：（aep) 1.T-LINK协议 2.MQTT协议 3.LWM2M协议 5.HTTP协议 6.JT/T808 7.TCP协议 10.网关MQTT协议		(感知平台）：1NB,2LWM2M,3HTTP,4TCP,5MQTT,6 厂	商协议
-	*/
-		@ApiModelProperty(value = "产品协议（必填）：（aep) 1.T-LINK协议 2.MQTT协议 3.LWM2M协议 5.HTTP协议 6.JT/T808 7.TCP协议 10.网关MQTT协议		(感知平台）：1NB,2LWM2M,3HTTP,4TCP,5MQTT,6 厂	商协议")
-		private String productProtocol;
-	/**
-	* 产品分类（必填）
-	*/
-		@ApiModelProperty(value = "产品分类（必填）")
-		private String productType;
-	/**
-	* 二级分类（必填）
-	*/
-		@ApiModelProperty(value = "二级分类（必填）")
-		private String secondaryType;
-	/**
-	* 三级分类（必填）
-	*/
-		@ApiModelProperty(value = "三级分类（必填）")
-		private String thirdType;
-	/**
-	* 是否透传：0.透传，1不透传（JT/T808，tcp协议，只有透传，消息格式必须只能传null）
-	*/
-		@ApiModelProperty(value = "是否透传：0.透传，1不透传（JT/T808，tcp协议，只有透传，消息格式必须只能传null）")
-		@TableField("tupIs_through")
-	private String tupisThrough;
-	/**
-	* 设备具体型号，选填，设备直连并且非JT/T808协议产品必填"
-	*/
-		@ApiModelProperty(value = "设备具体型号，选填，设备直连并且非JT/T808协议产品必填")
-		private String tupDeviceModel;
-	/**
-	* 平台：aep  scepctwing（感知平台）
-	*/
-		@ApiModelProperty(value = "平台：aep  scepctwing（感知平台） ")
-		private String platform;
-	private String apiKey;
-	/**
-	* 前缀，感知平台有值
-	*/
-		@ApiModelProperty(value = "前缀，感知平台有值")
-		private String prefix;
-	/**
-	* 该aep产品对应的本系统设备类型
-	*/
-		@ApiModelProperty(value = "该aep产品对应的本系统设备类型")
-		private Integer deviceType;
-	/**
-	* 厂商编号
-	*/
-		@ApiModelProperty(value = "厂商编号")
-		private String manufacturersNo;
-	/**
-	* 设备型号(附录)(感知平台)
-	*/
-		@ApiModelProperty(value = "设备型号(附录)(感知平台)")
-		private String deviceSpecld;
+	 * 产品描述
+	 */
+	@ApiModelProperty(value = "产品描述")
+	private String productDesc;
+	/**
+	 * 产品名称
+	 */
+	@ApiModelProperty(value = "产品名称")
+	private String productName;
+	/**
+	 * T-LINK协议；	MQTT协议；	LWM2M协议；	HTTP协议；	JT/T808 7.TCP协议；	网关MQTT协议；
+	 */
+	@ApiModelProperty(value = "T-LINK协议；	MQTT协议；	LWM2M协议；	HTTP协议；	JT/T808 7.TCP协议；	网关MQTT协议；")
+	private String productProtocol;
+	/**
+	 * 厂家名称
+	 */
+	@ApiModelProperty(value = "厂家名称")
+	private String manufacturers;
+	/**
+	 * 平台：AEP
+	 */
+	@ApiModelProperty(value = "平台：AEP")
+	private String platform;
+	/**
+	 * 产品设备类型
+	 */
+	@ApiModelProperty(value = "产品设备类型")
+	private String deviceType;
 
 
 }

blade-service-api/third-api/src/main/java/org/springblade/third/iotdevice/feign/AepDeviceClientFallback.java

@@ -1,5 +1,6 @@
 package org.springblade.third.iotdevice.feign;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springblade.core.tool.api.R;
 import org.springblade.device.entity.IotDevice;
 import org.springblade.third.iotdevice.dto.AepIotDeviceQueryDto;
@@ -13,7 +14,7 @@ import org.springframework.stereotype.Component;
 public class AepDeviceClientFallback implements IAepDeviceManageClient {
 
 	@Override
-	public R createDevice(IotDevice iotDevice) {
+	public R<JSONObject>  registerDevice(IotDevice iotDevice) {
 		return null;
 	}
 
@@ -23,7 +24,7 @@ public class AepDeviceClientFallback implements IAepDeviceManageClient {
 	}
 
 	@Override
-	public R queryDevice(AepIotDeviceQueryDto aepIotDeviceQueryDto) {
+	public R<JSONObject> queryDevice(IotDevice iotDevice) {
 		return null;
 	}
 
@@ -34,7 +35,7 @@ public class AepDeviceClientFallback implements IAepDeviceManageClient {
 
 
 	@Override
-	public R updateDevice() {
+	public R updateDevice(IotDevice iotDevice) {
 		return null;
 	}
 }

blade-service-api/third-api/src/main/java/org/springblade/third/iotdevice/feign/IAepDeviceManageClient.java

@@ -1,10 +1,10 @@
 package org.springblade.third.iotdevice.feign;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springblade.common.constant.ServicesName;
 import org.springblade.core.tool.api.R;
 import org.springblade.device.entity.IotDevice;
 import org.springblade.third.iotdevice.dto.AepIotDeviceQueryDto;
-import org.springblade.third.iotdevice.entity.AepIotDeviceEntity;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -19,8 +19,8 @@ public interface IAepDeviceManageClient {
 	 * 创建设备
 	 * @return
 	 */
-	@PostMapping("/addDevice")
-	R createDevice(@RequestBody IotDevice iotDevice);
+	@PostMapping("/registerDevice")
+	R<JSONObject> registerDevice(@RequestBody IotDevice iotDevice);
 	/**
 	 * 删除设备
 	 * @return
@@ -32,7 +32,7 @@ public interface IAepDeviceManageClient {
 	 * @return
 	 */
 	@PostMapping("/queryDevice")
-	R queryDevice(@RequestBody AepIotDeviceQueryDto aepIotDeviceQueryDto);
+	R<JSONObject> queryDevice(@RequestBody IotDevice iotDevice);
 	/**
 	 * 批量查询设备
 	 * @return
@@ -44,5 +44,5 @@ public interface IAepDeviceManageClient {
 	 * @return
 	 */
 	@PostMapping("/updateDevice")
-	R updateDevice();
+	R updateDevice(@RequestBody IotDevice iotDevice);
 }

blade-service-api/third-api/src/main/java/org/springblade/third/iotdevice/feign/IPerceptionIotDeviceClient.java

@@ -3,7 +3,6 @@ package org.springblade.third.iotdevice.feign;
 import org.springblade.common.constant.ServicesName;
 import org.springblade.core.tool.api.R;
 import org.springblade.device.entity.IotDevice;
-import org.springblade.third.iotdevice.dto.AepIotDeviceQueryDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;

blade-service-api/third-api/src/main/java/org/springblade/third/videodevice/gb28181/feign/IThirdGbDeviceClient.java

@@ -0,0 +1,31 @@
+package org.springblade.third.videodevice.gb28181.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springblade.core.tool.api.R;
+import org.springblade.third.videodevice.gb28181.entity.GbDevice;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "cyzh-third",path = "/feign/third/gbdevice")
+public interface IThirdGbDeviceClient {
+
+	/**
+	 * 同步云梯信息
+	 */
+	@PostMapping("/sync")
+	R<GbDevice> sync(@RequestParam String deviceId);
+
+	/**
+	 * 视频播放
+	 */
+	@PostMapping("/play")
+	R<JSONObject> play(@RequestParam(value = "deviceId", required = true) String deviceId, @RequestParam(value = "channelId", required = true) String channelId);
+
+	/**
+	 * 视频停止
+	 */
+	@PostMapping("/stop")
+	R<String> stop(@RequestParam(value = "deviceId", required = true) String deviceId, @RequestParam(value = "channelId", required = true) String channelId);
+
+}

blade-service-api/third-api/src/main/java/org/springblade/third/videodevice/gb28181/feign/ThirdGbDeviceClientFallback.java

@@ -0,0 +1,26 @@
+package org.springblade.third.videodevice.gb28181.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springblade.core.tool.api.R;
+import org.springblade.third.videodevice.gb28181.entity.GbDevice;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class ThirdGbDeviceClientFallback implements IThirdGbDeviceClient {
+	@Override
+	public R<GbDevice> sync(String deviceId) {
+		return null;
+	}
+
+	@Override
+	public R<JSONObject> play(String deviceId, String channelId) {
+		return null;
+	}
+
+	@Override
+	public R<String> stop(String deviceId, String channelId) {
+		return null;
+	}
+
+}

blade-service/community/src/main/java/org/springblade/community/controller/AgencyController.java

@@ -84,6 +84,7 @@ public class AgencyController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入agency")
 	public R<IPage<AgencyVO>> list(@RequestParam Map<String,Object> agency, Query query, BladeUser bladeUser) {
 		LambdaQueryWrapper<Agency> basicQueryWrapper = new QueryWrapperUtil<Agency>().getBasicQueryWrapperByMap(Agency::getOrgPosition, agency,new Agency(), bladeUser, orgPositionClient);
+		basicQueryWrapper.ne(Agency::getTenantId, "000000");
 		IPage<Agency> pages = agencyService.page(Condition.getPage(query), basicQueryWrapper);
 		return R.data(AgencyWrapper.build(confClient).pageVO(pages));
 	}
@@ -127,10 +128,10 @@ public class AgencyController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入agency")
 	public R submit(@Valid @RequestBody Agency agency) {
-		Assert.notNull(agency.getRegionProvince(),"社区所属省份不能为空");
-		Assert.notNull(agency.getRegionCity(),"社区所属市不能为空");
-		Assert.notNull(agency.getRegionArea(),"社区所属区不能为空");
-		Assert.notNull(agency.getRegionStreet(),"社区所属街道不能为空");
+		Assert.notNull(agency.getRegionProvince(),"园区所属省份不能为空");
+		Assert.notNull(agency.getRegionCity(),"园区所属市不能为空");
+		Assert.notNull(agency.getRegionArea(),"园区所属区不能为空");
+		Assert.notNull(agency.getRegionStreet(),"园区所属街道不能为空");
 		agency.setPic(confClient.removePrefix(agency.getPic()));
 		return R.status(agencyService.saveOrUpdateAgency(agency));
 	}

blade-service/community/src/main/java/org/springblade/community/controller/ExcelController.java

@@ -184,7 +184,7 @@ public class ExcelController {
 
 	/**
 	 * 功能描述: 导出excel模板
-	 * @param flag 1 智家设备 2 企业信息 3 员工信息 4 社区/园区  5 小区/园区分区
+	 * @param flag 1 智家设备 2 企业信息 3 员工信息 4 园区/园区  5 小区/园区分区
 	 *
 	 *
 	 */

blade-service/community/src/main/java/org/springblade/community/controller/PlatformBillsController.java

@@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 
 /**
- * 社区平台账单 控制器
+ * 园区平台账单 控制器
  *
  * @author BladeX
  * @since 2021-09-14
@@ -45,7 +45,7 @@ import javax.validation.Valid;
 @RestController
 @AllArgsConstructor
 @RequestMapping("/platformbills")
-@Api(value = "社区平台账单", tags = "社区平台账单接口")
+@Api(value = "园区平台账单", tags = "园区平台账单接口")
 public class PlatformBillsController extends BladeController {
 
 	private final IPlatformBillsService platformBillsService;
@@ -62,7 +62,7 @@ public class PlatformBillsController extends BladeController {
 	}
 
 	/**
-	 * 分页 社区平台账单
+	 * 分页 园区平台账单
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -74,7 +74,7 @@ public class PlatformBillsController extends BladeController {
 
 
 	/**
-	 * 自定义分页 社区平台账单
+	 * 自定义分页 园区平台账单
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +85,7 @@ public class PlatformBillsController extends BladeController {
 	}
 
 	/**
-	 * 新增 社区平台账单
+	 * 新增 园区平台账单
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +95,7 @@ public class PlatformBillsController extends BladeController {
 	}
 
 	/**
-	 * 修改 社区平台账单
+	 * 修改 园区平台账单
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +105,7 @@ public class PlatformBillsController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 社区平台账单
+	 * 新增或修改 园区平台账单
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -116,7 +116,7 @@ public class PlatformBillsController extends BladeController {
 
 
 	/**
-	 * 删除 社区平台账单
+	 * 删除 园区平台账单
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -126,7 +126,7 @@ public class PlatformBillsController extends BladeController {
 	}
 
 	/**
-	 * 创建 社区平台账单
+	 * 创建 园区平台账单
 	 */
 	@SneakyThrows
 	@PostMapping("/saveBills")

blade-service/community/src/main/java/org/springblade/community/controller/ResidentialController.java

@@ -155,9 +155,9 @@ public class ResidentialController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入residential")
 	public R submit(@Valid @RequestBody Residential residential) {
-		Assert.notNull(residential.getAgencyId(),"社区不能为空");
+		Assert.notNull(residential.getAgencyId(),"园区不能为空");
 		Agency agency = agencyService.getById(residential.getAgencyId());
-		Assert.notNull(agency,"小区对应的社区不存在");
+		Assert.notNull(agency,"小区对应的园区不存在");
 		residential.setAgencyName(agency.getName());
 		residential.setRegionProvince(agency.getRegionProvince());
 		residential.setRegionCity(agency.getRegionCity());

blade-service/community/src/main/java/org/springblade/community/controller/statistic/controller/StatisticsController.java

@@ -61,7 +61,7 @@ import java.util.stream.Collectors;
 
 
 /**
- * 社区统计接口
+ * 园区统计接口
  */
 @RestController
 @AllArgsConstructor
@@ -91,20 +91,20 @@ public class StatisticsController extends BladeController {
 	private final ITemperatureRecordClient temperatureRecordClient;
 	private final IAccessRecordClient accessRecordClient;
 	/**
-	 * 社区全景页面统计
+	 * 园区全景页面统计
 	 */
 	@GetMapping("/community")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "社区全景页面统计")
+	@ApiOperation(value = "园区全景页面统计")
 	@Transactional
 	@ApiIgnore
 	public CommunityStatistics community(BladeUser bladeUser){
 		CommunityStatistics communityStatistics = new CommunityStatistics();
-		//社区
+		//园区
 		LambdaQueryWrapper<Agency> agencyLambdaQueryWrapper = new QueryWrapperUtil<Agency>().getBasicQueryWrapper(Agency::getOrgPosition,new Agency(),bladeUser,orgPositionClient);
-		//社区列表
+		//园区列表
 		communityStatistics.setAgencies(this.agencyService.list(agencyLambdaQueryWrapper));
-		//社区统计
+		//园区统计
 		communityStatistics.setAgencyCount(this.agencyService.count(agencyLambdaQueryWrapper));
 		//小区
 		LambdaQueryWrapper<Residential> residentialLambdaQueryWrapper = new QueryWrapperUtil<Residential>().getBasicQueryWrapper(Residential::getOrgPosition,new Residential(),bladeUser,orgPositionClient);
@@ -136,18 +136,18 @@ public class StatisticsController extends BladeController {
 	}
 
 	/**
-	 * 社区态势页面统计
+	 * 园区态势页面统计
 	 */
 	@GetMapping("/agency")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "社区态势统计")
+	@ApiOperation(value = "园区态势统计")
 	@Transactional
 	@ApiIgnore
 	public AgencyStatistics agency(Agency agency, BladeUser bladeUser){
 //		String redisKey ="screen:"+ RedisConstant.AGENCY+":"+agency.getId();
 
 		Agency agencyById = this.agencyService.getById(agency.getId());
-		Assert.notNull(agencyById,"该社区不存在");
+		Assert.notNull(agencyById,"该园区不存在");
 		AgencyStatistics agencyStatistics = new AgencyStatistics();
 		List<Residential> residentials = this.residentialService.list(Condition.getQueryWrapper(new Residential()).lambda().eq(Residential::getAgencyId, agencyById.getId()));
 		agencyStatistics.setResidentials(residentials);
@@ -170,13 +170,13 @@ public class StatisticsController extends BladeController {
 		// 停车位数
 		agencyStatistics.setParkingSpaceCount(StringUtils.isEmpty(parkSpaceCount + "") ? 0 : parkSpaceCount);
 
-		//社区户数
+		//园区户数
 		LambdaQueryWrapper<Room> roomLambdaQueryWrapper = new QueryWrapperUtil<Room>().getBasicQueryWrapper(Room::getOrgPosition,new Room(),bladeUser,orgPositionClient);
 		roomLambdaQueryWrapper.eq(Room::getAgencyId,agencyById.getId());
 		Integer roomCount = this.roomService.count(roomLambdaQueryWrapper);
 		agencyStatistics.setRoomCount(roomCount);
 
-		//社区人口
+		//园区人口
 		HouseUser searchHU = new HouseUser();
 		searchHU.setAgencyId(agencyById.getId());
 		Integer personCount = this.houseUserClient.list(searchHU).size();
@@ -257,7 +257,7 @@ public class StatisticsController extends BladeController {
 	}
 
 	/**
-	 * 社区态势页面统计
+	 * 园区态势页面统计
 	 */
 	@GetMapping("/residential/index")
 	@ApiOperationSupport(order = 3)
@@ -334,11 +334,11 @@ public class StatisticsController extends BladeController {
 	}
 
 	/**
-	 * 社区态势人员管理
+	 * 园区态势人员管理
 	 */
 	@GetMapping("/residential/person")
 	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "社区态势人员管理")
+	@ApiOperation(value = "园区态势人员管理")
 	@Transactional
 	@ApiIgnore
 	public ResidentialStatistics personsByResidential(Residential residential){
@@ -347,11 +347,11 @@ public class StatisticsController extends BladeController {
 	}
 
 	/**
-	 * 社区态势车辆管理
+	 * 园区态势车辆管理
 	 */
 	@GetMapping("/residential/car")
 	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "社区态势车辆管理")
+	@ApiOperation(value = "园区态势车辆管理")
 	@Transactional
 	@ApiIgnore
 	public CarStatistics carByResidential(Residential residential){
@@ -375,11 +375,11 @@ public class StatisticsController extends BladeController {
 	}
 
 	/**
-	 * 社区态势房屋管理
+	 * 园区态势房屋管理
 	 */
 	@GetMapping("/residential/room")
 	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "社区态势房屋管理")
+	@ApiOperation(value = "园区态势房屋管理")
 	@Transactional
 	@ApiIgnore
 	public CarStatistics roomByResidential(Residential residential){
@@ -388,11 +388,11 @@ public class StatisticsController extends BladeController {
 	}
 
 	/**
-	 * 社区态势设备管理
+	 * 园区态势设备管理
 	 */
 	@GetMapping("/residential/device")
 	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "社区态势设备管理")
+	@ApiOperation(value = "园区态势设备管理")
 	@Transactional
 	@ApiIgnore
 	public DeviceStatistics deviceByResidential(Residential residential, Long deviceType){
@@ -494,7 +494,7 @@ public class StatisticsController extends BladeController {
 		EstateStaticVO estateStaticVO = new EstateStaticVO();
 
 		//*************************物业统计**************************//
-		//社区总数
+		//园区总数
 		LambdaQueryWrapper<Agency> agencyLambdaQueryWrapper = new  QueryWrapperUtil<Agency>().getBasicQueryWrapper(Agency::getOrgPosition,new Agency(),bladeUser,orgPositionClient);
 		agencyLambdaQueryWrapper.like(Agency::getOrgPosition,codeOrgPosition);
 		List<Agency> agencies = agencyService.getBaseMapper().selectList(agencyLambdaQueryWrapper);
@@ -696,7 +696,7 @@ public class StatisticsController extends BladeController {
 		//地磁总数100007
 
 		IotDevice iotDevice = new IotDevice();
-		iotDevice.setDeviceType(100007);
+		iotDevice.setDeviceType("100007");
 		int parkingDeviceCount  = this.iotDeviceClient.list(iotDevice).size();
 
 		//停车抓拍数

blade-service/community/src/main/java/org/springblade/community/controller/statistic/entity/AgencyStatistics.java

@@ -10,7 +10,7 @@ import org.springblade.enterprise.vo.EnterpriseVO;
 import java.util.List;
 
 @Data
-@ApiModel(value = "社区统计对象", description = "社区统计对象")
+@ApiModel(value = "园区统计对象", description = "园区统计对象")
 public class AgencyStatistics {
 	private static final long serialVersionUID = 1L;
 
@@ -20,17 +20,17 @@ public class AgencyStatistics {
 	private Integer buildingCount;
 
     /**
-	 * 社区户数
+	 * 园区户数
 	 */
 	private Integer roomCount;
 
 	/**
-	 * 社区人数
+	 * 园区人数
 	 */
 	private Integer personCount;
 
     /**
-	 * 社区车位
+	 * 园区车位
 	 */
 	private Integer parkingSpaceCount;
 

blade-service/community/src/main/java/org/springblade/community/controller/statistic/entity/CommunityStatistics.java

@@ -8,12 +8,12 @@ import org.springblade.community.entity.Agency;
 import java.util.List;
 
 @Data
-@ApiModel(value = "社区首页统计对象", description = "社区首页统计对象")
+@ApiModel(value = "园区首页统计对象", description = "园区首页统计对象")
 public class CommunityStatistics {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 社区数
+	 * 园区数
 	 */
 	private Integer agencyCount;
 
@@ -63,7 +63,7 @@ public class CommunityStatistics {
 	private Integer floatPeopleCount;
 
 	/**
-	 * 社区
+	 * 园区
 	 */
 	private List<Agency> agencies;
 

blade-service/community/src/main/java/org/springblade/community/controller/statistic/vo/EstateStaticVO.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Data
 public class EstateStaticVO implements Serializable {
 
-	@ApiModelProperty("社区总数")
+	@ApiModelProperty("园区总数")
 	private Integer agencyCount;
 
 	@ApiModelProperty("小区总数")

blade-service/community/src/main/java/org/springblade/community/eventbus/CommunitySubscriber.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * Created By lidexi in 2021/4/27
- * 社区子线程接收异步事件处理类
+ * 园区子线程接收异步事件处理类
  **/
 @EventBus(identifier = "communitySubscriber")
 @Service
@@ -38,7 +38,7 @@ public class CommunitySubscriber {
 	@Subscribe
 	public void addPersonNum(Long agencyId,Long residentialId,Long buildingId,Long unitId,Long floorId,Long roomId) throws InterruptedException {
 
-		//社区
+		//园区
 		if(agencyId != null){
 			Agency agency = agencyService.getById(agencyId);
 			if(agency != null){

blade-service/community/src/main/java/org/springblade/community/excel/controller/ImportExcelController.java

@@ -211,7 +211,7 @@ public class ImportExcelController  extends BladeController {
                     orgDto.setFlag(1);// 机构
 
                     orgDto.setCode("O");
-                    //机构类型 { 1：内部,2：广告,3：物业, 4：社区 }
+                    //机构类型 { 1：内部,2：广告,3：物业, 4：园区 }
                     if ((orgDto.getOrgType() == OperationConstant.THREE || orgDto.getOrgType() == OperationConstant.TWO || orgDto.getOrgType() == OperationConstant.FOUR) && orgDto.getPid() == null){
                         //如果是新建物业或者广告商，则pid为空，隐形挂在常运智慧科技下面，方便常运智慧管理（常运智慧id为1）
                         Organization org = this.orgFeign.getOrgById(1L);
@@ -583,7 +583,7 @@ public class ImportExcelController  extends BladeController {
 	}
 
 	/**
-	 * 功能描述: 社区信息导入
+	 * 功能描述: 园区信息导入
 	 * @param file
 	 * @return
 	 */
@@ -634,11 +634,11 @@ public class ImportExcelController  extends BladeController {
 
 				Agency agency = new Agency();
 
-				// 社区名称
+				// 园区名称
 				String agencyName = getCellValue(row.getCell(4));
 				if (StringUtils.isBlank(agencyName)) {
 					flag = false;
-					importErrorMsg.append("社区名称为空；");
+					importErrorMsg.append("园区名称为空；");
 				}
 				agency.setName(agencyName);
 
@@ -777,7 +777,7 @@ public class ImportExcelController  extends BladeController {
 				}
 				residential.setName(residentialName);
 
-				// 社区名称
+				// 园区名称
 				String agencyName = getCellValue(row.getCell(1));
 				Agency agency = new Agency();
 				if (StringUtils.isNotBlank(agencyName)){
@@ -786,7 +786,7 @@ public class ImportExcelController  extends BladeController {
 					if (agency != null){
 						residential.setAgencyId(agency.getId());
 						try {
-							// 如果小区已存在（根据社区id和小区名称匹配），则只做更新操作
+							// 如果小区已存在（根据园区id和小区名称匹配），则只做更新操作
 							Residential residen = residentialService.getOne(Condition.getQueryWrapper(residential));
 							if (residen != null){
 								residential = residen;
@@ -801,11 +801,11 @@ public class ImportExcelController  extends BladeController {
 						residential.setRegionArea(agency.getRegionArea());
 					}else {
 						flag = false;
-						importErrorMsg.append(j + " 找不到对应社区：" + agencyName + "\r");
+						importErrorMsg.append(j + " 找不到对应园区：" + agencyName + "\r");
 					}
 				}else{
 					flag = false;
-					importErrorMsg.append(j + " 社区名称为空；");
+					importErrorMsg.append(j + " 园区名称为空；");
 				}
 
 				// 详细地址