--no commit message

com.zrqx.fg.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.fg.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.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/activity/ActivityApplyController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.AuditStatusEnum;
 import com.zrqx.core.form.sysuser.fg.activity.QueryActivityApplyForm;
@@ -25,7 +26,6 @@ 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.fg.activity.ActivityApplyVo;
-import com.zrqx.fg.sysuser.manage.FgRedisManageUser;
 import com.zrqx.fg.sysuser.service.activity.ActivityApplyService;
 import com.zrqx.fg.sysuser.service.activity.ActivityService;
 
@@ -43,7 +43,7 @@ public class ActivityApplyController {
 	private ActivityApplyService activityApplyService;
 	
 	@Autowired
-	private FgRedisManageUser fgRedisManageUser;
+	private Redis fgRedisManageUser;
 	
 	@Autowired
 	private ActivityService  activityService;

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/browseRecords/FgBrowseRecordsController.java

@@ -20,6 +20,7 @@ import tk.mybatis.mapper.entity.Example.Criteria;
 
 import com.zrqx.core.constant.resource.ResourceRequestPath;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
+import com.zrqx.core.form.sysuser.fg.browseRecords.QueryBrowseRecordsForm;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageMap;
 import com.zrqx.core.util.page.PageParam;
@@ -43,13 +44,13 @@ public class FgBrowseRecordsController {
 	
 	@ApiOperation("删除当天")
 	@PostMapping(SysUserRequestPath.BATCH_DELETE_TODAY)
-	public CallBack<Boolean> batchDeleteToDay(@RequestBody String date){
-		return CallBack.success(browseRecordsService.deleteByParam(date));
+	public CallBack<Boolean> batchDeleteToDay(@RequestBody QueryBrowseRecordsForm form ){
+		return CallBack.success(browseRecordsService.deleteByParam(form));
 	}
 	
 	@ApiOperation("浏览记录分页列表")
 	@GetMapping(SysUserRequestPath.OID + SysUserRequestPath.PAGE)
-	public CallBack<PageMap<String,List<CollectionsVo>>> page(@ApiParam(value = "*会员id", required = true) @PathVariable String oid,PageParam pageParam){
+	public CallBack<PageMap<String,List<CollectionsVo>>> page(@ApiParam(value = "*会员id", required = true) @PathVariable Integer oid,PageParam pageParam){
 		if (StringUtils.isEmpty(pageParam.getOrderBy())) {
 			pageParam.setOrderBy(" createTime desc ");
 		}

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/collections/FgCollectionsController.java

@@ -15,6 +15,7 @@ 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.commons.redis.Redis;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.form.sysuser.fg.collections.CollectionsForm;
 import com.zrqx.core.form.sysuser.fg.collections.CollectionsUpdateForm;
@@ -23,7 +24,6 @@ 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.fg.collections.CollectionsVo;
-import com.zrqx.fg.sysuser.manage.FgRedisManageUser;
 import com.zrqx.fg.sysuser.service.collections.FgCollectionsService;
 /**
  * 前台-收藏
@@ -39,7 +39,7 @@ public class FgCollectionsController {
 	private FgCollectionsService fgCollectionsService;
 	
 	@Autowired
-	private FgRedisManageUser fgRedisManage;
+	private Redis fgRedisManage;
 	
 	@ApiOperation(value = "批量添加收藏", notes = "批量添加")
 	@PostMapping(SysUserRequestPath.BATCH_SAVE)
@@ -72,7 +72,7 @@ public class FgCollectionsController {
 	@ApiOperation(value="判断是否收藏  true:被收藏  false:未收藏")
 	@GetMapping(SysUserRequestPath.CHECK_IS_COLLECT)
 	public CallBack<Boolean> check(QueryFgCollectionsForm form){
-		String token = FgRedisManageUser.getToken();
+		String token = Redis.getFgToken();
 		System.out.println("*****************************");
 		System.out.println(token);
 		return CallBack.success(fgCollectionsService.check(form));

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/controller/news/FgfgNewsFeedBackController.java

@@ -12,6 +12,7 @@ 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.commons.redis.Redis;
 import com.zrqx.core.constant.sysuser.SysUserRequestPath;
 import com.zrqx.core.enums.AuditStatusEnum;
 import com.zrqx.core.form.sysuser.fg.news.QueryNewsFeedBackForm;
@@ -22,7 +23,6 @@ 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.fg.news.NewsFeedBackVo;
-import com.zrqx.fg.sysuser.manage.FgRedisManageUser;
 import com.zrqx.fg.sysuser.service.news.FgNewsFeedBackService;
 
 /**
@@ -39,7 +39,7 @@ public class FgfgNewsFeedBackController {
 	private FgNewsFeedBackService fgNewsFeedBackService;
 	
 	@Autowired
-	private FgRedisManageUser fgRedisManageUser;
+	private Redis fgRedisManageUser;
 	
 	@ApiOperation("意见反馈分页列表")
 	@GetMapping(SysUserRequestPath.PAGE)

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/manage/FgRedisManageUser.java

-package com.zrqx.fg.sysuser.manage;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import com.zrqx.core.enums.ResponseCodeEnum;
-import com.zrqx.core.exception.BaseException;
-import com.zrqx.core.model.member.member.Member;
-import com.zrqx.core.util.JsonUtil.JsonUtil;
-
-/**
- * Redis消息管理 ,调用时不能用多线程调用
- * @author lpf
- * @date 2018年6月5日上午10:03:01
- */
-@Component
-public class FgRedisManageUser {
-	
-	@Autowired
-	StringRedisTemplate stringRedisTemplate;
-	
-	/**
-	 * 获取当前登录名称
-	 * 
-	 * @return
-	 */
-	public String getOpName() {
-		return getMember().getNum();
-	}
-
-	/**
-	 * 获取登录id
-	 * 
-	 * @return
-	 */
-	public Integer getId() {
-		return getMember().getId();
-	}
-	/**
-	 * 获取登录用户信息
-	 * 
-	 * @return
-	 */
-	public Member getMember() {
-		try {
-			return JsonUtil.json2Bean(get(), Member.class);
-		} catch (IOException e) {
-			throw new BaseException("获取用户信息错误!");
-		}
-	}
-	/**
-	 * 获取登录用户信息
-	 * 
-	 * @return
-	 */
-	public Member getMember(String token) {
-		try {
-			return JsonUtil.json2Bean(token, Member.class);
-		} catch (IOException e) {
-			throw new BaseException("获取用户信息错误!");
-		}
-	}
-	/**
-	 * 用户登录信息添加到redis
-	 * @param token Key
-	 * @param obj Value
-	 * @throws IOException
-	 */
-	public void add(String token,Object obj) throws IOException{
-		stringRedisTemplate.opsForValue().set(token,JsonUtil.bean2Json(obj));
-	}
-	/**
-	 * 更新当前登录信息redis
-	 * @param obj Value
-	 * @throws IOException
-	 */
-	public void add(Object obj) throws IOException{
-		add(getToken(),obj);
-	}
-	/**
-	 * 根据key删除redis中的数据
-	 * @param key
-	 * @throws IOException
-	 */
-	public void delete(String key) throws IOException{
-		stringRedisTemplate.delete(key);
-	}
-	/**
-	 * 删除当前登录用户redis中的数据
-	 * @param key
-	 * @throws IOException
-	 */
-	public void delete() throws IOException{
-		stringRedisTemplate.delete(getToken());
-	}
-	
-	public static String getToken(){
-		HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); 
-		Enumeration<String> headerNames = request.getHeaderNames();
-		String token = null;
-		while (headerNames.hasMoreElements()) {
-			 String key = (String) headerNames.nextElement();
-			 //TODO--前台获取token
-			 if(key.toLowerCase().equals("y-token")){
-				 token=request.getHeader(key);
-			 }
-		}
-		if (token == null) {
-			throw new BaseException(ResponseCodeEnum.NO_LOGIN);
-		}
-		return token;
-	}
-	/**
-	 * 根据key查询redis中的数据
-	 * 
-	 * @param token
-	 * @return
-	 */
-	public String get(String token) {
-		return stringRedisTemplate.opsForValue().get(token);
-	}
-
-	/**
-	 * 根据Y-Token查询redis中的数据
-	 * 
-	 * @return
-	 */
-	public String get() {
-		return stringRedisTemplate.opsForValue().get(getToken());
-	}
-	public  Member getUserInfoByRedis(){
-		try {
-			String userInfo = get();
-			return JsonUtil.json2Bean(userInfo, Member.class);
-		} catch (Exception e) {
-			throw new BaseException("获取用户信息错误!"+e.getMessage());
-		}
-	}
-	
-	public  Member getMemberByRedis(String token){
-		try {
-			String userInfo = stringRedisTemplate.opsForValue().get(token);
-			return JsonUtil.json2Bean(userInfo, Member.class);
-		} catch (Exception e) {
-			throw new BaseException(e.getMessage());
-		}
-	}
-}

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/mapper/browseRecord/FgBrowseRecordsMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import com.zrqx.core.form.sysuser.fg.browseRecords.QueryBrowseRecordsForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.sysuser.records.BrowseRecords;
 import com.zrqx.core.util.response.CallBack;
@@ -29,7 +30,7 @@ public interface FgBrowseRecordsMapper extends BaseMapper<BrowseRecords>{
 			+ " and userId = #{oid} "
 			+ "</if>"
 			+ "</script> ")
-	List<CollectionsVo> list(@Param("oid")String oid);
+	List<CollectionsVo> list(@Param("oid")Integer oid);
 
 	/**
 	 * 删除当天的浏览记录
@@ -40,10 +41,13 @@ public interface FgBrowseRecordsMapper extends BaseMapper<BrowseRecords>{
 	 */
 	@Select(" <script> "
 			+ " DELETE FROM sys_browse_records where 1=1 "
-			+ " <if test = '" + NOTBLANK + "(date)'> "
-			+ " and DATE_FORMAT(createTime,'%Y-%m-%d') = #{date} "
+			+ " <if test='oid != null'> "
+			+ " and userId = #{form.oid} "
+			+ " </if> "
+			+ " <if test = '" + NOTBLANK + "(from.date)'> "
+			+ " and DATE_FORMAT(createTime,'%Y-%m-%d') = #{form.date} "
 			+ " </if> "
 			+ " </script> ")
-	Boolean deleteByParam(@Param("date")String date);
+	Boolean deleteByParam(@Param("form")QueryBrowseRecordsForm from);
 
 }

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/service/browseRecord/FgBrowseRecordsService.java

@@ -2,6 +2,7 @@ package com.zrqx.fg.sysuser.service.browseRecord;
 
 import java.util.List;
 
+import com.zrqx.core.form.sysuser.fg.browseRecords.QueryBrowseRecordsForm;
 import com.zrqx.core.model.sysuser.records.BrowseRecords;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageMap;
@@ -23,7 +24,7 @@ public interface FgBrowseRecordsService extends BaseService<BrowseRecords, Integ
 	 * @author chyj
 	 * @date: 2019年4月18日 上午9:14:00
 	 */
-	PageMap<String,List<CollectionsVo>> page(String oid, PageParam pageParam);
+	PageMap<String,List<CollectionsVo>> page(Integer oid, PageParam pageParam);
 	/**
 	 * 删除当天的浏览记录
 	 * @param date
@@ -31,6 +32,6 @@ public interface FgBrowseRecordsService extends BaseService<BrowseRecords, Integ
 	 * @author chyj
 	 * @date: 2019年4月19日 上午10:19:29
 	 */
-	Boolean deleteByParam(String date);
+	Boolean deleteByParam(QueryBrowseRecordsForm form);
 
 }

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/service/browseRecord/FgBrowseRecordsServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.core.form.GoodsForm;
+import com.zrqx.core.form.sysuser.fg.browseRecords.QueryBrowseRecordsForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.sysuser.records.BrowseRecords;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -44,7 +45,7 @@ public class FgBrowseRecordsServiceImpl extends BaseServiceImpl<BrowseRecords, I
 	 * @date: 2019年4月18日 上午9:14:55
 	 */
 	@Override
-	public PageMap<String,List<CollectionsVo>> page(String oid, PageParam pageParam) {
+	public PageMap<String,List<CollectionsVo>> page(Integer oid, PageParam pageParam) {
 		// 1. 查询数量
 		// 2. 取第n页数据
 		// 3. 组装PageInfo对象
@@ -72,8 +73,8 @@ public class FgBrowseRecordsServiceImpl extends BaseServiceImpl<BrowseRecords, I
 	 * @date: 2019年4月19日 上午10:20:01
 	 */
 	@Override
-	public Boolean deleteByParam(String date) {
-		return fgBrowseRecordsMapper.deleteByParam(date);
+	public Boolean deleteByParam(QueryBrowseRecordsForm form) {
+		return fgBrowseRecordsMapper.deleteByParam(form);
 	}
 	
 

com.zrqx.fg.sysuser/src/main/java/com/zrqx/fg/sysuser/service/collections/FgCollectionsServiceImpl.java

@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.sysuser.collection.CollectionUpdateStatusEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.form.GoodsForm;
@@ -26,7 +27,6 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.core.vo.sysuser.fg.collections.CollectionsVo;
 import com.zrqx.core.vo.sysuser.fg.collections.GoodsVo;
 import com.zrqx.fg.sysuser.client.ResourceClient;
-import com.zrqx.fg.sysuser.manage.FgRedisManageUser;
 import com.zrqx.fg.sysuser.mapper.collections.FgCollectionsMapper;
 @Service
 public class FgCollectionsServiceImpl extends BaseModelServiceImpl<Collections, Integer>
@@ -39,7 +39,7 @@ public class FgCollectionsServiceImpl extends BaseModelServiceImpl<Collections,
 	private ResourceClient resourceClient;
 	
 	@Autowired
-	private FgRedisManageUser fgRedisManage;
+	private Redis fgRedisManage;
 	@Override
 	public BaseMapper<Collections> getMapper() {
 		return fgcollectionsMapper;
@@ -80,7 +80,7 @@ public class FgCollectionsServiceImpl extends BaseModelServiceImpl<Collections,
 		Collections collections = new Collections();
 		collections.setGoodsId(form.getGoodsId());
 		collections.setGoodsType(form.getGoodsType());
-		collections.setUserId(fgRedisManage.getId() == null ? "" : fgRedisManage.getId()+"");
+		collections.setUserId(fgRedisManage.getMember().getId() == null ? "" : fgRedisManage.getMember().getId()+"");
 		List<Collections> result = fgcollectionsMapper.select(collections);
 		return !result.isEmpty();
 		
@@ -105,7 +105,7 @@ public class FgCollectionsServiceImpl extends BaseModelServiceImpl<Collections,
 		//取消收藏
 		if (CollectionUpdateStatusEnum.DEL_COLLECTION.getCode().equals(form.getStatus())) {
 			Collections c = new Collections();
-			c.setUserId(fgRedisManage.getId()+"");
+			c.setUserId(fgRedisManage.getMember().getId()+"");
 			c.setGoodsType(form.getGoodsType());
 			c.setGoodsId(form.getGoodsId());
 			return fgcollectionsMapper.delete(c) == 1;
@@ -128,7 +128,7 @@ public class FgCollectionsServiceImpl extends BaseModelServiceImpl<Collections,
 			BeanUtils.copyProperties(form, collection);
 			// 完善对象
 			perfectTime(collection);
-			collection.setUserId(fgRedisManage.getId()+"");
+			collection.setUserId(fgRedisManage.getMember().getId()+"");
 			return collection;
 		}).collect(Collectors.toList());
 		// 保存对象
@@ -156,12 +156,12 @@ public class FgCollectionsServiceImpl extends BaseModelServiceImpl<Collections,
 	public Collections perfectTime(Collections collections){
 		if(collections.getId() == null){
 			collections.setCreateTime(new Date());
-			collections.setCreaterName(fgRedisManage.getOpName());
-			collections.setCreater(fgRedisManage.getId()+"");
+			collections.setCreaterName(fgRedisManage.getMember().getCreaterName());
+			collections.setCreater(fgRedisManage.getMember().getCreater());
 		}
 		collections.setUpdateTime(new Date());
-		collections.setUpdaterName(fgRedisManage.getOpName());
-		collections.setUpdater(fgRedisManage.getId()+"");
+		collections.setUpdaterName(fgRedisManage.getMember().getUpdaterName());
+		collections.setUpdater(fgRedisManage.getMember().getCreater());
 		return collections;		
 	}
 	/**