--no commit message

com.zrqx.bg.sysuser/.settings/org.eclipse.core.resources.prefs

+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

com.zrqx.bg.sysuser/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

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

+package com.zrqx.bg.sysuser.controller.recommend;
+
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+
+import org.apache.commons.lang.StringUtils;
+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.bg.sysuser.service.recommend.RecommendGoodsService;
+import com.zrqx.bg.sysuser.service.recommend.RecommendService;
+import com.zrqx.core.constant.sysuser.SysUserRequestPath;
+import com.zrqx.core.exception.BusinessValidateException;
+import com.zrqx.core.form.BatchUpdateSortForm;
+import com.zrqx.core.form.sysuser.bg.recommend.RecommendGoodsForm;
+import com.zrqx.core.model.sysuser.recommend.Recommend;
+import com.zrqx.core.model.sysuser.recommend.RecommendGoods;
+import com.zrqx.core.util.datatype.ArrayUtils;
+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.sysuser.bg.recommend.RecommendGoodsPageVo;
+
+/**
+ * 推荐位controller
+ * @author chyj
+ * @date 2019年4月9日下午2:09:58
+ */
+@RestController
+@RequestMapping(SysUserRequestPath.BG+SysUserRequestPath.RECOMMEND)
+@Api(description="网站管理-推荐位")
+public class RecommendController {
+
+	@Autowired
+	private RecommendService recommendService;
+	
+	/**推荐位和图书关系-service**/
+	@Autowired
+	private RecommendGoodsService recommendGoodsService;
+	
+	@ApiOperation(value="添加" ,notes = "添加一个")
+	@PostMapping(value = SysUserRequestPath.SAVE)
+	public CallBack<Boolean> save(@RequestBody Recommend entity){
+		return CallBack.success(recommendService.insert(entity));
+	}
+	
+	@ApiOperation(value="删除",notes="删除")
+	@PostMapping(SysUserRequestPath.DELETE_OID)
+	public CallBack<Boolean> delete(@PathVariable Integer oid){
+		return CallBack.success(recommendService.deleteByPrimaryKey(oid));
+	}
+	
+	@ApiOperation(value="查询列表",notes="查询列表")
+	@GetMapping(SysUserRequestPath.PAGE)
+	public CallBack<PageInfo<Recommend>> page(PageParam pageParam){
+		return CallBack.success(recommendService.queryAll(pageParam));
+		
+	}
+	@ApiOperation(value="查询一条",notes="查询一条")
+	@GetMapping(SysUserRequestPath.GET_OID)
+	public CallBack<Recommend> getByOid(@PathVariable Integer oid){
+		return CallBack.success(recommendService.selectByPrimaryKey(oid));
+	}
+	@ApiOperation(value="更新",notes="根据主键更新，null值会被更新")
+	@PostMapping(SysUserRequestPath.UPDATE)
+	public CallBack<Boolean> update(@RequestBody Recommend entity){
+		return CallBack.success(recommendService.updateByPrimaryKey(entity));
+	}
+	@ApiOperation(value="获取最大排序号",notes="获取最大排序号")
+	@GetMapping(SysUserRequestPath.GET + SysUserRequestPath.MAX_SORT)
+	public CallBack<Integer> getMaxSort(){
+		return CallBack.success(recommendService.getMaxSort());
+	}
+	
+	@ApiOperation(value = "添加推荐位商品")
+	@PostMapping(value = SysUserRequestPath.SAVE_OID)
+	public CallBack<?> saveGoods(@ApiParam(value = "*推荐位id", required = true) @PathVariable Integer oid,
+			@RequestBody List<RecommendGoodsForm> form){		
+		if (ArrayUtils.empty(form)) {
+			return CallBack.success();
+		}
+		if (oid == null) {
+			throw new BusinessValidateException("推荐位id不能为空");
+		}
+		return recommendGoodsService.saveGoods(oid, form) ? CallBack.success() : CallBack.fail();
+	}
+	
+	@ApiOperation(value="修改排序号",notes="修改排序号")
+	@PostMapping(SysUserRequestPath.UPDATE_SORT)
+	public CallBack<Boolean> batchUpdateSort(@RequestBody BatchUpdateSortForm form){
+		if (ArrayUtils.empty(form.getIds())) {
+			return CallBack.success();
+		}
+		return CallBack.success(recommendGoodsService.batchUpdateSort(form));
+	}
+	
+	@ApiOperation(value="id推荐位下的推荐内容分页列表",notes="id推荐位下的推荐内容分页列表")
+	@GetMapping(SysUserRequestPath.OID + SysUserRequestPath.PAGE)
+	public CallBack<PageInfo<RecommendGoodsPageVo>> page(@ApiParam(value = "*推荐位id", required = true) @PathVariable Integer oid,
+			PageParam pageParam){
+		if (StringUtils.isEmpty(pageParam.getOrderBy())) {
+			pageParam.setOrderBy(" sort desc,createTime desc ");
+		}
+		return CallBack.success(recommendGoodsService.page(oid, pageParam));
+	}
+	
+	@ApiOperation(value="批量删除推荐位商品",notes="批量删除推荐位商品")
+	@PostMapping(SysUserRequestPath.BATCH_DELETE)
+	public CallBack<?> batechDeleteGoods(@RequestBody List<Integer> oids){
+		return CallBack.success(recommendGoodsService.batchDelete(oids));
+	}
+}

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/mapper/recommend/RecommendGoodsMapper.java

