rankin-api-web/src/main/java/cn/rankin/apiweb/service/resource/ResourceService.java

@@ -80,6 +80,10 @@ public class ResourceService {
                     resourceItemVo.setType(resourceType);
                     if (resourceType.equals(ResourceType.VIDEO)) {
                         type = ResourceType.VIDEO;
+                    }else if (resourceType.equals(ResourceType.AUDIO_IMG)) {
+                        type = ResourceType.AUDIO_IMG;
+                        resourceItemVo.setImg(resourceVo.getImg());
+                        resourceItemVo.setAudio(resourceVo.getAudio());
                     }
                     resourceVoList.add(resourceItemVo);
                 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/resource/ResourceController.java

@@ -8,6 +8,8 @@ import cn.rankin.common.utils.dto.resource.ResourceDTO;
 import cn.rankin.common.utils.dto.resource.ResourceSearchDTO;
 import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.common.utils.vo.resource.ResourceVo;
+import cn.rankin.data.api.resource.dto.AudioImgDTO;
+import cn.rankin.data.api.resource.entity.AudioImg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,4 +44,33 @@ public class ResourceController {
         }
         return resourceService.update(id,resourceDTO);
     }
+
+
+    //创建有声读物
+    @RequestMapping(value="/audioImg",method = RequestMethod.POST)
+    public APIResult<AudioImg> createAudioImg(@RequestBody AudioImgDTO dto) {
+        AudioImg audioImg = resourceService.createAudioImg(dto);
+        if(null == audioImg){
+            return APIResult.error(CmsWebAPICode.PARAMETER_ERROR);
+        }else{
+            return APIResult.ok(audioImg);
+        }
+    }
+
+    //修改有声读物
+    @RequestMapping(value="/audioImg",method = RequestMethod.PUT)
+    public APIResult<AudioImg> updateAudioImg(@RequestBody AudioImgDTO dto) {
+        String id = dto.getId();
+        if (null == id || id.isEmpty()){
+            log.error("id Is Null");
+            return APIResult.error(CmsWebAPICode.PARAMETER_ERROR);
+        }
+
+        AudioImg audioImg = resourceService.updateAudioImg(dto);
+        if(null == audioImg){
+            return APIResult.error(CmsWebAPICode.PARAMETER_ERROR);
+        }else{
+            return APIResult.ok(audioImg);
+        }
+    }
 }

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

@@ -3,6 +3,7 @@ package cn.rankin.cmsweb.controller.user;
 import cn.rankin.cmsweb.assist.resolver.NeedUser;
 import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.product.MerchantProductService;
+import cn.rankin.cmsweb.service.product.TagService;
 import cn.rankin.cmsweb.service.user.UserTagProductRelationServiceInterface;
 import cn.rankin.cmsweb.service.user.UserTagServiceInterface;
 import cn.rankin.common.utils.api.model.APICode;
@@ -10,6 +11,7 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.data.api.product.entity.MerchantProduct;
+import cn.rankin.data.api.product.vo.TagVo;
 import cn.rankin.data.api.user.dto.UserTagDTO;
 import cn.rankin.data.api.user.dto.UserTagSearchDTO;
 import cn.rankin.data.api.user.entity.UserTag;
@@ -29,6 +31,9 @@ import java.util.List;
 public class UserTagController {
 
     @Autowired
+    private TagService tagService;
+
+    @Autowired
     private UserTagServiceInterface userTagService;
 
     @Autowired
@@ -114,4 +119,29 @@ public class UserTagController {
             return APIResult.error(APICode.OPERATE_ERROR);
         }
     }
