terminalUser add deviceStatus

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalUser.java

@@ -81,4 +81,7 @@ public class TerminalUser implements Serializable {
         return this.provinceName + this.cityName + this.zoneName;
     }
 
+    @Transient
+    private int deviceStatus;
+
 }

rankin-data-api/src/main/java/cn/rankin/data/api/user/vo/TerminalUserVo.java

@@ -52,4 +52,6 @@ public class TerminalUserVo implements Serializable {
     public String getCampusName() {
         return this.provinceName + this.cityName + this.zoneName;
     }
+
+    private int deviceStatus;
 }

rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalDeviceController.java

@@ -3,6 +3,7 @@ package cn.rankin.userservice.controller;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.data.api.user.dto.TerminalDeviceDTO;
 import cn.rankin.data.api.user.entity.TerminalDevice;
+import cn.rankin.userservice.code.UserServiceAPICode;
 import cn.rankin.userservice.service.TerminalDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +29,12 @@ public class TerminalDeviceController {
 
     @RequestMapping(value = "/uid/{userId}", method = RequestMethod.GET)
     public APIResult<TerminalDevice> findByUserId(@PathVariable("userId") String userId) {
-        return terminalDeviceService.findByUserId(userId);
+//        return terminalDeviceService.findByUserId(userId);
+        TerminalDevice terminalDevice = terminalDeviceService.findByUserId(userId);
+        if (terminalDevice == null) {
+            return APIResult.error(UserServiceAPICode.NOT_EXISTS);
+        }
+        return APIResult.ok(terminalDevice);
     }
 
     @RequestMapping(value = "/deviceCode/{deviceCode}", method = RequestMethod.GET)

rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalUserController.java

@@ -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.entity.Campus;
 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.userservice.code.UserServiceAPICode;
 import cn.rankin.userservice.dto.RemoteUser;
 import cn.rankin.userservice.proxy.RemoteUserProxy;
 import cn.rankin.userservice.service.CampusService;
 import cn.rankin.userservice.service.MerchantService;
+import cn.rankin.userservice.service.TerminalDeviceService;
 import cn.rankin.userservice.service.TerminalUserService;
 import cn.rankin.userservice.utils.StudentNumberUtil;
 import com.alibaba.fastjson.JSON;
@@ -50,6 +52,9 @@ public class TerminalUserController {
     @Autowired
     private RemoteUserProxy remoteUserProxy;
 
+    @Autowired
+    private TerminalDeviceService terminalDeviceService;
+
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public APIResult<Page<TerminalUser>> search(TerminalUserSearchDTO terminalUserSearchDTO) {
         TerminalUser terminalUser = new TerminalUser();
@@ -79,11 +84,13 @@ public class TerminalUserController {
         if (result.getSuccess()) {
             List<TerminalUser> terminalUserList = result.getData().getList();
             setUserInfo(terminalUserList);
+            setDeciceInfo(terminalUserList);
         }
 
         return result;
     }
 
+
     @RequestMapping(method = RequestMethod.GET)
     public APIResult<List<TerminalUser>> findByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
         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);
+            }
+        });
+    }
+
+
+
+
 }

rankin-user-service/src/main/java/cn/rankin/userservice/service/TerminalDeviceService.java

@@ -61,12 +61,16 @@ public class TerminalDeviceService {
         return APIResult.ok(Boolean.TRUE);
     }
 
-    public APIResult<TerminalDevice> findByUserId(String userId) {
+/*    public APIResult<TerminalDevice> findByUserId(String userId) {
         TerminalDevice terminalDevice = terminalDeviceRepository.findByUserId(userId);
         if (terminalDevice == null) {
             return APIResult.error(UserServiceAPICode.NOT_EXISTS);
         }
         return APIResult.ok(terminalDevice);
+    }*/
+
+    public TerminalDevice findByUserId(String userId) {
+        return terminalDeviceRepository.findByUserId(userId);
     }
 
     public APIResult<TerminalDevice> findByDeviceCode(String deviceCode) {