|
@@ -10,12 +10,14 @@ import cn.rankin.data.api.user.dto.TerminalUserDTO;
|
|
import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
|
|
import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
|
|
import cn.rankin.data.api.user.entity.Campus;
|
|
import cn.rankin.data.api.user.entity.Campus;
|
|
import cn.rankin.data.api.user.entity.Merchant;
|
|
import cn.rankin.data.api.user.entity.Merchant;
|
|
|
|
+import cn.rankin.data.api.user.entity.TerminalDevice;
|
|
import cn.rankin.data.api.user.entity.TerminalUser;
|
|
import cn.rankin.data.api.user.entity.TerminalUser;
|
|
import cn.rankin.userservice.code.UserServiceAPICode;
|
|
import cn.rankin.userservice.code.UserServiceAPICode;
|
|
import cn.rankin.userservice.dto.RemoteUser;
|
|
import cn.rankin.userservice.dto.RemoteUser;
|
|
import cn.rankin.userservice.proxy.RemoteUserProxy;
|
|
import cn.rankin.userservice.proxy.RemoteUserProxy;
|
|
import cn.rankin.userservice.service.CampusService;
|
|
import cn.rankin.userservice.service.CampusService;
|
|
import cn.rankin.userservice.service.MerchantService;
|
|
import cn.rankin.userservice.service.MerchantService;
|
|
|
|
+import cn.rankin.userservice.service.TerminalDeviceService;
|
|
import cn.rankin.userservice.service.TerminalUserService;
|
|
import cn.rankin.userservice.service.TerminalUserService;
|
|
import cn.rankin.userservice.utils.StudentNumberUtil;
|
|
import cn.rankin.userservice.utils.StudentNumberUtil;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -50,6 +52,9 @@ public class TerminalUserController {
|
|
@Autowired
|
|
@Autowired
|
|
private RemoteUserProxy remoteUserProxy;
|
|
private RemoteUserProxy remoteUserProxy;
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private TerminalDeviceService terminalDeviceService;
|
|
|
|
+
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
public APIResult<Page<TerminalUser>> search(TerminalUserSearchDTO terminalUserSearchDTO) {
|
|
public APIResult<Page<TerminalUser>> search(TerminalUserSearchDTO terminalUserSearchDTO) {
|
|
TerminalUser terminalUser = new TerminalUser();
|
|
TerminalUser terminalUser = new TerminalUser();
|
|
@@ -79,11 +84,13 @@ public class TerminalUserController {
|
|
if (result.getSuccess()) {
|
|
if (result.getSuccess()) {
|
|
List<TerminalUser> terminalUserList = result.getData().getList();
|
|
List<TerminalUser> terminalUserList = result.getData().getList();
|
|
setUserInfo(terminalUserList);
|
|
setUserInfo(terminalUserList);
|
|
|
|
+ setDeciceInfo(terminalUserList);
|
|
}
|
|
}
|
|
|
|
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
@RequestMapping(method = RequestMethod.GET)
|
|
@RequestMapping(method = RequestMethod.GET)
|
|
public APIResult<List<TerminalUser>> findByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
|
|
public APIResult<List<TerminalUser>> findByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
|
|
TerminalUser terminalUser = new TerminalUser();
|
|
TerminalUser terminalUser = new TerminalUser();
|
|
@@ -319,4 +326,28 @@ public class TerminalUserController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 设置绑定设备信息
|
|
|
|
+ * @param terminalUserList
|
|
|
|
+ */
|
|
|
|
+ private void setDeciceInfo(List<TerminalUser> terminalUserList) {
|
|
|
|
+ if (CollectionUtils.isEmpty(terminalUserList)) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ terminalUserList.forEach(terminalUser ->{
|
|
|
|
+ TerminalDevice terminalDevice = terminalDeviceService.findByUserId(terminalUser.getId());
|
|
|
|
+ if(null != terminalDevice){
|
|
|
|
+ //1 已绑定设备
|
|
|
|
+ terminalUser.setDeviceStatus(1);
|
|
|
|
+ }else{
|
|
|
|
+ terminalUser.setDeviceStatus(0);
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|