+
+    @RequestMapping(value = "/copy" , method = RequestMethod.GET)
+    public APIResult<UserTag> copyTag(@RequestParam("userTagId") String userTagId,@RequestParam("tagId") String tagId) {
+        TagVo tagVo = tagService.getTagInfo(tagId);
+        if(null == tagVo){
+            log.error("{copyTag} not found Tag by id, id={}", tagId);
+            return APIResult.error(APICode.NOT_EXISTS);
+        }
+        List<MerchantProduct> productList = tagVo.getProductList();
+        List<String> productIdList = new ArrayList<>();
+
+        productList.forEach(product -> productIdList.add(product.getPid()));
+
+        UserTagDTO dto =new UserTagDTO();
+        dto.setId(userTagId);
+        dto.setProductList(productIdList);
+
+        UserTag userTag = userTagService.update(dto);
+        if (userTag != null) {
+            log.error("{copyTag}  update UserTag is error, id={}", dto.getId());
+            return APIResult.ok(userTag);
+        }else{
+            return APIResult.error(APICode.NOT_EXISTS);
+        }
+    }
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/product/TagService.java

@@ -26,4 +26,7 @@ public interface TagService {
 
     @RequestMapping(value = "/tag/{id}", method = RequestMethod.GET)
     APIResult<TagVo> getTag(@PathVariable("id") String id);
+
+    @RequestMapping(value = "/tag/v2/{id}", method = RequestMethod.GET)
+    TagVo getTagInfo(@PathVariable("id") String id);
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/product/proxy/WareServiceProxy.java

@@ -156,9 +156,12 @@ public class WareServiceProxy {
             if (resourceVo != null) {
                 resourceVoList.add(resourceVo);
             }
+
         }
+
         courseWareVo.setResourceList(resourceVoList);
 
         return courseWareVo;
     }
+
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/resource/ResourceService.java

@@ -4,6 +4,8 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.dto.resource.ResourceDTO;
 import cn.rankin.common.utils.vo.resource.ResourceVo;
+import cn.rankin.data.api.resource.dto.AudioImgDTO;
+import cn.rankin.data.api.resource.entity.AudioImg;
 import cn.rankin.data.api.resource.vo.OSSSignature;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -28,5 +30,15 @@ public interface ResourceService {
 
     @RequestMapping(value = "/resource/{id}", method = RequestMethod.PUT)
     APIResult<ResourceVo> update(@PathVariable("id") String id, @RequestBody ResourceDTO resourceDTO);
+
+    //有声读物
+    @RequestMapping(value = "/resource/audioImg", method = RequestMethod.POST)
+    AudioImg createAudioImg(@RequestBody AudioImgDTO dto);
+
+    @RequestMapping(value = "/resource/audioImg", method = RequestMethod.PUT)
+    AudioImg updateAudioImg(@RequestBody AudioImgDTO dto);
+
+    @RequestMapping(value = "/resource/audioImg/batch", method = RequestMethod.GET)
+    Map<String, ResourceVo> getAudioImgBatch(@RequestParam("ids") List<String> ids);
 }
 

rankin-common-utils/src/main/java/cn/rankin/common/utils/constant/ResourceType.java

@@ -9,4 +9,6 @@ public class ResourceType {
     public final static int LIVE = 2;
 
     public final static int IMG = 3;
+
+    public final static int AUDIO_IMG = 4;
 }

rankin-common-utils/src/main/java/cn/rankin/common/utils/vo/resource/Resource.java

@@ -0,0 +1,38 @@
+package cn.rankin.common.utils.vo.resource;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import lombok.Data;
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ToString
+public class Resource implements Serializable {
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private Integer type;
+
+    private String format;
+
+    private String quality;
+
+    private Long size;
+
+    private String path;
+
+    private BaseStatusEnum status;
+
+    private Date gmtCreated;
+
+    private Date gmtModified;
+
+    private String url;
+
+}

rankin-common-utils/src/main/java/cn/rankin/common/utils/vo/resource/ResourceVo.java

@@ -35,4 +35,8 @@ public class ResourceVo implements Serializable {
 
     private String url;
 
+    private Resource img;
+
+    private Resource audio;
+
 }

rankin-data-api/src/main/java/cn/rankin/data/api/app/vo/ResourceItemVo.java

