设备地图

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

@@ -0,0 +1,14 @@
+package org.springblade.device.vo;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author cy-computer
+ */
+@Data
+@Builder
+public class CoordinatesVO {
+	private Double lat;
+	private Double lng;
+}

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

@@ -35,10 +35,4 @@ public class StaffVO extends Staff {
 
 	private String agencyName;
 
-	/**
-	 * 常驻人员设备下发状态
-	 * 0:待下发 1：已下发
-	 */
-	private Integer pushStatus;
-
 }

blade-service-api/estate-api/src/main/java/org/springblade/estate/vo/GuestRecordVO.java

@@ -25,7 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 视图实体类
+ * 视图实体类R
  *
  * @author BladeX
  * @since 2021-03-30
@@ -37,10 +37,4 @@ public class GuestRecordVO extends GuestRecord {
 	private static final long serialVersionUID = 1L;
 
 	private List<Long> userIds = new ArrayList<>();
-
-	/**
-	 * 访客人员设备人脸下发状态
-	 * 0:待下发 1：已下发
-	 */
-	private Integer pushStatus;
 }

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

@@ -16,6 +16,8 @@
  */
 package org.springblade.device.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -38,6 +40,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.device.dto.UserInfoDto;
+import org.springblade.device.vo.CoordinatesVO;
 import org.springblade.estate.entity.CarOutRecord;
 import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.util.QueryWrapperUtil;
@@ -51,10 +54,7 @@ import org.springblade.device.wrapper.DoorDeviceWrapper;
 import org.springblade.device.service.IDoorDeviceService;
 import org.springblade.core.boot.ctrl.BladeController;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  *  控制器
@@ -174,5 +174,20 @@ public class DoorDeviceController extends BladeController {
 		}
 		return doorDeviceService.remoteOpenDoor(CommonConstant.UserFlag.ADMIN_FLAG.getValue() + String.valueOf(bladeUser.getUserId()), bladeUser.getUserName(), CommonConstant.UserType.ADMIN.getType().intValue(), doorDevice.getSerialNum(), doorDevice.getDeviceFactory(), isOpen);
 	}
+	/**
+	 * 获取门禁设备的经纬度坐标集合
+	 */
+	@GetMapping("/getDoorDeviceCoordinates")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入doorDevice")
+	public R getDoorDeviceCoordinates() {
+		List<Map<String,Object>> voList = new ArrayList<>();
+		List<DoorDevice> list = doorDeviceService.list(Condition.getQueryWrapper(new DoorDevice()).lambda()
+			.ne(DoorDevice::getLatitude, "")
+			.ne(DoorDevice::getLongitude, ""));
+		return R.data(list);
+	}
+
+
 
 }

blade-service/enterprise/src/main/java/org/springblade/enterprise/wrapper/StaffWrapper.java

@@ -45,16 +45,11 @@ public class StaffWrapper extends BaseEntityWrapper<Staff, StaffVO>  {
 	private static IConfClient confClient;
 	private static IDeptService deptService;
 	private static IAgencyClient agencyClient;
-	private static IUserAccessPermissionsClient userAccessPermissionsClient;
-	private static List<Long> ids;
 
 	static {
 		confClient = SpringUtil.getBean(IConfClient.class);
 		deptService = SpringUtil.getBean(IDeptService.class);
 		agencyClient = SpringUtil.getBean(IAgencyClient.class);
-		userAccessPermissionsClient = SpringUtil.getBean(IUserAccessPermissionsClient.class);
-		//获取已下发员工id列表
-		ids = userAccessPermissionsClient.getUserIdsByUserType(CommonConstant.UserFlag.ENTERPRISE_STAFF_FLAG.getValue());
 	}
 	public static StaffWrapper build() {
 		return new StaffWrapper();
@@ -75,14 +70,6 @@ public class StaffWrapper extends BaseEntityWrapper<Staff, StaffVO>  {
 		if(agency != null){
 			staffVO.setAgencyName(agency.getName());
 		}
-
-		if (CollUtil.isNotEmpty(ids) && ids.contains(staffVO.getId())) {
-			//已下发
-			staffVO.setPushStatus(1);
-		}else {
-			//待下发
-			staffVO.setPushStatus(0);
-		}
 		return staffVO;
 	}
 

blade-service/estate/src/main/java/org/springblade/estate/controller/UserAccessPermissionsController.java

@@ -164,4 +164,14 @@ public class UserAccessPermissionsController extends BladeController {
 	}
 
 
+	/**
+	 * 获取已下发的id列表
+	 */
+	@GetMapping("/getUserIdsByUserType")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "获取已下发的id列表", notes = "userType")
+	public R getUserIdsByUserType(@RequestParam String userType) {
+		List<Long> ids = userAccessPermissionsService.getUserIdsByUserType(userType);
+		return R.data(ids);
+	}
 }