+package com.zrqx.bg.sysuser.mapper.recommend;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.recommend.RecommendGoods;
+import com.zrqx.core.vo.sysuser.bg.recommend.RecommendGoodsPageVo;
+/**
+ * 推荐位和商品关系-mapper
+ * @author chyj
+ * @date 2019年4月9日下午4:56:43
+ */
+@Mapper
+public interface RecommendGoodsMapper extends BaseMapper<RecommendGoods> {
+
+	/**
+	 * 根据推荐位id查询最大的排序号
+	 * @param oid
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午7:52:36
+	 */
+	@Select("select max(sort) from sys_recommend_goods where recomId = #{oid}")
+	Integer getMaxSort(@Param("oid")Integer oid);
+
+	@Select(" <script>"
+			+ " select id from sys_recommend_goods where 1=1 "
+			+ "<if test='oid != null'>"
+			+ " recomId = #{oid} "
+			+ "</if>"
+			+ "</script> ")
+	List<RecommendGoodsPageVo> list(@Param("oid")Integer oid);
+	
+
+}

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/mapper/recommend/RecommendMapper.java

+package com.zrqx.bg.sysuser.mapper.recommend;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.recommend.Recommend;
+import com.zrqx.core.vo.sysuser.bg.news.NewsFormVo;
+/**
+ * 推荐位
+ * @author chyj
+ * @date 2019年4月9日下午2:33:19
+ */
+@Mapper
+public interface RecommendMapper extends BaseMapper<Recommend>{
+	/**
+	 * 获取最大的序号值
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午2:53:09
+	 */
+	@Select("SELECT MAX(sort) FROM sys_Recommend")
+	Integer getMaxSort();
+}

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/activity/ActivityServiceImpl.java

@@ -78,7 +78,8 @@ public class ActivityServiceImpl extends BaseModelServiceImpl<Activity, Integer>
 	 */
 	@Override
 	public Integer getMaxSort() {
-		return activityMapper.getMaxSort();
+		Integer sort = activityMapper.getMaxSort();
+		return sort == null ? 1 : sort+1;
 	}
 
 	/**

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/form/FormFieldRelationServiceImpl.java

@@ -21,7 +21,7 @@ public class FormFieldRelationServiceImpl extends BaseModelServiceImpl<FormField
 	@Override
 	public Integer getMaxSort(Integer formId) {
 		Integer sort = formFieldRelationMapper.getMaxSort(formId);
-		return sort == null ? 1 : sort ++;
+		return sort == null ? 1 : sort + 1;
 	}
 
 	

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/recommend/RecommendGoodsService.java

+package com.zrqx.bg.sysuser.service.recommend;
+
+import java.util.List;
+
+import com.zrqx.core.form.BatchUpdateSortForm;
+import com.zrqx.core.form.sysuser.bg.recommend.RecommendGoodsForm;
+import com.zrqx.core.model.sysuser.recommend.RecommendGoods;
+import com.zrqx.core.service.BaseService;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.sysuser.bg.recommend.RecommendGoodsPageVo;
+/**
+ * 推荐位和商品关系service
+ * @author chyj
+ * @date 2019年4月9日下午4:49:20
+ */
+public interface RecommendGoodsService extends BaseService<RecommendGoods, Integer> {
+
+	/**
+	 * 添加推荐商品
+	 * @param oid 推荐位id
+	 * @param form 商品拼装对象
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午6:31:24
+	 */
+	boolean saveGoods(Integer oid, List<RecommendGoodsForm> form);
+	
+	
+	/**
+	 * 根据推荐位id查询最大的排序号
+	 * @param oid 推荐位id
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午7:51:58
+	 */
+	Integer getMaxSort(Integer oid);
+
+
+	/**
+	 * 根据id集合修改排序号
+	 * @param form
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午8:01:50
+	 */
+	Boolean batchUpdateSort(BatchUpdateSortForm form);
+
+
+	/**
+	 * 根据推荐位id查询推荐内容分页列表
+	 * @param oid 推荐位id
+	 * @param pageParam
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午8:14:57
+	 */
+	PageInfo<RecommendGoodsPageVo> page(Integer oid, PageParam pageParam);
+
+}

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/recommend/RecommendGoodsServiceImpl.java