@@ -1,5 +1,6 @@
 package cn.rankin.data.api.app.vo;
 
+import cn.rankin.common.utils.vo.resource.Resource;
 import lombok.Data;
 import lombok.ToString;
 
@@ -14,4 +15,9 @@ public class ResourceItemVo implements Serializable {
     private Integer type;
 
     private String url;
+
+    private Resource img;
+
+    private Resource audio;
+
 }

rankin-data-api/src/main/java/cn/rankin/data/api/resource/dto/AudioImgDTO.java

@@ -0,0 +1,56 @@
+package cn.rankin.data.api.resource.dto;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import cn.rankin.data.api.resource.entity.Resource;
+import lombok.Data;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ToString
+public class AudioImgDTO implements Serializable {
+
+    private String id;
+
+    private String code;
+
+    private String name;
+
+    private Integer type;       //type,{4}， 表示{有声读物}
+
+    private BaseStatusEnum status;
+
+    private Resource img;
+
+    private String imgPath;
+
+    private String imgFormat;
+
+    private String imgQuality;
+
+    private Long imgSize;
+
+    private String imgUrl;
+
+
+    private Resource audio;
+
+    private String audioPath;
+
+    private String audioFormat;
+
+    private String audioQuality;
+
+    private Long audioSize;
+
+    private String audioUrl;
+
+
+
+
+}

rankin-data-api/src/main/java/cn/rankin/data/api/resource/entity/AudioImg.java

@@ -0,0 +1,51 @@
+package cn.rankin.data.api.resource.entity;
+
+import cn.rankin.common.utils.enums.BaseStatusEnum;
+import lombok.Data;
+import lombok.ToString;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ToString
+@Entity
+@Table(name = "r_audio_img")
+@DynamicInsert
+@DynamicUpdate
+public class AudioImg implements Serializable {
+
+    @Id
+    private String id;
+
+    @Column
+    private String code;
+
+    @Column
+    private String name;
+
+    @Column
+    private Integer type;       //type,{4}， 表示{有声读物}
+
+    @Column(name = "img_id")
+    private String imgId;
+
+    @Column(name = "audio_id")
+    private String audioId;
+
+    @Column
+    @Enumerated(EnumType.ORDINAL)
+    private BaseStatusEnum status;
+
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtCreated;
+
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtModified;
+
+}

rankin-data-api/src/main/java/cn/rankin/data/api/resource/entity/Resource.java

@@ -58,4 +58,10 @@ public class Resource implements Serializable {
 
     @Transient
     private String url;
+
+    @Transient
+    private Resource img;
+
+    @Transient
+    private Resource audio;
 }

rankin-product-service/src/main/java/cn/rankin/productservice/controller/app/ItemControllerV0.java

@@ -10,6 +10,11 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * 已弃用，
+ *
+ * 以 cn.rankin.productservice.controller.ItemController 替代
+ */
 @RestController
 @RequestMapping(value = "/v0/app/item")
 public class ItemControllerV0 {
@@ -33,10 +38,4 @@ public class ItemControllerV0 {
         return itemService.findPageByTagIdAndPids(merchantId, tagId, productIdList, pageNo, pageSize);
     }
 
-    @RequestMapping(value = "/pids", method = RequestMethod.POST)
-    public List<ItemVo> findItemByPids(@RequestBody List<String> productIdList, @RequestParam("merchantId") String merchantId) {
-        List<ItemVo> itemVoList = itemService.findByIds(merchantId,productIdList);
-        return itemVoList;
-    }
-
 }

rankin-product-service/src/main/java/cn/rankin/productservice/controller/cms/TagController.java

@@ -57,4 +57,9 @@ public class TagController {
         return tagService.delete(tagId);
     }
 
+    @RequestMapping(value = "/v2/{tagId}", method = RequestMethod.GET)
+    public Tag getTagInfo(@PathVariable("tagId") String tagId) {
+        return tagService.getTagInfo(tagId);
+    }
+
 }

