修改用户设备信息

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/user/UserDeviceController.java

@@ -0,0 +1,33 @@
+package cn.rankin.cmsweb.controller.user;
+
+
+import cn.rankin.cmsweb.service.user.UserDeviceService;
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.data.api.user.entity.DownloadInfo;
+import cn.rankin.data.api.user.entity.UserDevice;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * The controller of user device
+ */
+@Slf4j
+@RestController
+@RequestMapping(value = "/userDevice")
+public class UserDeviceController
+{
+    @Autowired
+    private UserDeviceService userDeviceService;
+
+    @RequestMapping(value = "/list/{uid}", method = RequestMethod.GET)
+    public APIResult<List<DownloadInfo>> findByUserId(@PathVariable("uid") String uid)
+    {
+        APIResult<List<UserDevice>> list = userDeviceService.findByCondition(uid);
+        return APIResult.ok(list);
+    }
+}
+

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/user/UserDeviceService.java

@@ -0,0 +1,19 @@
+package cn.rankin.cmsweb.service.user;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.user.dto.CampusDTO;
+import cn.rankin.data.api.user.entity.UserDevice;
+import cn.rankin.data.api.user.vo.CampusVo;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "${service.user.name}")
+public interface UserDeviceService
+{
+    @RequestMapping(value = "/userDevice/list/{uid}", method = RequestMethod.GET)
+    APIResult<List<UserDevice>> findByCondition(@PathVariable("id") String id);
+}

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

@@ -1,11 +1,14 @@
 package cn.rankin.userservice.controller;
 
+import cn.rankin.data.api.user.entity.UserDevice;
 import cn.rankin.data.api.user.vo.UserDeviceVo;
 import cn.rankin.userservice.helper.RaStringHelper;
 import cn.rankin.userservice.service.UserDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 @RestController
 @RequestMapping(value = "/userDevice")
@@ -45,4 +48,15 @@ public class UserDeviceController
 
     }
 
+    @RequestMapping(value = "/list/{uid}", method = RequestMethod.GET)
+    public List<UserDevice> bindingDevice(@PathVariable("uid") String uid)
+    {
+        if(uid == null || uid == "")
+        {
+            return null;
+        }
+
+        return userDeviceService.findByUserId(uid);
+    }
+
 }

rankin-user-service/src/main/java/cn/rankin/userservice/repository/UserDeviceRepository.java

@@ -4,6 +4,7 @@ import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.enums.EventTypeEnum;
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
 import cn.rankin.data.api.user.entity.DownloadInfo;
+import cn.rankin.data.api.user.entity.Resource;
 import cn.rankin.data.api.user.entity.UserDevice;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -20,4 +21,14 @@ public interface UserDeviceRepository extends BasicJpaRepository<UserDevice, Str
     @Modifying
     @Query(value = "update UserDevice device set device.num = ?4 where device.userId = ?1 AND device.deviceCode= ?2 AND device.deviceModel = ?3")
     int updateDevice(String uid, String deviceCode,String deviceModel,int num);
+
+    /**
+     * 根据用户编号查询设备信息
+     * @param userId the id of user
+     * @return
+     */
+    @Query(value = "select r.* from  resource  r   where r.type != ?1", nativeQuery = true)
+    List<UserDevice> findByUserId(String userId);
+
+
 }

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class UserDeviceService
@@ -67,4 +68,15 @@ public class UserDeviceService
         }
     }
 
+    /**
+     *Find by user id
+     * @param uid the user id
+     * @return the list of user device
+     */
+    public List<UserDevice> findByUserId(String uid)
+    {
+        List<UserDevice> list = userDeviceRepository.findByUserId(uid);
+        return list;
+    }
+
 }