修改下载相关接口

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

@@ -13,16 +13,16 @@ public interface DownloadInfoClient {
     @RequestMapping(value = "/download", method = RequestMethod.POST)
     DownloadInfo add(@RequestBody DownloadInfoDTO dto);
 
-    @RequestMapping(value = "/download/list/{uid}", method = RequestMethod.GET)
+    @RequestMapping(value = "/download/list", method = RequestMethod.GET)
     List<DownloadInfo> findByUserId(@RequestParam("uid") String uid , @RequestParam("mac") String mac);
 
-    @RequestMapping(value = "/download/{uid}", method = RequestMethod.GET)
+    @RequestMapping(value = "/download", method = RequestMethod.GET)
     DownloadInfo findByLessonUserId(@RequestParam("uid") String uid, @RequestParam("lessonId") String lessonId, @RequestParam("mac") String mac);
 
-    @RequestMapping(value = "/download/delete/{uid}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/download/delete", method = RequestMethod.DELETE)
     DownloadInfo deleteByLessonUserId(@RequestParam("uid") String uid, @RequestParam("lessonId") String lessonId, @RequestParam("mac") String mac);
 
-    @RequestMapping(value = "/download/update/{uid}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/download/update/resource", method = RequestMethod.PUT)
     DownloadInfo updateByLessonUserId(@RequestParam("uid") String uid, @RequestParam("lessonId") String lessonId, @RequestParam("mac") String mac);
 
     @RequestMapping(value = "/download/update", method = RequestMethod.PUT)

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

@@ -18,38 +18,68 @@ public class DownloadInfoController {
     @Autowired
     private DownloadInfoService downloadInfoService;
 
+    /**
+     * 添加下载
+     * @param dto
+     * @return
+     */
     @RequestMapping(method = RequestMethod.POST)
     public DownloadInfo add(@RequestBody DownloadInfoDTO dto) {
-
-
         //TODO
         //addEventLog();
 
         return downloadInfoService.add(dto);
     }
 
-    @RequestMapping(value = "/list/{uid}", method = RequestMethod.GET)
-    public List<DownloadInfo> findByUserId(@PathVariable("uid") String uid,
+    /**
+     * 下载列表
+     * @param uid
+     * @param mac
+     * @return
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public List<DownloadInfo> findByUserId(@RequestParam("uid") String uid,
                                            @RequestParam("mac") String mac){
         return downloadInfoService.findByUserId(uid,mac,EventTypeEnum.DOWNLOAD,BaseStatusEnum.NORMAL);
     }
 
-    @RequestMapping(value = "/{uid}", method = RequestMethod.GET)
-    public DownloadInfo findByLessonUserId(@PathVariable("uid") String uid,
+    /**
+     * 查询下载
+     * @param uid
+     * @param lessonId
+     * @param mac
+     * @return
+     */
+    @RequestMapping(value = "", method = RequestMethod.GET)
+    public DownloadInfo findByLessonUserId(@RequestParam("uid") String uid,
                                            @RequestParam("lessonId") String lessonId,
                                            @RequestParam("mac") String mac){
         return downloadInfoService.findByLessonUserId(uid, lessonId, mac, EventTypeEnum.DOWNLOAD, BaseStatusEnum.NORMAL);
     }
 
-    @RequestMapping(value = "/delete/{uid}", method = RequestMethod.DELETE)
-    public DownloadInfo deleteByLessonUserId(@PathVariable("uid") String uid,
+    /**
+     * 删除下载
+     * @param uid
+     * @param lessonId
+     * @param mac
+     * @return
+     */
+    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+    public DownloadInfo deleteByLessonUserId(@RequestParam("uid") String uid,
                                              @RequestParam("lessonId") String lessonId,
                                              @RequestParam("mac") String mac){
         return downloadInfoService.deleteByLessonUserId(uid, lessonId, mac);
     }
 
-    @RequestMapping(value = "/update/{uid}", method = RequestMethod.PUT)
-    public DownloadInfo updateByLessonUserId(@PathVariable("uid") String uid,
+    /**
+     * 更新下载内容
+     * @param uid
+     * @param lessonId
+     * @param mac
+     * @return
+     */
+    @RequestMapping(value = "/update/resource", method = RequestMethod.PUT)
+    public DownloadInfo updateByLessonUserId(@RequestParam("uid") String uid,
                                              @RequestParam("lessonId") String lessonId,
                                              @RequestParam("mac") String mac){
         return downloadInfoService.updateByLessonUserId(uid, lessonId, mac);

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

@@ -9,6 +9,7 @@ import cn.rankin.userservice.repository.DownloadInfoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 import static cn.rankin.userservice.utils.DTOConverter.convert;
@@ -102,6 +103,7 @@ public class DownloadInfoService {
         return downloadInfoRepository.update(downloadInfo);
     }
 
+    @Transactional
     public boolean updateDownloadFail(String uid, String mac) {
         downloadInfoRepository.updateDownloadFail(uid, mac, DownloadStatus.FAIL_DOWNLOAD);
         return true;