Merge remote-tracking branch 'origin/master'

rankin-api-web/src/main/java/cn/rankin/apiweb/controller/CallbackController.java

@@ -134,8 +134,9 @@ public class CallbackController {
     }
 
     @RequestMapping(value = "/download/list", method = RequestMethod.GET)
-    public APIResult<List<DownloadInfo>> findByUserId(@NeedUser DeviceUserVo user) {
-        List<DownloadInfo> downloadInfos = downloadInfoService.findByUserId(user.getUid());
+    public APIResult<List<DownloadInfo>> findByUserId(@NeedUser DeviceUserVo user,
+                                                      @RequestParam("mac") String mac) {
+        List<DownloadInfo> downloadInfos = downloadInfoService.findByUserId(user.getUid(), mac);
         return APIResult.ok(downloadInfos);
     }
 

rankin-api-web/src/main/java/cn/rankin/apiweb/service/download/DownloadInfoClient.java

@@ -14,7 +14,7 @@ public interface DownloadInfoClient {
     DownloadInfo add(@RequestBody DownloadInfoDTO dto);
 
     @RequestMapping(value = "/download/list/{uid}", method = RequestMethod.GET)
-    List<DownloadInfo> findByUserId(@RequestParam("uid") String uid);
+    List<DownloadInfo> findByUserId(@RequestParam("uid") String uid , @RequestParam("mac") String mac);
 
     @RequestMapping(value = "/download/{uid}", method = RequestMethod.GET)
     DownloadInfo findByLessonUserId(@RequestParam("uid") String uid, @RequestParam("lessonId") String lessonId, @RequestParam("mac") String mac);

rankin-api-web/src/main/java/cn/rankin/apiweb/service/download/DownloadInfoService.java

@@ -21,8 +21,8 @@ public class DownloadInfoService {
     }
 
 
-    public List<DownloadInfo> findByUserId(String uid) {
-        return downloadInfoClient.findByUserId(uid);
+    public List<DownloadInfo> findByUserId(String uid , String mac) {
+        return downloadInfoClient.findByUserId(uid, mac);
     }
 
     public DownloadInfo findByLessonUserId(String uid,String lessonId, String mac) {

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

@@ -29,8 +29,9 @@ public class DownloadInfoController {
     }
 
     @RequestMapping(value = "/list/{uid}", method = RequestMethod.GET)
-    public List<DownloadInfo> findByUserId(@PathVariable("uid") String uid){
-        return downloadInfoService.findByUserId(uid,EventTypeEnum.DOWNLOAD,BaseStatusEnum.NORMAL);
+    public List<DownloadInfo> findByUserId(@PathVariable("uid") String uid,
+                                           @RequestParam("mac") String mac){
+        return downloadInfoService.findByUserId(uid,mac,EventTypeEnum.DOWNLOAD,BaseStatusEnum.NORMAL);
     }
 
     @RequestMapping(value = "/{uid}", method = RequestMethod.GET)
@@ -55,9 +56,9 @@ public class DownloadInfoController {
     }
 
     @RequestMapping(value = "/fail", method = RequestMethod.PUT)
-    public boolean downloadFail(@RequestParam("uid") String uid,
-                                             @RequestParam("mac") String mac){
-        return downloadInfoService.downloadFail(uid, mac);
+    public boolean updateDownloadFail(@RequestParam("uid") String uid,
+                                @RequestParam("mac") String mac){
+        return downloadInfoService.updateDownloadFail(uid, mac);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.PUT)

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

@@ -11,8 +11,8 @@ import java.util.List;
 
 public interface DownloadInfoRepository extends BasicJpaRepository<DownloadInfo, String> {
 
-    @Query(value = "select info from DownloadInfo info where info.userId = ?1 AND info.eventType= ?2 AND info.status = ?3 ORDER BY info.gmtCreated DESC ")
-    List<DownloadInfo> findByUserId(String uid, EventTypeEnum eventType, BaseStatusEnum status);
+    @Query(value = "select info from DownloadInfo info where info.userId = ?1 AND info.mac = ?2 AND info.eventType= ?3 AND info.status = ?4 ORDER BY info.gmtCreated DESC ")
+    List<DownloadInfo> findByUserId(String uid, String mac, EventTypeEnum eventType, BaseStatusEnum status);
 
     @Query(value = "select info from DownloadInfo info where info.userId = ?1 AND info.lessonId = ?2 AND info.mac = ?3 AND info.eventType = ?4  AND info.status = ?5 ORDER BY info.gmtCreated DESC ")
     DownloadInfo findByLessonUserId(String uid, String lessonId, String mac, EventTypeEnum eventType, BaseStatusEnum status);
@@ -30,5 +30,5 @@ public interface DownloadInfoRepository extends BasicJpaRepository<DownloadInfo,
 
     @Modifying
     @Query(value = "update DownloadInfo info set info.downloadStatus = ?3 where info.userId = ?1 AND info.mac = ?2")
-    int downloadFail(String uid, String mac, int failDownload);
+    int updateDownloadFail(String uid, String mac, int failDownload);
 }

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

@@ -45,8 +45,8 @@ public class DownloadInfoService {
      * @param status
      * @return
      */
-    public List<DownloadInfo> findByUserId(String uid, EventTypeEnum eventType, BaseStatusEnum status) {
-        return downloadInfoRepository.findByUserId(uid, eventType, status);
+    public List<DownloadInfo> findByUserId(String uid, String mac, EventTypeEnum eventType, BaseStatusEnum status) {
+        return downloadInfoRepository.findByUserId(uid, mac, eventType, status);
     }
 
     /**
@@ -102,8 +102,8 @@ public class DownloadInfoService {
         return downloadInfoRepository.update(downloadInfo);
     }
 
-    public boolean downloadFail(String uid, String mac) {
-        downloadInfoRepository.downloadFail(uid, mac, DownloadStatus.FAIL_DOWNLOAD);
+    public boolean updateDownloadFail(String uid, String mac) {
+        downloadInfoRepository.updateDownloadFail(uid, mac, DownloadStatus.FAIL_DOWNLOAD);
         return true;
     }
 }