소스 검색

Merge remote-tracking branch 'origin/master'

xushengqiang 5 년 전
부모
커밋
e81f73826a

+ 1 - 0
src/main/java/cn/efunbox/audio/AudioApplication.java

@@ -2,6 +2,7 @@ package cn.efunbox.audio;
 
 import cn.efunbox.audio.config.Config;
 import cn.efunbox.audio.repository.base.ProjectSimpleJpaRepository;
+import cn.efunbox.audio.utils.ResApiCode;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Import;

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

@@ -50,7 +50,9 @@ public class Config extends WebMvcConfigurerAdapter{
 
         registry.addInterceptor(adminInterceptor())
                 .addPathPatterns("/**", "/device/update", "/device/delete")
-                .excludePathPatterns("/device/**","/audio/info/{audioId}", "/error", "/admin/login", "/audio/search","/file/**","/audio/searchList","/statistics","/album","/album/{albumId}");
+                .excludePathPatterns("/device/**","/audio/info/{audioId}", "/error", "/admin/login", "/audio/search","/file/**","/audio/searchList","/statistics","/album","/album/{albumId}")
+                //杭研开发接口
+                .excludePathPatterns("/getTypeList","/getTypeContentList","/getContentDetail","/getContentChapterList","/getChapterDetail");
 
         registry.addInterceptor(ignoreOptionsInterceptor())
                 .addPathPatterns("/**");

+ 47 - 0
src/main/java/cn/efunbox/audio/controller/res/ResAlbumController.java

@@ -0,0 +1,47 @@
+package cn.efunbox.audio.controller.res;
+
+import cn.efunbox.audio.entity.res.ResAlbum;
+import cn.efunbox.audio.page.ResOnePage;
+import cn.efunbox.audio.service.res.ResAlbumService;
+import cn.efunbox.audio.utils.ResApiCode;
+import cn.efunbox.audio.utils.ResApiResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping
+@Slf4j
+public class ResAlbumController {
+
+    @Autowired
+    ResAlbumService resAlbumService;
+
+    @RequestMapping(value = "/getTypeContentList")
+    public ResApiResult<ResOnePage<ResAlbum>> getResCategoryList(@RequestHeader(value = "USERID",required = false) String USERID,
+                                                                 @RequestParam(name="typeId",required = false) String typeId,
+                                                                 @RequestParam(name="pageNum",required = false) Integer pageNum,
+                                                                 @RequestParam(name="pageSize",required = false) Integer pageSize){
+
+        try {
+            return resAlbumService.getResAlbumList(typeId,pageNum,pageSize);
+        } catch (Exception e) {
+            log.error("getTypeContentList接口异常:{}",e.getMessage());
+            return ResApiResult.error(ResApiCode.UNKNOWN_ERROR);
+        }
+    }
+
+    @RequestMapping(value = "/getContentDetail")
+    public ResApiResult<ResAlbum> getResCategoryList(@RequestHeader(value = "USERID",required = false) String USERID,
+                                                                 @RequestParam(name="contentId",required = false) String contentId) {
+        try {
+            return resAlbumService.getResAlbumById(contentId);
+        } catch (Exception e) {
+            log.error("getContentDetail接口异常:{}", e.getMessage());
+            return ResApiResult.error(ResApiCode.UNKNOWN_ERROR);
+        }
+    }
+}

+ 31 - 0
src/main/java/cn/efunbox/audio/controller/res/ResCategoryController.java

@@ -0,0 +1,31 @@
+package cn.efunbox.audio.controller.res;
+
+import cn.efunbox.audio.entity.res.ResCategory;
+import cn.efunbox.audio.service.res.ResCategoryService;
+import cn.efunbox.audio.utils.ResApiCode;
+import cn.efunbox.audio.utils.ResApiResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping
+@Slf4j
+public class ResCategoryController {
+
+    @Autowired
+    ResCategoryService resCategoryService;
+
+    @RequestMapping(value = "/getTypeList")
+    public ResApiResult<ResCategory> getResCategoryList(@RequestHeader(value = "USERID",required = false) String USERID){
+        try {
+            return resCategoryService.getResCategoryList();
+        } catch (Exception e) {
+            log.error("getTypeList接口异常:{}",e.getMessage());
+        }
+        return ResApiResult.error(ResApiCode.UNKNOWN_ERROR);
+    }
+
+}

+ 48 - 0
src/main/java/cn/efunbox/audio/controller/res/ResWareController.java

@@ -0,0 +1,48 @@
+package cn.efunbox.audio.controller.res;
+
+import cn.efunbox.audio.entity.res.ResWare;
+import cn.efunbox.audio.page.ResOnePage;
+import cn.efunbox.audio.service.res.ResWareService;
+import cn.efunbox.audio.utils.ResApiCode;
+import cn.efunbox.audio.utils.ResApiResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping
+@Slf4j
+public class ResWareController {
+
+    @Autowired
+    ResWareService resWareService;
+
+    @RequestMapping(value = "/getContentChapterList")
+    public ResApiResult<ResOnePage<ResWare>> getResWareListByContentId(@RequestHeader(value = "USERID",required = false) String USERID,
+                                                                       @RequestParam(name="contentId",required = false) String contentId,
+                                                                       @RequestParam(name="order",required = false) String order,
+                                                                       @RequestParam(name="pageNum",required = false) Integer pageNum,
+                                                                       @RequestParam(name="pageSize",required = false) Integer pageSize){
+        try {
+            return resWareService.getResWareListByContentId(contentId,order,pageNum,pageSize);
+        } catch (Exception e) {
+            log.error("getContentChapterList接口异常:{}",e.getMessage());
+            return ResApiResult.error(ResApiCode.UNKNOWN_ERROR);
+        }
+    }
+
+    @RequestMapping(value = "/getChapterDetail")
+    public ResApiResult<ResWare> getResWareById(@RequestHeader(value = "USERID",required = false) String USERID,
+                                                @RequestParam(name="chapterId",required = false) String chapterId) {
+        try {
+            return resWareService.getResWareById(chapterId);
+        } catch (Exception e) {
+            log.error("getChapterDetail接口异常:{}", e.getMessage());
+            return ResApiResult.error(ResApiCode.UNKNOWN_ERROR);
+        }
+    }
+}

+ 6 - 6
src/main/java/cn/efunbox/audio/entity/res/ResAlbum.java

@@ -25,11 +25,11 @@ public class ResAlbum {
     @Column(name = "content_name")
     private String contentName;
 
-    @Column(name = "shor_trecommend")
-    private String shorTrecommend;
+    @Column(name = "shortrecommend")
+    private String shortrecommend;
 
-    @Column(name = "long_recommend")
-    private String longRecommend;
+    @Column(name = "longrecommend")
+    private String longrecommend;
 
     @Column(name = "author")
     private String author;
@@ -52,8 +52,8 @@ public class ResAlbum {
     @Column(name = "price")
     private String price;
 
-    @Column(name = "play_count")
-    private String playCount;
+    @Column(name = "playcount")
+    private String playcount;
 
     @Column(name = "media_type")
     private String mediaType;

+ 8 - 2
src/main/java/cn/efunbox/audio/entity/res/ResCategory.java

@@ -31,8 +31,14 @@ public class ResCategory {
     @Column(name = "sort")
     private String sort;
 
-    @Column(name = "type_update_time")
-    private String typeUpdateTime;
+    @Column(name = "type_updatetime")
+    private String typeUpdatetime;
+
+    @Column(name = "is_del")
+    private String isDel;
+
+    @Column(name = "renewal")
+    private String renewal;
 
     @Column(name = "gmt_created")
     private Date gmtCreated;

+ 7 - 4
src/main/java/cn/efunbox/audio/entity/res/ResWare.java

@@ -5,10 +5,7 @@ import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.Date;
 
 @ToString
@@ -52,6 +49,12 @@ public class ResWare {
     @Column(name = "content_id")
     private String contentId;
 
+    @Transient
+    private String contentName;
+
+    @Transient
+    private String contentPicUrl;
+
     @Column(name = "price")
     private String price;
 

+ 96 - 0
src/main/java/cn/efunbox/audio/impl/res/ResAlbumServiceImpl.java

@@ -0,0 +1,96 @@
+package cn.efunbox.audio.impl.res;
+
+import cn.efunbox.audio.entity.BaseOrderEnum;
+import cn.efunbox.audio.entity.res.ResAlbum;
+import cn.efunbox.audio.helper.SortHelper;
+import cn.efunbox.audio.page.ResOnePage;
+import cn.efunbox.audio.repository.res.ResAlbumRepository;
+import cn.efunbox.audio.service.res.ResAlbumService;
+import cn.efunbox.audio.utils.ResApiCode;
+import cn.efunbox.audio.utils.ResApiResult;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+@Service
+public class ResAlbumServiceImpl implements ResAlbumService {
+
+    @Autowired
+    ResAlbumRepository resAlbumRepository;
+
+    /**
+     * 获取分类下的专辑列表-分页
+     * @param typeId 分类 Id
+     * @param pageNum 页码
+     * @param pageSize 页面大小
+     * @return
+     */
+    @Override
+    public ResApiResult<ResOnePage<ResAlbum>> getResAlbumList(String typeId, Integer pageNum, Integer pageSize)  {
+
+        //查询条件
+        ResAlbum resAlbum = new ResAlbum();
+        if(StringUtils.isNotBlank(typeId)){
+            resAlbum.setTypeId(typeId);
+        }
+        resAlbum.setTypeId(typeId);
+
+        Long count = resAlbumRepository.count(resAlbum);
+        if(count == 0){
+            return ResApiResult.error(ResApiCode.NOT_FOUND);
+        }
+
+
+        ResOnePage onePage = new ResOnePage(count);
+        if(pageNum != null){
+            onePage.setPageNum(pageNum);
+        }
+        if(pageSize != null){
+            onePage.setPageSize(pageSize);
+        }
+
+        //数据查询
+        List<ResAlbum> resAlbumList = resAlbumRepository.find(
+                resAlbum,
+                onePage.getStart(),
+                onePage.getPageSize(),
+                SortHelper.sortMap2Sort(
+                        new LinkedHashMap<String, BaseOrderEnum>() {{
+                            put("sort", BaseOrderEnum.ASC);
+                        }}
+                )
+        );
+        if(resAlbumList == null || resAlbumList.size() == 0){
+            return ResApiResult.error(ResApiCode.NOT_FOUND);
+        }
+
+        onePage.setContentList(resAlbumList);
+
+        //响应
+        return ResApiResult.ok(onePage);
+    }
+
+    /**
+     * 获取专辑详情信息
+     * @param contentId 专辑 id
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResApiResult<ResAlbum> getResAlbumById(String contentId) throws Exception {
+        if(StringUtils.isBlank(contentId)){
+            return ResApiResult.error(ResApiCode.PARAMETER_NULL,ResApiCode.PARAMETER_NULL.getMessage()+"contentId");//错误提示语格式=》请求参数为空:contentId
+        }
+
+        //查询
+        ResAlbum resAlbum = resAlbumRepository.find(contentId);
+        if(resAlbum == null){
+            return ResApiResult.error(ResApiCode.NOT_FOUND);
+        }
+
+        return ResApiResult.ok(resAlbum);
+    }
+}

+ 35 - 0
src/main/java/cn/efunbox/audio/impl/res/ResCategoryServiceImpl.java

@@ -0,0 +1,35 @@
+package cn.efunbox.audio.impl.res;
+
+import cn.efunbox.audio.entity.res.ResCategory;
+import cn.efunbox.audio.repository.res.ResCategoryRepository;
+import cn.efunbox.audio.service.res.ResCategoryService;
+import cn.efunbox.audio.utils.ApiResult;
+import cn.efunbox.audio.utils.ResApiResult;
+import cn.efunbox.audio.vo.res.ResCategoryVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ResCategoryServiceImpl implements ResCategoryService {
+
+    @Autowired
+    ResCategoryRepository resCategoryRepository;
+
+    /**
+     * 获取分类列表
+     * @return
+     */
+    @Override
+    public ResApiResult getResCategoryList() {
+
+        //查询
+        List<ResCategory> resCategoryList = resCategoryRepository.getResCategoryList();
+
+        //响应
+        ResCategoryVO resCategoryVO = new ResCategoryVO();
+        resCategoryVO.setTypeList(resCategoryList);
+        return ResApiResult.ok(resCategoryVO);
+    }
+}

+ 111 - 0
src/main/java/cn/efunbox/audio/impl/res/ResWareServiceImpl.java

@@ -0,0 +1,111 @@
+package cn.efunbox.audio.impl.res;
+
+import cn.efunbox.audio.entity.BaseOrderEnum;
+import cn.efunbox.audio.entity.res.ResAlbum;
+import cn.efunbox.audio.entity.res.ResWare;
+import cn.efunbox.audio.helper.SortHelper;
+import cn.efunbox.audio.page.ResOnePage;
+import cn.efunbox.audio.repository.res.ResAlbumRepository;
+import cn.efunbox.audio.repository.res.ResWareRepository;
+import cn.efunbox.audio.service.res.ResWareService;
+import cn.efunbox.audio.utils.ResApiCode;
+import cn.efunbox.audio.utils.ResApiResult;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+@Service
+public class ResWareServiceImpl implements ResWareService {
+
+    @Autowired
+    ResWareRepository resWareRepository;
+    @Autowired
+    ResAlbumRepository resAlbumRepository;
+
+    /**
+     * 根据专辑获取节目列表
+     * @param contentId 专辑编号
+     * @param pageNum   页码
+     * @param pageSize  页大小
+     * @return
+     */
+    @Override
+    public ResApiResult<ResOnePage<ResWare>> getResWareListByContentId(String contentId,String order, Integer pageNum, Integer pageSize) {
+        if(StringUtils.isBlank(contentId)){
+            return ResApiResult.error(ResApiCode.PARAMETER_NULL,ResApiCode.PARAMETER_NULL.getMessage()+"contentId");//错误提示语格式=》请求参数为空:contentId
+        }
+
+        ResWare resWare = new ResWare();
+        resWare.setContentId(contentId);
+
+
+        //总记录数
+        Long count = resWareRepository.count(resWare);
+        if(count == 0){
+            return ResApiResult.error(ResApiCode.NOT_FOUND);
+        }
+
+        ResOnePage onePage = new ResOnePage(count);
+        if(pageNum != null){
+            onePage.setPageNum(pageNum);
+        }
+        if(pageSize != null){
+            onePage.setPageSize(pageSize);
+        }
+
+        //查询
+        List<ResWare> wareList = resWareRepository.find(resWare,
+             onePage.getStart(),
+             onePage.getPageSize(),
+              SortHelper.sortMap2Sort(
+                    new LinkedHashMap<String, BaseOrderEnum>() {{
+                        if(StringUtils.isBlank(order) || "asc".equals(order)){
+                            put("sort", BaseOrderEnum.ASC);
+                        }else{
+                            put("sort",BaseOrderEnum.DESC);
+                        }
+                    }}
+              )
+        );
+
+        if(wareList == null || wareList.size() == 0){
+            return ResApiResult.error(ResApiCode.NOT_FOUND);
+        }
+        onePage.setChapterList(wareList);
+
+
+        //响应
+        return ResApiResult.ok(onePage);
+    }
+
+    /**
+     * 获取节目详情信息
+     * @param chapterId
+     * @return
+     */
+    @Override
+    public ResApiResult<ResWare> getResWareById(String chapterId) {
+        if(StringUtils.isBlank(chapterId)){
+            return ResApiResult.error(ResApiCode.PARAMETER_NULL,ResApiCode.PARAMETER_NULL.getMessage()+"contentId");//错误提示语格式=》请求参数为空:chapterId
+        }
+
+        //课件查询
+        ResWare resWare = resWareRepository.find(chapterId);
+        if(resWare == null){
+            return ResApiResult.error(ResApiCode.NOT_FOUND);
+        }
+
+        //课程
+        ResAlbum resAlbum = resAlbumRepository.find(resWare.getContentId());
+        if(resAlbum != null){
+            resWare.setContentName(resAlbum.getContentName());
+            resWare.setContentPicUrl(resAlbum.getContentPicUrl());
+        }
+
+        //响应
+        return ResApiResult.ok(resWare);
+    }
+}

+ 23 - 1
src/main/java/cn/efunbox/audio/page/ResOnePage.java

@@ -14,7 +14,7 @@ public class ResOnePage<E> implements ResPageable<List<E>> ,Serializable {
 
 	private static final long serialVersionUID = 1L;
 	// 默认分页数据条数
-	public final static int DEFAULT_PAGE_SIZE = 10;
+	public final static int DEFAULT_PAGE_SIZE = 20;
 
 	// 当前页
 	private int pageNum = 1;
@@ -28,6 +28,12 @@ public class ResOnePage<E> implements ResPageable<List<E>> ,Serializable {
 	// 数据内容
 	private List<E> list;
 
+	// 数据内容
+	private List<E> contentList;
+
+	//数据内容
+	private List<E> chapterList;
+
 	/**
 	 * 构造方法
 	 */
@@ -216,6 +222,22 @@ public class ResOnePage<E> implements ResPageable<List<E>> ,Serializable {
 		this.list = list;
 	}
 
+	public List<E> getContentList() {
+		return null == contentList ? Collections.emptyList() : contentList;
+	}
+
+	public void setContentList(List<E> contentList) {
+		this.contentList = contentList;
+	}
+
+	public List<E> getChapterList() {
+		return null == chapterList ? Collections.emptyList() : chapterList;
+	}
+
+	public void setChapterList(List<E> chapterList) {
+		this.chapterList = chapterList;
+	}
+
 	/**
 	 * 功能: <br/>
 	 * 

+ 6 - 0
src/main/java/cn/efunbox/audio/repository/res/ResCategoryRepository.java

@@ -2,7 +2,13 @@ package cn.efunbox.audio.repository.res;
 
 import cn.efunbox.audio.entity.res.ResCategory;
 import cn.efunbox.audio.repository.base.BasicRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
 
 public interface ResCategoryRepository extends BasicRepository<ResCategory> {
 
+    @Query(value = "select * from res_category where is_del = 0",nativeQuery = true)
+    public List<ResCategory> getResCategoryList();
 }

+ 12 - 0
src/main/java/cn/efunbox/audio/service/res/ResAlbumService.java

@@ -0,0 +1,12 @@
+package cn.efunbox.audio.service.res;
+
+import cn.efunbox.audio.entity.res.ResAlbum;
+import cn.efunbox.audio.page.ResOnePage;
+import cn.efunbox.audio.utils.ResApiResult;
+
+public interface ResAlbumService {
+
+    ResApiResult<ResOnePage<ResAlbum>> getResAlbumList(String typeId, Integer pageNo, Integer pageSize) throws Exception;
+
+    ResApiResult<ResAlbum> getResAlbumById(String contentId) throws Exception;
+}

+ 8 - 0
src/main/java/cn/efunbox/audio/service/res/ResCategoryService.java

@@ -0,0 +1,8 @@
+package cn.efunbox.audio.service.res;
+
+import cn.efunbox.audio.utils.ResApiResult;
+
+public interface ResCategoryService {
+
+    public ResApiResult getResCategoryList() throws Exception;
+}

+ 12 - 0
src/main/java/cn/efunbox/audio/service/res/ResWareService.java

@@ -0,0 +1,12 @@
+package cn.efunbox.audio.service.res;
+
+import cn.efunbox.audio.entity.res.ResWare;
+import cn.efunbox.audio.page.ResOnePage;
+import cn.efunbox.audio.utils.ResApiResult;
+
+public interface ResWareService {
+
+    public ResApiResult<ResOnePage<ResWare>> getResWareListByContentId(String contentId, String order, Integer pageNum, Integer pageSize);
+
+    public ResApiResult<ResWare> getResWareById(String chapterId);
+}

+ 7 - 0
src/main/java/cn/efunbox/audio/utils/BaseConstant.java

@@ -0,0 +1,7 @@
+package cn.efunbox.audio.utils;
+
+/**
+ * 常量类
+ */
+public class BaseConstant {
+}

+ 8 - 8
src/main/java/cn/efunbox/audio/utils/ResApiCode.java

@@ -6,21 +6,21 @@ public class ResApiCode extends AbstractApiCode {
     public static final int _C_OPERATION_FAIL = 0;
     public static final ResApiCode OPERATION_FAIL = new ResApiCode("操作失败", 0);
     public static final int _C_UNKNOWN_ERROR = -1;
-    public static final ApiCode UNKNOWN_ERROR = new ApiCode("系统异常", -1);
+    public static final ResApiCode UNKNOWN_ERROR = new ResApiCode("系统异常", -1);
     public static final int _C_PARAMETER_NULL = -102;
-    public static final ApiCode PARAMETER_NULL = new ApiCode("请求参数为空", -102);
+    public static final ResApiCode PARAMETER_NULL = new ResApiCode("请求参数为空", -102);
     public static final int _C_PARAMETER_ERROR = -103;
-    public static final ApiCode PARAMETER_ERROR = new ApiCode("请求参数非法", -103);
+    public static final ResApiCode PARAMETER_ERROR = new ResApiCode("请求参数非法", -103);
     public static final int _C_NOT_SUPPORT = -104;
-    public static final ApiCode NOT_SUPPORT = new ApiCode("内容来源不存在", -104);
+    public static final ResApiCode NOT_SUPPORT = new ResApiCode("内容来源不存在", -104);
     public static final int _C_SIGNATURE_ERROR = -105;
-    public static final ApiCode SIGNATURE_ERROR = new ApiCode("签名不匹配", -105);
+    public static final ResApiCode SIGNATURE_ERROR = new ResApiCode("签名不匹配", -105);
     public static final int _C_USER_DEFINED_ERROR = -201;
-    public static final ApiCode USER_DEFINED_ERROR = new ApiCode("自定义错误类型", -201);
+    public static final ResApiCode USER_DEFINED_ERROR = new ResApiCode("自定义错误类型", -201);
     public static final int _C_EXTERNAL_ERROR = -301;
-    public static final ApiCode EXTERNAL_ERROR = new ApiCode("外部平台访问失败", -301);
+    public static final ResApiCode EXTERNAL_ERROR = new ResApiCode("外部平台访问失败", -301);
     public static final int _C_NOT_FOUND = 24000;
-    public static final ApiCode NOT_FOUND = new ApiCode("服务端侧不存在符合条件的数据", 24000);
+    public static final ResApiCode NOT_FOUND = new ResApiCode("服务端侧不存在符合条件的数据", 24000);
 
     protected ResApiCode(String message, int code) {
         super(code, message);

+ 1 - 1
src/main/java/cn/efunbox/audio/utils/ResApiResult.java

@@ -20,7 +20,7 @@ public class ResApiResult<T> implements Serializable {
     }
 
     private ResApiResult(ResApiCode ResApiCode, String msg) {
-        this.recode = recode;
+        this.recode = ResApiCode.getCode();
         this.msg = msg;
     }
 

+ 12 - 0
src/main/java/cn/efunbox/audio/vo/res/ResCategoryVO.java

@@ -0,0 +1,12 @@
+package cn.efunbox.audio.vo.res;
+
+import cn.efunbox.audio.entity.res.ResCategory;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ResCategoryVO {
+    //分类列表
+    private List<ResCategory> typeList;
+}