blade-service/estate/src/main/java/org/springblade/estate/wrapper/GuestRecordWrapper.java

@@ -39,14 +39,9 @@ import java.util.Objects;
 public class GuestRecordWrapper extends BaseEntityWrapper<GuestRecord, GuestRecordVO>  {
 
 	private static IConfClient confClient;
-	private static IUserAccessPermissionsClient userAccessPermissionsClient;
-	private static List<Long> ids;
 
 	static {
 		confClient = SpringUtil.getBean(IConfClient.class);
-		userAccessPermissionsClient = SpringUtil.getBean(IUserAccessPermissionsClient.class);
-		//获取已下发的访客id列表
-		ids = userAccessPermissionsClient.getUserIdsByUserType(CommonConstant.UserFlag.GUEST_FLAG.getValue());
 	}
 	public static GuestRecordWrapper build() {
 		return new GuestRecordWrapper();
@@ -58,14 +53,6 @@ public class GuestRecordWrapper extends BaseEntityWrapper<GuestRecord, GuestReco
 		if(StringUtil.isNotBlank(guestVO.getImageUri())){
 			guestVO.setImageUri(confClient.addPrefix(guestVO.getImageUri()));
 		}
-
-		if (CollUtil.isNotEmpty(ids) && ids.contains(guestVO.getId())) {
-			//已下发
-			guestVO.setPushStatus(1);
-		}else {
-			//待下发
-			guestVO.setPushStatus(0);
-		}
 		return guestVO;
 	}
 

blade-service/estate/src/main/java/org/springblade/estate/wrapper/ServerUserWrapper.java

@@ -41,15 +41,10 @@ public class ServerUserWrapper extends BaseEntityWrapper<ServerUser, ServerUserV
 
 	private static IConfClient confClient;
 	private static IAgencyClient agencyClient;
-	private static IUserAccessPermissionsClient userAccessPermissionsClient;
-	private static List<Long> ids;
 
 	static {
 		confClient = SpringUtil.getBean(IConfClient.class);
 		agencyClient = SpringUtil.getBean(IAgencyClient.class);
-		userAccessPermissionsClient = SpringUtil.getBean(IUserAccessPermissionsClient.class);
-		//获取已下发人脸的服务人员id列表
-		ids = userAccessPermissionsClient.getUserIdsByUserType(CommonConstant.UserFlag.SERVER_USER_FLAG.getValue());
 	}
 
 	public static ServerUserWrapper build() {
@@ -66,14 +61,6 @@ public class ServerUserWrapper extends BaseEntityWrapper<ServerUser, ServerUserV
 			serverUserVO.setAgencyName(agency.getName());
 		}
 
-		if (CollUtil.isNotEmpty(ids) && ids.contains(serverUserVO.getId())) {
-			//已下发
-			serverUserVO.setPushStatus(1);
-		}else {
-			//待下发
-			serverUserVO.setPushStatus(0);
-		}
-
 		return serverUserVO;
 	}