修改服务人员的权限

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

@@ -27,6 +27,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.apache.commons.lang.StringUtils;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.community.entity.Agency;
 import org.springblade.community.feign.IAgencyClient;
@@ -35,9 +36,11 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.estate.dto.UserAccessPermissionsDTO;
 import org.springblade.estate.entity.GuestRecord;
 import org.springblade.estate.feign.IUserAccessPermissionsClient;
+import org.springblade.estate.vo.UserAccessPermissionsVO;
 import org.springblade.system.expand.feign.IConfClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -119,8 +122,27 @@ public class ServerUserController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入serverUser")
 	public R update(@Valid @RequestBody ServerUser serverUser) {
-		if (StrUtil.isNotBlank(serverUser.getFaceUrl())) {
-			serverUser.setFaceUrl(confClient.removePrefix(serverUser.getFaceUrl()));
+		ServerUser dbServerUser = serverUserService.getById(serverUser.getId());
+		String faceUrl = serverUser.getFaceUrl();
+		if (StringUtil.isNotBlank(faceUrl)){
+			faceUrl = confClient.removePrefix(faceUrl);
+			serverUser.setFaceUrl(faceUrl);
+		}
+		UserAccessPermissionsDTO userAccessPermissionsDTO = new UserAccessPermissionsDTO();
+		//区分是否编辑人脸
+		if (!faceUrl.equals(dbServerUser.getFaceUrl())){
+			//修改人脸，要重新下发人脸
+			userAccessPermissionsDTO.setUserId(String.valueOf(serverUser.getId()));
+			userAccessPermissionsDTO.setUserType(CommonConstant.UserFlag.SERVER_USER_FLAG.getValue());
+			userAccessPermissionsDTO.setPermissions(Integer.parseInt(CommonConstant.UserAccessPermissions.FACE_OPEN_DOOR.getValue()));
+			List<UserAccessPermissionsVO> userAccessPermissionsVOList = userAccessPermissionsClient.list(userAccessPermissionsDTO);
+			if (userAccessPermissionsVOList.size() > 0){
+				UserAccessPermissionsVO userAccessPermissionsVO = userAccessPermissionsVOList.get(0);
+				userAccessPermissionsDTO.setId(userAccessPermissionsVO.getId());
+				userAccessPermissionsDTO.setUserFace(faceUrl);
+				userAccessPermissionsClient.update(userAccessPermissionsDTO);
+			}
+			serverUser.setFaceEnable(0);
 		}
 		return R.status(serverUserService.updateById(serverUser));
 	}
@@ -160,7 +182,13 @@ public class ServerUserController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return serverUserService.deleteServerUser(Func.toLongList(ids));
+		List<Long> idList = Func.toLongList(ids);
+		for(Long id : idList){
+			//删除人脸
+			userAccessPermissionsClient.deleteFace(id.toString(), CommonConstant.UserFlag.SERVER_USER_FLAG.getValue());
+			serverUserService.removeById(id);
+		}
+		return R.status(true);
 	}
 
 	/**

blade-service/estate/src/main/java/org/springblade/estate/service/IServerUserService.java

@@ -43,5 +43,4 @@ public interface IServerUserService extends BaseService<ServerUser> {
 
 	Integer serverUserStat(String beginDate, String endDate);
 
-	R deleteServerUser(List<Long> idList);
 }

blade-service/estate/src/main/java/org/springblade/estate/service/impl/ServerUserServiceImpl.java

@@ -50,9 +50,6 @@ import java.util.List;
 @Service
 public class ServerUserServiceImpl extends BaseServiceImpl<ServerUserMapper, ServerUser> implements IServerUserService {
 
-	@Autowired
-	private IUserAccessPermissionsService userAccessPermissionsService;
-
 	@Override
 	public IPage<ServerUserVO> selectServerUserPage(IPage<ServerUserVO> page, ServerUserVO serverUser) {
 		return page.setRecords(baseMapper.selectServerUserPage(page, serverUser));
@@ -80,14 +77,4 @@ public class ServerUserServiceImpl extends BaseServiceImpl<ServerUserMapper, Ser
 		return this.count(queryWrapper);
 	}
 
-	@Override
-	public R deleteServerUser(List<Long> idList) {
-		for(Long id : idList){
-			//删除人脸
-			userAccessPermissionsService.deleteFace(id.toString(), CommonConstant.UserFlag.SERVER_USER_FLAG.getValue());
-			removeById(id);
-		}
-		return R.status(true);
-	}
-
 }

blade-service/estate/src/main/java/org/springblade/estate/service/impl/UserAccessPermissionsServiceImpl.java

@@ -91,7 +91,7 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 	private IHouseUserClient houseUserClient;
 	@Autowired
 	private GuestRecordServiceImpl guestRecordService;
-	@Lazy
+	@Autowired
 	private ServerUserServiceImpl serverUserService;
 
 	@Override