+package com.zrqx.bg.sysuser.service.recommend;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.bg.sysuser.mapper.recommend.RecommendGoodsMapper;
+import com.zrqx.core.form.BatchUpdateSortForm;
+import com.zrqx.core.form.GoodsForm;
+import com.zrqx.core.form.sysuser.bg.recommend.RecommendGoodsForm;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.recommend.RecommendGoods;
+import com.zrqx.core.service.BaseModelServiceImpl;
+import com.zrqx.core.util.page.PageInfo;
+import com.zrqx.core.util.page.PageParam;
+import com.zrqx.core.vo.sysuser.bg.recommend.RecommendGoodsPageVo;
+
+@Service
+public class RecommendGoodsServiceImpl extends BaseModelServiceImpl<RecommendGoods, Integer> implements RecommendGoodsService{
+
+	@Autowired
+	private RecommendGoodsMapper recommendGoodsMapper;
+	@Override
+	public BaseMapper<RecommendGoods> getMapper() {
+		return recommendGoodsMapper;
+	}
+	
+	/**
+	 * 获取最大排序号
+	 * @param oid 推荐位id
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月10日 上午8:57:05
+	 */
+	@Override
+	public Integer getMaxSort(Integer oid) {
+		Integer sort = recommendGoodsMapper.getMaxSort(oid);
+		return sort == null ? 1 : sort + 1;
+	}
+
+
+	/**
+	 * 添加推荐商品
+	 * @param oid 推荐位id
+	 * @param form 商品拼装对象
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午6:31:24
+	 */
+	@Override
+	public boolean saveGoods(Integer oid, List<RecommendGoodsForm> form) {
+		Integer maxSort = this.getMaxSort(oid);
+		for (RecommendGoodsForm f : form) {
+			RecommendGoods g = new RecommendGoods();
+			g.setGoodsId(f.getGoodsId());
+			g.setGoodsType(f.getGoodsType());
+			g.setRecomId(oid);
+			g.setSort(maxSort);
+			super.insert(g);
+			maxSort ++ ;
+		}
+		return true;
+	}
+
+	/**
+	 * 根据id修改排序号
+	 * @param form 封装修改排序号的参数对象
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月10日 上午8:54:54
+	 */
+	@Override
+	public Boolean batchUpdateSort(BatchUpdateSortForm form) {
+		List<Integer> list = form.getIds();
+		for (Integer id : list) {
+			RecommendGoods g = this.notNull(id);
+			g.setSort(form.getSort());
+			super.updateByPrimaryKey(g);
+		}
+		return true;
+	}
+
+	/**
+	 * 根据推荐位id查询推荐内容分页列表
+	 * @param oid 推荐位id
+	 * @param pageParam
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月10日 上午9:09:30
+	 */
+	@Override
+	public PageInfo<RecommendGoodsPageVo> page(Integer oid, PageParam pageParam) {
+		startPage(pageParam);
+		List<RecommendGoodsPageVo> result = recommendGoodsMapper.list(oid);
+		for (RecommendGoodsPageVo vo : result) {
+			GoodsForm form = new GoodsForm();
+			form.setGoodsId(vo.getGoodsId());
+			form.setGoodsType(vo.getGoodsType());
+			// TODO 远程调用 资源服务,获取商品信息
+		}
+		return new PageInfo<RecommendGoodsPageVo>(result);
+	}
+}

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/recommend/RecommendService.java

+package com.zrqx.bg.sysuser.service.recommend;
+
+import com.zrqx.core.model.sysuser.recommend.Recommend;
+import com.zrqx.core.service.BaseService;
+
+/**
+ * 推荐位
+ * @author chyj
+ * @date 2019年4月9日下午2:10:25
+ */
+public interface RecommendService extends BaseService<Recommend, Integer>{
+
+	/**
+	 * 查询序号最大的值
+	 * @return
+	 * @author chyj
+	 * @date: 2019年4月9日 下午2:55:21
+	 */
+	Integer getMaxSort();
+
+	
+}

com.zrqx.bg.sysuser/src/main/java/com/zrqx/bg/sysuser/service/recommend/RecommendServiceImpl.java

+package com.zrqx.bg.sysuser.service.recommend;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.zrqx.bg.sysuser.mapper.recommend.RecommendMapper;
+import com.zrqx.core.mapper.BaseMapper;
+import com.zrqx.core.model.sysuser.recommend.Recommend;
+import com.zrqx.core.service.BaseModelServiceImpl;
+
+/**
+ * 推荐位
+ * @author chyj
+ * @date 2019年4月9日下午2:10:13
+ */
+@Service
+public class RecommendServiceImpl extends BaseModelServiceImpl<Recommend, Integer> implements RecommendService{
+	
+	@Autowired
+	private RecommendMapper recommendMapper;
+	@Override
+	public BaseMapper<Recommend> getMapper() {
+		return recommendMapper;
+	}
+	@Override
+	public Integer getMaxSort() {
+		Integer sort = recommendMapper.getMaxSort();
+		return sort == null ? 1 : sort+1;
+	}
+
+}