--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/recommend/RecommendController.java

+package com.zrqx.resource.bg.controller.recommend;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.zrqx.core.enums.resource.recommend.RecommendCodeEnum;
+import com.zrqx.core.exception.BaseException;
+import com.zrqx.core.form.resource.bg.recommend.DeleteRecommendForm;
+import com.zrqx.core.form.resource.bg.recommend.IsExistForm;
+import com.zrqx.core.form.resource.bg.recommend.RecommendResourceForm;
+import com.zrqx.core.form.resource.bg.recommend.SaveRecommendForm;
+import com.zrqx.core.form.resource.bg.recommend.SaveRecommendResourceForm;
+import com.zrqx.core.form.resource.bg.recommend.UpdateRecommendForm;
+import com.zrqx.core.form.resource.bg.recommend.UpdateRecommendResourceForm;
+import com.zrqx.core.form.resource.bg.recommend.UpdateRecommendResourceSort;
+import com.zrqx.core.model.recommend.Recommend;
+import com.zrqx.core.model.recommend.RecommendResource;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.resource.fg.recommend.RecommendResourcePageVo;
+import com.zrqx.resource.bg.service.recommend.RecommendResourceService;
+import com.zrqx.resource.bg.service.recommend.RecommendService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+/**
+ * 推荐位 Controller
+ */
+@RestController
+@RequestMapping("/bg/recommend")
+@Api(description = "网站管理-推荐位")
+public class RecommendController {
+
+	@Autowired
+	private RecommendService service;
+	/** 推荐位与资源关系-service */
+	@Autowired
+	private RecommendResourceService recommendResourceService;
+	
+	@ApiOperation(value = "验重" , notes ="判断名称和code是否存在")
+	@GetMapping(value = "/isExist")
+	public CallBack<Boolean> isExist(IsExistForm form){
+		return CallBack.success(service.isExist(form));
+	}
+	
+	@ApiOperation(value = "新增" , notes ="新增一个")
+	@PostMapping(value = "/save")
+	public CallBack<Boolean> save(@RequestBody SaveRecommendForm form){
+		return CallBack.success(service.save(form));
+	}
+	
+	@ApiOperation(value = "更新" , notes ="根据ID更新,空值默认不更新")
+	@PostMapping(value = "/update")
+	public CallBack<Boolean> update(@RequestBody UpdateRecommendForm form){
+		if(form.getId() == null){
+			throw new BaseException(1,"推进位id不能为空");
+		}
+		Recommend recommend = new Recommend();
+		BeanUtils.copyProperties(form, recommend);
+		if(!service.updateByPrimaryKeySelective(recommend)){
+			throw new BaseException("操作失败");
+		}
+		return CallBack.success();
+	}
+	
+	@ApiOperation(value = "删除" , notes ="删除")
+	@PostMapping(value = "/delete")
+	public CallBack<Boolean> delete(@RequestBody DeleteRecommendForm form){
+		if(form.getId() == null){
+			throw new BaseException(1,"推进位id不能为空");
+		}
+		RecommendResource record = new RecommendResource();
+		record.setRecomId(form.getId());
+		service.deleteByPrimaryKey(form.getId());
+		recommendResourceService.delete(record);
+		return CallBack.success();
+	}
+
+	@ApiOperation(value = "查询列表" , notes ="查询-列表")
+	@GetMapping(value = "/page")
+	public CallBack<PageInfo<Recommend>> page(PageParam pageParam){
+		Example example = service.createExample();
+		Criteria cr = example.createCriteria();
+		return CallBack.success(service.queryExample(pageParam,example));
+	}
+	
+	@ApiOperation(value = "根据ID查询推荐位", notes = "根据ID查询")
+	@GetMapping(value = "/{oid}")
+	public CallBack<Recommend> getById(@PathVariable Integer oid) {
+		return CallBack.success(service.selectByPrimaryKey(oid));
+	}
+	
+	@ApiOperation(value = "根据ID查询推荐位下推荐资源", notes = "根据ID查询")
+	@GetMapping(value = "/res/{oid}")
+	public CallBack<RecommendResource> getRecommendResourceById(@PathVariable Integer oid) {
+		return CallBack.success(recommendResourceService.selectByPrimaryKey(oid));
+	}
+	
+	@ApiOperation(value = "分页查询推荐组下推荐资源" , notes = "分页查询推荐组下推荐资源")
+	@GetMapping(value = "/res/page")
+	public CallBack<PageInfo<RecommendResourcePageVo>> pageResource(RecommendResourceForm query, PageParam pageParam) {
+		return CallBack.success(recommendResourceService.pageResource(query, pageParam));
+	}
+
+	
+	@ApiOperation(value = "添加推荐组下推荐资源" , notes = "添加推荐组下推荐资源")
+	@PostMapping(value = "/res/save")
+	public CallBack<?> saveResource(@RequestBody List<SaveRecommendResourceForm> form){	
+		//民族主页推荐位需要另外判断
+		if(form.isEmpty()){
+			throw new BaseException(1,"资源信息为空");
+		}
+		return recommendResourceService.saveResource(form) ? CallBack.success() : CallBack.fail();
+	}
+
+	@ApiOperation(value = "批量删除推荐组下推荐资源" , notes = "批量删除推荐组下推荐资源")
+	@PostMapping(value = "/res/batch/delete")
+	public CallBack<?> batechDeleteResource(@RequestBody List<Integer> oids){
+		Example example = recommendResourceService.createExample();
+		example.and().andIn("id", oids);
+		recommendResourceService.deleteByExample(example);
+		return CallBack.success();
+	}
+	
+	@ApiOperation(value = "通过资源id批量删除推荐组下推荐资源" , notes = "通过资源id批量删除推荐组下推荐资源")
+	@PostMapping(value = "/res/batch/delete/resourceIds")
+	public CallBack<?> batechDeleteBrResourceId(@RequestBody List<String> oids){
+		Example example = recommendResourceService.createExample();
+		example.and().andIn("resId", oids);
+		recommendResourceService.deleteByExample(example);
+		return CallBack.success();
+	}
+	
+	@ApiOperation(value = "修改推荐组下推荐资源排序" , notes = "修改推荐组下推荐资源排序")
+	@PostMapping(value = "/res/update/sort")
+	public CallBack<?> updateResourceSort(@RequestBody UpdateRecommendResourceSort form){		
+		RecommendResource res = new RecommendResource();
+		res.setId(form.getId());
+		res.setSort(form.getSort());
+		return recommendResourceService.updateByPrimaryKeySelective(res) ? CallBack.success() : CallBack.fail();
+	}
+	
+	@ApiOperation(value = "修改推荐组下推荐资源内容" , notes = "修改推荐组下推荐资源内容")
+	@PostMapping(value = "/res/update")
+	public CallBack<?> updateResourceContent(@RequestBody UpdateRecommendResourceForm form){
+		return recommendResourceService.updateResourceContent(form) ? CallBack.success() : CallBack.fail();
+	}
+	
+	/*@ApiOperation(value = "获取推荐组下推荐资源的所有类别")
+	@GetMapping(value = SysUserRequestPath.GET_TYPE)
+	public CallBack<Map<String,String>> getAllType() {
+		return CallBack.success(RecommendResourceTypeEnum.getAllEnumMap());
+	}*/
+	
+/*	public Integer queryRecommendIdByNationAndRecommendType(Integer nationsType){
+		Integer recomId = service.queryRecommendIdByNationAndRecommendType(nationsType);
+		return recomId;
+	}*/
+	
+	@ApiOperation(value = "推荐位code列表" , notes ="推荐位code列表")
+	@GetMapping(value = "/code/list")
+	public CallBack<Map<String,String>> queryRelationResourceTypeList(){
+		Map<String, String> map = RecommendCodeEnum.getAllEnumMap();
+		return CallBack.success(map);
+	}
+	
+	public Map<String, String> sortList(Map<String, String> map){
+		List<Map.Entry<String,String>> list = new ArrayList<Map.Entry<String,String>>(map.entrySet());
+        Collections.sort(list,new Comparator<Map.Entry<String,String>>() {
+            //升序排序
+            public int compare(Entry<String, String> o1,
+                    Entry<String, String> o2) {
+                return Integer.parseInt(o1.getKey()) - (Integer.parseInt(o2.getKey()));
+            }
+        });
+        /*Map<String, String> result = map.entrySet().stream()
+        .sorted(Map.Entry.comparingByKey())
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+                (oldValue, newValue) -> oldValue, LinkedHashMap::new));*/
+		return map;
+	}
+	
+}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/videolibrary/VideoLibraryController.java

@@ -63,7 +63,7 @@ public class VideoLibraryController {
 
 	@ApiOperation(value = "导入视频", notes = "导入视频")
 	@PostMapping(value = "/import")
-	public CallBack<Boolean> save(@RequestBody List<SaveVideoLibraryForm> form) throws IOException {
+	public CallBack<Boolean> save(@RequestBody SaveVideoLibraryForm form) throws IOException {
 		if (!service.batchInsert(form)) {
 			throw new BaseException("操作失败");
 		}

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibraryDiyTypeSerivceImpl.java

@@ -11,7 +11,7 @@ import com.zrqx.resource.bg.mapper.audiolibrary.AudioLibraryDiyTypeMapper;
  * 音频库和自定义分类
  */
 @Service
-public class AudioLibraryDiyTypeSerivceImpl extends BaseServiceImpl<AudioLibraryDiyType,Integer> implements AudioLibraryDiyTypeService {
+public class AudioLibraryDiyTypeSerivceImpl extends BaseServiceImpl<AudioLibraryDiyType,String> implements AudioLibraryDiyTypeService {
 
 	@Autowired
 	private AudioLibraryDiyTypeMapper mapper;

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibraryDiyTypeService.java

@@ -5,6 +5,6 @@ import com.zrqx.core.service.BaseService;
 /**
  * 音频库和自定义分类
  */
-public interface AudioLibraryDiyTypeService extends BaseService<AudioLibraryDiyType,Integer>{
+public interface AudioLibraryDiyTypeService extends BaseService<AudioLibraryDiyType,String>{
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -122,27 +122,38 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	 * @date: 2018年11月22日 下午2:39:13
 	 */
 	@Override
-	public boolean batchInsert(List<SaveVideoLibraryForm> form) {
-		if(form.isEmpty()) {
-			throw new BaseException("请选择视频文件！");
-		}
-		form.forEach(f -> {
-			VideoLibrary videoLibrary = new VideoLibrary();
-			BeanUtils.copyProperties(f, videoLibrary);
-			videoLibrary.setBrowseNum(0);
-			videoLibrary.setResourceType(AllResourceTypeEnum.VIDEO.getCode());
-			videoLibrary.setPriceOption(PriceOptionEnum.STATUS_0.getCode());
-			videoLibrary.setRealPrice(new BigDecimal(0));
-			videoLibrary.setSalesNum(0);
-			videoLibrary.setStatus(LibraryStatusEnum.STATUS_0.getCode());
-			videoLibrary.setUploadTime(new Date());
-			videoLibrary.setTop(0);
-		
-			if(StringUtils.isNotBlank(f.getVideoName())) {
-				videoLibrary.setName(f.getVideoName().substring(0, f.getVideoName().lastIndexOf(".")));
+	public boolean batchInsert(SaveVideoLibraryForm form) {
+		if(form.getNames().size() != form.getVideo().size()){
+			throw new BaseException("视频数量错误");
+		}
+		//循环创建视频对象
+		for (int i = 0; i < form.getNames().size(); i++) {
+			VideoLibrary obj = new VideoLibrary();
+			BeanUtils.copyProperties(form, obj);
+			obj.setName(form.getNames().get(i));
+			obj.setVideo(form.getVideo().get(i));
+			obj.setVideoName(form.getVideoName().get(i));
+			obj.setSize(form.getSize().get(i));
+			obj.setTimeLength(form.getTimeLength().get(i));
+			obj.setUploadTime(new Date());
+			obj.setStatus(LibraryStatusEnum.STATUS_0.getCode());
+			obj.setResourceType(AllResourceTypeEnum.VIDEO.getCode());
+			obj.setBrowseNum(0);
+			obj.setClickNum(0);
+			obj.setPriceOption(0);
+			obj.setRealPrice(new BigDecimal(0.00));
+			obj.setSalesNum(0);
+			obj.setVideoName(form.getNames().get(i));
+			mapper.insert(obj);
+			if(form.getDiyType() != null){
+				VideoLibraryDiyType videoLibraryDiyType = new VideoLibraryDiyType();
+				videoLibraryDiyType.setCode(form.getDiyType().getCode()); 
+				videoLibraryDiyType.setDtId(form.getDiyType().getDtId());
+				videoLibraryDiyType.setVlId(obj.getId());
+				vdrMapper.insert(videoLibraryDiyType);	
 			}
-			mapper.insert(videoLibrary);
-		});
+		}
+
 		return true;
 	}
 	/**

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibraryService.java

@@ -34,7 +34,7 @@ public interface VideoLibraryService extends BaseService<VideoLibrary,String>{
 	 * @author yzg
 	 * @date: 2018年11月22日 下午2:39:13
 	 */
-	boolean batchInsert(List<SaveVideoLibraryForm> form);
+	boolean batchInsert(SaveVideoLibraryForm form);
 	/**
 	 * 批量删除
 	 * @param ids