Commit c1becff5 by Java - 段鹏举

席位的修改暂时注销

parent d5b50661
...@@ -23,7 +23,6 @@ import com.ejweb.modules.user.entity.UserEntity; ...@@ -23,7 +23,6 @@ import com.ejweb.modules.user.entity.UserEntity;
import com.ejweb.modules.user.entity.UserLoginLogEntity; import com.ejweb.modules.user.entity.UserLoginLogEntity;
import com.ejweb.modules.user.entity.UserSeatEntity; import com.ejweb.modules.user.entity.UserSeatEntity;
import com.ejweb.modules.user.service.UserService; import com.ejweb.modules.user.service.UserService;
import com.huawei.esdk.uc.professional.local.bean.south.UserState;
import com.jdair.util.http.client.HTTPClientUtil; import com.jdair.util.http.client.HTTPClientUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
...@@ -432,34 +431,34 @@ public class UserController { ...@@ -432,34 +431,34 @@ public class UserController {
// 同一个账户只能登录一个身份 // 同一个账户只能登录一个身份
// 查询用户的所有身份 // 查询用户的所有身份
LoginUserEntity userEntity = new LoginUserEntity(); // LoginUserEntity userEntity = new LoginUserEntity();
userEntity.setId(seatloginBean.getUserId()); // userEntity.setId(seatloginBean.getUserId());
List<UserSeatEntity> userSeatList = userService.getUserSeatByUserCode(userEntity); // List<UserSeatEntity> userSeatList = userService.getUserSeatByUserCode(userEntity);
if (userSeatList != null && userSeatList.size() > 0) { // if (userSeatList != null && userSeatList.size() > 0) {
// 查询所有身份的状态 // // 查询所有身份的状态
List<String> seatIds = new ArrayList<>(); // List<String> seatIds = new ArrayList<>();
Map<String, UserSeatEntity> userSeatEntityMap = new HashMap<>(); // Map<String, UserSeatEntity> userSeatEntityMap = new HashMap<>();
for (UserSeatEntity userSeatEntity : userSeatList) { // for (UserSeatEntity userSeatEntity : userSeatList) {
seatIds.add(userSeatEntity.getSeatId()); // seatIds.add(userSeatEntity.getSeatId());
userSeatEntityMap.put(userSeatEntity.getSeatId(), userSeatEntity); // userSeatEntityMap.put(userSeatEntity.getSeatId(), userSeatEntity);
} // }
if (seatIds.size() > 0) { // if (seatIds.size() > 0) {
// 调用华为接口查询席位状态列表 // // 调用华为接口查询席位状态列表
List<UserState> seatStates = huaweiInterfaseService.queryUserStateList(seatIds); // List<UserState> seatStates = huaweiInterfaseService.queryUserStateList(seatIds);
if (seatStates != null && seatStates.size() > 0) { // if (seatStates != null && seatStates.size() > 0) {
for (UserState userState : seatStates) { // for (UserState userState : seatStates) {
// 如果有身份处于在线状态,且不是当前正在登录的,则返回在线席位的信息 // // 如果有身份处于在线状态,且不是当前正在登录的,则返回在线席位的信息
if (Util.isInValue(String.valueOf(userState.getNewState()), "1", "3", "4") // if (Util.isInValue(String.valueOf(userState.getNewState()), "1", "3", "4")
&& !seatloginBean.getSeatId().equals(userState.getOrigin())) { // && !seatloginBean.getSeatId().equals(userState.getOrigin())) {
responseBean.setData(userSeatEntityMap.get(userState.getOrigin())); // responseBean.setData(userSeatEntityMap.get(userState.getOrigin()));
responseBean.setMessage("用户已在其他席位登录"); // responseBean.setMessage("用户已在其他席位登录");
responseBean.setStatus(ErrorCode.STATUS_CODE_4301); // responseBean.setStatus(ErrorCode.STATUS_CODE_4301);
return responseBean; // return responseBean;
} // }
} // }
} // }
} // }
} // }
String clientip = StringUtils.isEmpty(seatloginBean.getClientip()) ? Util.getOnlineIP(request) : seatloginBean.getClientip(); String clientip = StringUtils.isEmpty(seatloginBean.getClientip()) ? Util.getOnlineIP(request) : seatloginBean.getClientip();
UserLoginLogEntity deviceInfoEntity = new UserLoginLogEntity(); UserLoginLogEntity deviceInfoEntity = new UserLoginLogEntity();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment