Przeglądaj źródła

专辑 课件搜索

xushengqiang 6 lat temu
rodzic
commit
533a169190

+ 2 - 2
src/main/java/cn/efunbox/audio/config/Config.java

@@ -45,12 +45,12 @@ public class Config extends WebMvcConfigurerAdapter{
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(authInterceptor())
-                .addPathPatterns("/audio/search","/audio/searchList","/audio/info/{audioId}")
+                .addPathPatterns("/audio/search","/audio/searchList","/audio/info/{audioId}","/album","/album/{albumId}")
                 .excludePathPatterns("/device/**", "/error","/audio/*");
 
         registry.addInterceptor(adminInterceptor())
                 .addPathPatterns("/**", "/device/update", "/device/delete")
-                .excludePathPatterns("/device/**","/audio/info/{audioId}", "/error", "/admin/login", "/audio/search","/file/**","/audio/searchList","/statistics");
+                .excludePathPatterns("/device/**","/audio/info/{audioId}", "/error", "/admin/login", "/audio/search","/file/**","/audio/searchList","/statistics","/album","/album/{albumId}");
 
         registry.addInterceptor(ignoreOptionsInterceptor())
                 .addPathPatterns("/**");

+ 16 - 4
src/main/java/cn/efunbox/audio/controller/AlbumController.java

@@ -9,14 +9,13 @@ import cn.efunbox.audio.utils.ApiCode;
 import cn.efunbox.audio.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigInteger;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * AlbumController
@@ -69,9 +68,22 @@ public class AlbumController {
     @RequestMapping(method = RequestMethod.GET)
     public void list(HttpServletRequest request, HttpServletResponse response,Album album, Integer pageNo, Integer pageSize){
 
+        if (Objects.nonNull(pageSize) && pageSize > 100) {
+            pageSize = 100;
+        }
+
         OnePage<Album> albumPage = albumService.SearchAll(album,pageNo,pageSize);
 
         HttpUtil.responseOkData(request, response, albumPage);
         return;
     }
+
+    @GetMapping("{albumId}")
+    public void list(HttpServletRequest request, HttpServletResponse response,@PathVariable(name = "albumId") BigInteger albumId){
+
+        Album album = albumService.GetOne(albumId);
+
+        HttpUtil.responseOkData(request, response, album);
+        return;
+    }
 }

+ 2 - 2
src/main/java/cn/efunbox/audio/controller/AudioController.java

@@ -232,7 +232,7 @@ public class AudioController {
         Random random = new Random();
         int r = Math.abs(random.nextInt())%audioList.size();
         Audio audio = audioList.get(r);
-        if(audio.getIdResource()!=null && audio.getIdResource().length()>0){
+     /*   if(audio.getIdResource()!=null && audio.getIdResource().length()>0){
             String res = audioHttp.SearchByIdResource(audio.getIdResource());
 //        System.out.println(res);
             Map map = JSONObject.parseObject(res);
@@ -269,7 +269,7 @@ public class AudioController {
                 System.out.println(e.getMessage());
 //                audio.setUrl("fail to get resource uri");
             }
-        }
+        }*/
 
         insertRecord(audio.getId(),device);
 

+ 1 - 1
src/main/java/cn/efunbox/audio/vo/SearchVO.java

@@ -15,7 +15,7 @@ import java.util.List;
 public class SearchVO implements Serializable {
 
 
-    private Integer mediaType;
+    private Integer mediaType = 1;
 
     private Long id;