rankin-product-service/src/main/java/cn/rankin/productservice/service/TagService.java

@@ -217,4 +217,13 @@ public class TagService {
             tag.setSort(index);
         }
     }
+
+    public Tag getTagInfo(String tagId) {
+        Tag tag = tagRepository.find(tagId);
+        String merchantId = tag.getMerchantId();
+
+        List<MerchantProduct> merchantProductList = getMerchantProductList(tagId, merchantId);
+        tag.setProductList(merchantProductList);
+        return tag;
+    }
 }

rankin-resource-service/src/main/java/cn/rankin/resourceservice/controller/ResourceController.java

@@ -5,14 +5,21 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.constant.ResourceType;
 import cn.rankin.common.utils.dto.resource.ResourceSearchDTO;
+import cn.rankin.common.utils.util.DateUtil;
+import cn.rankin.data.api.resource.dto.AudioImgDTO;
+import cn.rankin.data.api.resource.entity.AudioImg;
 import cn.rankin.data.api.resource.entity.Resource;
+import cn.rankin.resourceservice.service.AudioImgService;
 import cn.rankin.resourceservice.service.ResourceService;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +31,9 @@ public class ResourceController {
     @Autowired
     private ResourceService resourceService;
 
+    @Autowired
+    private AudioImgService audioImgService;
+
     public static String HTTP_VIDEO_DOMAIN = "http://efunvideo.ai160.com";
     public static String LJ_VIDEO_DOMAIN = "http://ljvideo.ai160.com";
 
@@ -39,10 +49,11 @@ public class ResourceController {
         }
 
         Integer type = resourceSearchDTO.getType();
-        if (type.intValue() == ResourceType.IMG) {
+        if (type.intValue() == ResourceType.IMG || type.intValue() == ResourceType.AUDIO) {
             // 图片本地取
             Resource resource = new Resource();
 
+            resource.setType(type);
             String code = resourceSearchDTO.getCode();
             if (!StringUtils.isEmpty(code)) {
                 resource.setCode("%" + code.trim() + "%");
@@ -53,6 +64,41 @@ public class ResourceController {
                 resource.setName("%" + name.trim() + "%");
             }
             return resourceService.search(resource, resourceSearchDTO.getPageNo(), resourceSearchDTO.getPageSize());
+        }else if(type.intValue() == ResourceType.AUDIO_IMG){
+            // 本地取
+            AudioImg audioImg = new AudioImg();
+
+            String code = resourceSearchDTO.getCode();
+            if (!StringUtils.isEmpty(code)) {
+                audioImg.setCode("%" + code.trim() + "%");
+            }
+
+            String name = resourceSearchDTO.getName();
+            if (!StringUtils.isEmpty(name)) {
+                audioImg.setName("%" + name.trim() + "%");
+            }
+            Page<AudioImg> audioImgPage = audioImgService.search(audioImg, resourceSearchDTO.getPageNo(), resourceSearchDTO.getPageSize());
+
+            //创建一个默认为0
+            Page<Resource> page = new Page(0L, resourceSearchDTO.getPageNo(), resourceSearchDTO.getPageSize());
+
+            if(audioImgPage.getPageSize() > 0 ){
+                List<AudioImg> audioImgList = audioImgPage.getList();
+
+                if(!CollectionUtils.isEmpty(audioImgList)){
+                    List<Resource> resourceList = new ArrayList<>();
+                    page.setTotalSize(audioImgList.size());
+
+                    //有声读物   转  资源
+                    audioImgList.forEach(ai -> {
+                        Resource resource = resourceService.audioImgToResource(ai);
+                        resourceList.add(resource);
+                    });
+                    page.setList(resourceList);
+                }
+            }
+            return APIResult.ok(page);
+
         }else {
             // 其他去云平台
             if (resourceSearchDTO.getCode() != null) {
@@ -63,6 +109,8 @@ public class ResourceController {
         }
     }
 
+
+
     @RequestMapping(method = RequestMethod.POST)
     public APIResult<Resource> create(@RequestBody Resource resource) {
 
@@ -102,4 +150,128 @@ public class ResourceController {
 
         return APIResult.ok();
     }
+
+    /* ------------ 有声读物  audioImg    ---------------------start---------------------------------*/
+    @RequestMapping(value = "/audioImg/batch", method = RequestMethod.GET)
+    public Map<String, Resource> getAudioImgBatch(@RequestParam("ids") List<String> ids) {
+        Map<String, Resource> audioImgMap= new HashMap<>();
+        List<AudioImg> audioImgs = audioImgService.findMixByIds(ids);
+        if(CollectionUtils.isEmpty(audioImgs)){
+            return audioImgMap;
+        }
+
+        audioImgs.forEach(ai -> {
+            Resource resource = resourceService.audioImgToResource(ai);
+            audioImgMap.put(ai.getId(),resource);
+
+        });
+
+        return audioImgMap;
+    }
+
+    @RequestMapping(value="/audioImg",method = RequestMethod.POST)
+    public AudioImg createAudioImg(@RequestBody AudioImgDTO dto) {
+        if (audioImgService.exists(dto.getCode())) {
+            log.error("audioImg code Is exist");
+            return null;
+        }
+
+        Resource a = dto.getAudio();
+        Resource i = dto.getImg();
+
+        //设置code  name
+        setCodeName(a, dto);
+        setCodeName(i, dto);
+
+        Resource img = saveOrUpdateResource(i);
+        Resource audio = saveOrUpdateResource(a);
+
+        if(null != audio && null != img){
+            AudioImg ai = new AudioImg();
+            ai.setStatus(dto.getStatus());
+            ai.setName(dto.getName());
+            ai.setCode(dto.getCode());
+            ai.setType(ResourceType.AUDIO_IMG);
+
+            //audio  info
+            ai.setAudioId(audio.getId());
+
+            //img  info
+            ai.setImgId(img.getId());
+
+            AudioImg audioImg = audioImgService.save(ai);
+
+            return audioImg;
+        }else{
+            log.error("create AudioImg is error,audio={},img={}",audio, img);
+            return null;
+        }
+    }
+
+    @RequestMapping(value="/audioImg",method = RequestMethod.PUT)
+    public AudioImg updateAudioImg(@RequestBody AudioImgDTO dto) {
+        if(StringUtils.isBlank(dto.getCode())){
+            return null;
+        }
+        Resource a = dto.getAudio();
+        Resource i = dto.getImg();
+        setCodeName(a, dto);
+        setCodeName(i, dto);
+
+        Resource img = saveOrUpdateResource(i);
+        Resource audio = saveOrUpdateResource(a);
+
+        if(null != audio && null != img){
+            AudioImg ai = audioImgService.get(dto.getId());
+            ai.setStatus(dto.getStatus());
+            ai.setName(dto.getName());
+            ai.setCode(dto.getCode());
+
+            //audio  info
+            ai.setAudioId(audio.getId());
+            //img  info
+            ai.setImgId(img.getId());
+
+            AudioImg audioImg = audioImgService.update(ai);
+
+            return audioImg;
+        }else{
+            return null;
+        }
+    }
+
+    private void setCodeName(Resource resource, AudioImgDTO dto) {
+        resource.setCode(dto.getCode()+"_"+ resource.getType() + DateUtil.getTimeStamp());
+        resource.setName(dto.getName()+"_"+ resource.getType() + DateUtil.getTimeStamp());
+    }
+
+    /**
+     * 更新/存储资源
+     * @param resource
+     * @return
+     */
+    private Resource saveOrUpdateResource(Resource resource) {
+
+        if (StringUtils.isEmpty(resource.getCode()) || StringUtils.isEmpty(resource.getPath())) {
+            return null;
+        }
+
+        Resource result = null;
+        if(StringUtils.isBlank(resource.getId())){
+            if (resourceService.exists(resource.getCode())) {
+                log.error("resource code Is exist");
+                return null;
+            }
+            resource.setId(null);
+            //图片,音频类型  存本地
+            result = resourceService.save(resource);
+        }else{
+            //图片,音频类型  存本地
+            result = resourceService.updateResource(resource);
+        }
+
+        return result;
+    }
+
+    /* ------------ 有声读物  audioImg    ---------------------start---------------------------------*/
 }

rankin-resource-service/src/main/java/cn/rankin/resourceservice/dto/ResourceRemote.java

@@ -61,7 +61,7 @@ public class ResourceRemote implements Serializable {
         List<Resource> resourceList = new ArrayList<>();
         videos.forEach(v -> {
             Resource resource = new Resource();
-            resource.setId(v.getRid());
+            resource.setId(v.getId());
             resource.setCode(no);
             resource.setName(title);
             resource.setType(type);

rankin-resource-service/src/main/java/cn/rankin/resourceservice/repository/AudioImgRepository.java

@@ -0,0 +1,20 @@
+package cn.rankin.resourceservice.repository;
+
+import cn.rankin.common.utils.jpa.BasicJpaRepository;
+import cn.rankin.data.api.resource.entity.AudioImg;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AudioImgRepository extends BasicJpaRepository<AudioImg, String> {
+
+    Long countByCode(String code);
+
+    /**
+     * find resource by code
+      * @param code
+     * @return
+     */
+    List<AudioImg> findByCode(String code);
+}

rankin-resource-service/src/main/java/cn/rankin/resourceservice/service/AudioImgService.java

@@ -0,0 +1,77 @@
+package cn.rankin.resourceservice.service;
+
+import cn.rankin.common.utils.api.model.APIResult;
+import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.common.utils.exception.DuplicateValueException;
+import cn.rankin.common.utils.exception.NotFoundException;
+import cn.rankin.common.utils.exception.UnsupportedOperationException;
+import cn.rankin.data.api.resource.entity.AudioImg;
+import cn.rankin.data.api.resource.entity.Resource;
+import cn.rankin.resourceservice.dto.ResourceDetail;
+import cn.rankin.resourceservice.repository.AudioImgRepository;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+
+@Slf4j
+@Service
+public class AudioImgService {
+
+    @Autowired
+    private AudioImgRepository audioImgRepository;
+
+    public boolean exists(String code) {
+        Long count = audioImgRepository.countByCode(code);
+        return count > 0L;
+    }
+
+    public AudioImg get(String id) {
+        return audioImgRepository.find(id);
+    }
+
+    public AudioImg save(AudioImg audioImg) {
+        return audioImgRepository.save(audioImg);
+    }
+
+    public Page<AudioImg> search(AudioImg ai, Integer pageNo, Integer pageSize) {
+        Long count = audioImgRepository.count(ai);
+        Page<AudioImg> page = new Page(count, pageNo, pageSize);
+
+        if (count == 0) {
+            return page;
+        }
+
+        List<AudioImg> audioImgList = audioImgRepository.find(ai, page.getStart(), pageSize, new Sort(Sort.Direction.DESC, "gmtModified"));
+        page.setList(audioImgList);
+
+        return page;
+    }
+
+    /**
+     *
+      * @param audioImg
+     * @throws DuplicateValueException
+     * @throws NotFoundException
+     */
+    public AudioImg update(AudioImg audioImg) throws DuplicateValueException, NotFoundException, UnsupportedOperationException {
+        if (null == audioImg){
+            log.error("audioImg is null");
+            return null;
+        }
+
+        AudioImg result = audioImgRepository.update(audioImg);
+        return result;
+    }
+
+    public List<AudioImg>  findMixByIds(List<String> ids) {
+
+        // 取本地
+        List<AudioImg> audioImgs = audioImgRepository.findByIds(ids);
+        return audioImgs;
+    }
+}
+

rankin-resource-service/src/main/java/cn/rankin/resourceservice/service/ResourceService.java

@@ -9,11 +9,13 @@ import cn.rankin.common.utils.enums.BaseOrderEnum;
 import cn.rankin.common.utils.exception.DuplicateValueException;
 import cn.rankin.common.utils.exception.NotFoundException;
 import cn.rankin.common.utils.exception.UnsupportedOperationException;
+import cn.rankin.data.api.resource.entity.AudioImg;
 import cn.rankin.data.api.resource.entity.Resource;
 import cn.rankin.resourceservice.dto.ResourceDetail;
 import cn.rankin.resourceservice.dto.ResourceRemote;
 import cn.rankin.resourceservice.dto.ResourceVideo;
 import cn.rankin.resourceservice.proxy.RemoteResourceProxy;
+import cn.rankin.resourceservice.repository.AudioImgRepository;
 import cn.rankin.resourceservice.repository.ResourceRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +32,9 @@ import java.util.*;
 public class ResourceService {
 
     @Autowired
+    private AudioImgRepository audioImgRepository;
+
+    @Autowired
     private ResourceRepository resourceRepository;
 
     @Autowired
@@ -38,6 +43,9 @@ public class ResourceService {
     @Value("${resource.img.domain}")
     private String imgDomain;
 
+    @Value("${resource.audio.domain}")
+    private String audioDomain;
+
     @Value("${resource.video.domain}")
     private String videoDomain;
 
@@ -46,6 +54,10 @@ public class ResourceService {
         return count > 0L;
     }
 
+    public Resource get(String id) {
+        return resourceRepository.find(id);
+    }
+
     public Resource save(Resource resource) {
         return resourceRepository.save(resource);
     }
@@ -78,6 +90,19 @@ public class ResourceService {
             resourceMap.put(resource.getId(), resource);
         });
 
+        // 本地基础资源取够了不取了
+        if (nativeResourceList.size() == ids.size() && nativeResourceList.size() > 0) {
+            return APIResult.ok(resourceMap);
+        }
+
+        // 取本地,有声读物资源
+        List<AudioImg> audioImgList = audioImgRepository.findByIds(ids);
+        audioImgList.forEach(ai -> {
+            Resource resource = audioImgToResource(ai);
+            resourceMap.put(resource.getId(), resource);
+        });
+
+
         // 本地取够了不取了
         if (nativeResourceList.size() == ids.size() && nativeResourceList.size() > 0) {
             return APIResult.ok(resourceMap);
@@ -159,6 +184,8 @@ public class ResourceService {
         String path = resource.getPath();
         if (ResourceType.VIDEO == resource.getType()) {
             resource.setUrl(concatUrl(videoDomain, path));
+        }else if (ResourceType.AUDIO == resource.getType()) {
+            resource.setUrl(concatUrl(audioDomain, path));
         }else if (ResourceType.IMG == resource.getType()) {
             resource.setUrl(concatUrl(imgDomain, path).replace(" ", ""));
         }
@@ -183,14 +210,14 @@ public class ResourceService {
      * @throws DuplicateValueException
      * @throws NotFoundException
      */
-    public void update(Resource resource) throws DuplicateValueException, NotFoundException, UnsupportedOperationException {
+    public Resource update(Resource resource) throws DuplicateValueException, NotFoundException, UnsupportedOperationException {
         if (null == resource){
             log.error("Resource is null");
-            return;
+            return null;
         }
 
-        if (ResourceType.IMG == resource.getType()){
-            updateImg(resource);
+        if (ResourceType.IMG == resource.getType() || ResourceType.AUDIO == resource.getType() ){
+            return updateResource(resource);
         }
         else{
             log.error("Not-Supported-Resource-Type, id={}, type={}", resource.getId(), resource.getType());
@@ -237,38 +264,50 @@ public class ResourceService {
     }
 
     /**
-     * saveRemoteResource
-     * type 0 video , 1 audio
+     * update Img,audio
      * @param resource
-     * @return
+     * @throws DuplicateValueException
+     * @throws NotFoundException
      */
-    public APIResult<Resource> saveRemoteResource(Resource resource) {
+    public Resource updateResource(Resource resource) throws DuplicateValueException, NotFoundException {
 
-/*        List<Map<String, Object>> videos = new ArrayList<>();
-        Map<String, Object> video = new HashMap<>();
-        video.put("bucket","efunbox");
-        video.put("path",resource.getPath());
-        video.put("format",resource.getFormat());
-        video.put("quality",resource.getQuality());
-        video.put("size",resource.getSize());
+        if (ResourceType.IMG != resource.getType() && ResourceType.AUDIO!= resource.getType()){
+            log.error("Not-Img/audio -Resource");
+            return null;
+        }
 
-        videos.add(video);
+        //find target resource
+        Resource targetResouce = resourceRepository.find(resource.getId());
 
+        if(null == targetResouce){
+            log.error("Cannot Find Resource, id={}", resource.getId());
+            throw new NotFoundException("Resource-Not-Found");
+        }
 
-        APIResult<ResourceDetail> apiResult = resourceProxy.saveResources(new HashMap<String, Object>(){
-            {
-                this.put("no", resource.getCode());
-                this.put("title", resource.getName());
-                this.put("type", resource.getType());
-                this.put("videos", videos);
+        //only support code,title,path
+        //first, make sure code is not duplicated
+        List<Resource> foundedResource = resourceRepository.findByCode(resource.getCode());
+        foundedResource.forEach( (each) -> {
+            if ( !resource.getId().equals(each.getId()) ){
+                log.error("Code-Already-Exist, code={}", resource.getCode());
+                throw new DuplicateValueException("Code-Already-Exist");
             }
         });
 
+        //set and save
+        targetResouce.setCode(resource.getCode());
+        targetResouce.setName(resource.getName());
+        targetResouce.setPath(resource.getPath());
+        return resourceRepository.save(targetResouce);
+    }
 
-
-
-
-        */
+    /**
+     * saveRemoteResource
+     * type 0 video , 1 audio
+     * @param resource
+     * @return
+     */
+    public APIResult<Resource> saveRemoteResource(Resource resource) {
 
         Set<ResourceVideo> videos = new HashSet<>();
         ResourceVideo video = new ResourceVideo();
@@ -287,8 +326,6 @@ public class ResourceService {
         resourceRemote.setVideos(videos);
 
 
-
-
         APIResult<ResourceDetail> apiResult = resourceProxy.saveResources(resourceRemote);
         if (!apiResult.getSuccess()) {
             return errorResourceAPIResult(apiResult);
@@ -344,5 +381,35 @@ public class ResourceService {
         return errResult;
     }
 
+    /**
+     * 有声读物 转  资源
+     * @param ai
+     * @return
+     */
+    public Resource audioImgToResource(AudioImg ai) {
+        String audioId = ai.getAudioId();
+        Resource audio = resourceRepository.find(audioId);
+        initResourceUrl(audio);
+        String imgId = ai.getImgId();
+        Resource img = resourceRepository.find(imgId);
+        initResourceUrl(img);
+
+        Resource resource = new Resource();
+        //有声读物info
+        resource.setType(ai.getType());
+        resource.setId(ai.getId());
+        resource.setCode(ai.getCode());
+        resource.setName(ai.getName());
+        resource.setStatus(ai.getStatus());
+        resource.setGmtCreated(ai.getGmtCreated());
+        resource.setGmtModified(ai.getGmtModified());
+
+        //图片info
+        resource.setImg(img);
+        //音频info
+        resource.setAudio(audio);
+        return resource;
+    }
+
 }