记得上下班打卡 | git大法好,push需谨慎

Commit f1dbd27a authored by jiangxiulong's avatar jiangxiulong

这里没有token 不能写在这里

parent 14655818
......@@ -48,11 +48,4 @@ public class AdminUpushController {
return ResponseDto.success(result);
}
@GetMapping("unread")
@ApiOperation("用户未读数量")
public ResponseDto<Integer> unread(HttpServletRequest request) {
Integer num = adminUpushServiceImpl.unread(request);
return ResponseDto.success(num);
}
}
......@@ -38,7 +38,6 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
RedisDataSourceUtil redisDataSourceUtil;
public PageInfo<AdminUpushVo> lists(HttpServletRequest request, Integer page, Integer size) {
String uid = CurrentUtil.getCurrentUid();
String source = request.getHeader("source");
PageInfo<AdminUpushVo> voPageInfo = null;
Object adminUpushVo = null;
......@@ -53,12 +52,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
voPageInfo = PageInfo.of(new LinkedList<>());
} else {
LinkedList<AdminUpushVo> pushList = (LinkedList<AdminUpushVo>) adminUpushVo;
Integer num = 0;
for (AdminUpushVo info : pushList) {
if (num == 0) {
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ADMIN_UPUSH_LIST_READ_UID.concat(uid), info.getUpushId());
}
num++;
if (!info.getImg().isEmpty()) {
String img = imgUrl + info.getImg();
info.setImg(img);
......@@ -70,39 +64,4 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
return voPageInfo;
}
public Integer unread(HttpServletRequest request) {
String uid = CurrentUtil.getCurrentUid();
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ADMIN_UPUSH_LIST_READ_UID.concat(uid));
String source = request.getHeader("source");
Object adminUpushVo = null;
if (null != source) {
if (source.equals("IOS")) {
adminUpushVo = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ADMIN_UPUSH_LIST_IOS);
} else if (source.equals("Android")) {
adminUpushVo = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ADMIN_UPUSH_LIST_ANDROID);
}
}
if (null == adminUpushVo || null == source) {
return 0;
}
LinkedList<AdminUpushVo> pushList = (LinkedList<AdminUpushVo>) adminUpushVo;
if (null == obj) {
return pushList.size();
}
Integer num = 0;
String pushId = (String) obj;
for (AdminUpushVo info : pushList) {
if (info.getUpushId().equals(pushId)) {
break;
} else {
num++;
}
}
return num;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment