--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/imagelibrary/ImageLibraryController.java

@@ -29,12 +29,9 @@ import com.zrqx.core.form.resource.bg.imagelibrary.BatchUpdateImageLibraryForm;
 import com.zrqx.core.form.resource.bg.imagelibrary.QueryImageLibraryForm;
 import com.zrqx.core.form.resource.bg.imagelibrary.SaveImageLibraryForm;
 import com.zrqx.core.form.resource.bg.imagelibrary.SaveUpdateImageLibraryForm;
-import com.zrqx.core.form.resource.bg.recommend.UpdateRecommendResourceForm;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibrary;
 import com.zrqx.core.model.resource.imagelibrary.ImageLibraryDiyType;
-import com.zrqx.core.model.resource.imagelibrary.ImageLibraryLabelContentDiyType;
 import com.zrqx.core.model.resource.imagelibrary.ImageResource;
-import com.zrqx.core.model.resource.marketing.PromotionContent;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -44,11 +41,8 @@ import com.zrqx.core.vo.resource.imagelibrary.ImageLibraryOneVO;
 import com.zrqx.resource.bg.service.ResourceRelationService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryDiyTypeRelationService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryDiyTypeService;
-import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryLabelContentDiyTypeService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageLibraryService;
 import com.zrqx.resource.bg.service.imagelibrary.ImageResourceService;
-import com.zrqx.resource.bg.service.marketing.PromotionContentService;
-import com.zrqx.resource.bg.service.recommend.RecommendResourceService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -71,16 +65,7 @@ public class ImageLibraryController {
 	@Autowired
 	private ResourceRelationService resourceRelationService;
 	@Autowired
-	private ImageLibraryLabelContentDiyTypeService lcdtservice;
-	@Autowired
 	private ImageLibraryDiyTypeService imageLibraryDiyTypeService;
-	/** 推荐位内容*/
-	@Autowired
-	private RecommendResourceService recommendResourceService;
-	
-	/** 促销内容*/
-	@Autowired
-	private PromotionContentService promotionContentService;
 	
 	
 	
@@ -109,19 +94,7 @@ public class ImageLibraryController {
 			throw new BusinessValidateException("操作失败");
 		}
 		ImageLibrary entity = service.selectByPrimaryKey(form.getId());
-		//促销活动内容修改
-		PromotionContent con = new PromotionContent();
-		con.setResourceId(form.getId());
-		con.setResourceType(entity.getResourceType());
-		con.setName(form.getName());
-		promotionContentService.updateContent(con);
-		//推荐位内容修改
-		UpdateRecommendResourceForm res = new UpdateRecommendResourceForm();
-		res.setResId(form.getId());
-		res.setResType(entity.getResourceType());
-		res.setResImg(form.getImage());
-		res.setResName(form.getName());
-		recommendResourceService.updateResourceContent(res);
+	
 		return CallBack.success();
 	}
 	@ApiOperation(value = "批量修改价格" , notes ="批量修改价格")
@@ -248,16 +221,7 @@ public class ImageLibraryController {
 		List<ImageLibraryDiyType> list = idrService.selectByExample(example);
 		//组装自定义分类
 		vo.setDiyType(list);
-		//组装标签分类
-		example = lcdtservice.createExample();
-		example.createCriteria().andEqualTo("imageId", oid);
-		List<ImageLibraryLabelContentDiyType> ilcdList = lcdtservice.selectByExample(example);
-		vo.setLabel(ilcdList);
-		List<Integer> labelContentDiyTypeIds = new ArrayList<Integer>();
-		ilcdList.forEach(f ->{
-			labelContentDiyTypeIds.add(f.getLabelContentDiyTypeId());
-		});
-		vo.setLabelContentDiyTypeIds(labelContentDiyTypeIds);
+		
 		return CallBack.success(vo);
 	}
 	@ApiOperation(value = "分页查询" , notes ="查询列表")