--新版提交
This commit is contained in:
yc13649764453
@@ -0,0 +1,145 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.BookClockinCommentEntity;
|
||||
import com.peanut.modules.book.entity.BookClockinEntity;
|
||||
import com.peanut.modules.book.entity.BookClockinPunchEntity;
|
||||
import com.peanut.modules.book.service.BookClockinCommentService;
|
||||
import com.peanut.modules.book.service.BookClockinPunchService;
|
||||
import com.peanut.modules.book.service.BookClockinService;
|
||||
import com.peanut.modules.book.service.BookTaskService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 签到信息用户评论
|
||||
*
|
||||
*/
|
||||
|
||||
@RestController
|
||||
@RequestMapping("clockin/comment")
|
||||
public class BookClockinCommentController {
|
||||
|
||||
@Autowired
|
||||
private BookClockinCommentService bookClockinCommentService;
|
||||
@Autowired
|
||||
private BookClockinPunchService bookClockinPunchService;
|
||||
@Autowired
|
||||
private BookClockinService bookClockinService;
|
||||
|
||||
/**
|
||||
* 列表 倒叙
|
||||
*/
|
||||
@RequestMapping("/applist")
|
||||
public R applist(@RequestParam Map<String, Object> params){
|
||||
PageUtils page = bookClockinCommentService.queryPage(params);
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id){
|
||||
BookClockinCommentEntity commentEntity = bookClockinCommentService.getById(id);
|
||||
|
||||
return R.ok().put("commentEntity", commentEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
public R save(@RequestBody BookClockinCommentEntity clockinComment){
|
||||
Integer bookid1 = clockinComment.getBookId();
|
||||
Integer userId = clockinComment.getUserId();
|
||||
Integer taskId = clockinComment.getTaskId();
|
||||
|
||||
|
||||
BookClockinCommentEntity bookClockinCommentEntity = bookClockinCommentService.getBaseMapper().selectOne(new QueryWrapper<BookClockinCommentEntity>()
|
||||
.eq("book_id", bookid1)
|
||||
.eq("user_id", userId)
|
||||
.eq("task_id", taskId)
|
||||
|
||||
);
|
||||
BookClockinPunchEntity ClockinCommen = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("book_id", bookid1)
|
||||
.eq("user_id", userId)
|
||||
.eq("t_id", taskId)
|
||||
|
||||
);
|
||||
|
||||
|
||||
|
||||
if (bookClockinCommentEntity !=null) {
|
||||
return R.error("该信息允许发布一条内容，请勿重复发布");
|
||||
}
|
||||
|
||||
if (ClockinCommen!=null) {
|
||||
clockinComment.setPid(1);
|
||||
}
|
||||
|
||||
bookClockinCommentService.save(clockinComment);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/replysave")
|
||||
public R replysave(@RequestBody BookClockinCommentEntity clockinComment) {
|
||||
Integer bookid = clockinComment.getBookId();
|
||||
Integer userId = clockinComment.getUserId();
|
||||
Integer pid = clockinComment.getPid();
|
||||
BookClockinEntity bookClockinEntity = bookClockinService.getBaseMapper().selectOne(new QueryWrapper<BookClockinEntity>()
|
||||
.eq("id",pid)
|
||||
);
|
||||
clockinComment.setDelFlag(0);
|
||||
bookClockinCommentService.save(clockinComment);
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody BookClockinCommentEntity clockinComment){
|
||||
|
||||
bookClockinCommentService.updateById(clockinComment);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids){
|
||||
bookClockinCommentService.removeByIds(Arrays.asList(ids));
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,350 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.*;
|
||||
import com.peanut.modules.book.service.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import java.util.*;
|
||||
/**
|
||||
* 签到内容信息
|
||||
*
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("book/clockin")
|
||||
public class BookClockinController {
|
||||
@Autowired
|
||||
private BookClockinService bookClockinService;
|
||||
@Autowired
|
||||
private BookTaskService bookTaskService;
|
||||
@Autowired
|
||||
private BookClockinCommentService bookClockinCommentService;
|
||||
@Autowired
|
||||
private MyUserService myUserService;
|
||||
@Autowired
|
||||
private BookService bookService;
|
||||
@Autowired
|
||||
private BookClockinPunchService bookClockinPunchService;
|
||||
/**
|
||||
* 列表 app post请求
|
||||
*/
|
||||
@RequestMapping("/applistSS")
|
||||
public R applist(@RequestParam Map<String, Object> params) {
|
||||
PageUtils page = bookClockinService.queryPage(params);
|
||||
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查看全部评价
|
||||
*/
|
||||
@RequestMapping("/applist")
|
||||
public R applist(@RequestParam("bookid") String bookid,
|
||||
@RequestParam("taskid") String taskid) {
|
||||
|
||||
List<BookClockinEntity> bookClockinEntityList = bookClockinService.getBaseMapper().selectList(new QueryWrapper<BookClockinEntity>()
|
||||
.eq("book_id", bookid).eq("task_id", taskid));
|
||||
List list = new ArrayList<>();
|
||||
for (BookClockinEntity bookClockinEntity : bookClockinEntityList) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
String name = "";
|
||||
String avatar="";
|
||||
Integer id2 =null;
|
||||
Integer userId = bookClockinEntity.getUserId();
|
||||
Integer taskId = bookClockinEntity.getTaskId();
|
||||
Integer bookId = bookClockinEntity.getBookId();
|
||||
String conTent = bookClockinEntity.getContent();
|
||||
Integer id1 = bookClockinEntity.getId();
|
||||
String images = (String)bookClockinEntity.getImages();
|
||||
Date createTime = bookClockinEntity.getCreateTime();
|
||||
List<MyUserEntity> id = myUserService.getBaseMapper().selectList(new QueryWrapper<MyUserEntity>().eq("id", userId));
|
||||
for (MyUserEntity user : id) {
|
||||
name = user.getNickname();
|
||||
id2 = user.getId();
|
||||
avatar = user.getAvatar();
|
||||
}
|
||||
|
||||
//评论信息
|
||||
map.put("userid", id2);
|
||||
map.put("name", name);
|
||||
map.put("avatar", avatar);
|
||||
map.put("bookid", bookId);
|
||||
map.put("taskId", taskId);
|
||||
map.put("content", conTent);
|
||||
map.put("images", images);
|
||||
map.put("createdate", createTime);
|
||||
list.add(map);
|
||||
}
|
||||
Collections.reverse(list);
|
||||
return R.ok().put("list", list);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 列表 后台get请求
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
PageUtils page = bookClockinService.queryPage(params);
|
||||
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id) {
|
||||
BookClockinEntity bookClockinEntity = bookClockinService.getById(id);
|
||||
return R.ok().put("bookBuyConfig", bookClockinEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
public R save(@RequestBody BookClockinEntity bookClockinEntity) {
|
||||
|
||||
Integer bookId = bookClockinEntity.getBookId();
|
||||
Integer userId = bookClockinEntity.getUserId();
|
||||
Integer taskId = bookClockinEntity.getTaskId();
|
||||
Integer dayId = bookClockinEntity.getDayId();
|
||||
BookClockinPunchEntity bookClockinPunchEntity = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("book_id", bookId)
|
||||
.eq("t_id", taskId)
|
||||
.eq("days", dayId)
|
||||
.eq("user_id", userId)
|
||||
);
|
||||
if (bookClockinPunchEntity==null) {
|
||||
return R.error("您尚未签到，签到完成即可发表内容");
|
||||
}
|
||||
BookClockinEntity bookClockin = bookClockinService.getBaseMapper().selectOne(new QueryWrapper<BookClockinEntity>()
|
||||
.eq("book_id", bookId)
|
||||
.eq("task_id", taskId)
|
||||
.eq("day_id", dayId)
|
||||
.eq("user_id", userId)
|
||||
);
|
||||
if (bookClockin!=null) {
|
||||
return R.error("您已参与第"+dayId+"天签到评论");
|
||||
}
|
||||
List<Map<String, String>> imageList = (ArrayList<Map<String, String>>) bookClockinEntity.getImageeStrings();
|
||||
String imageStr = "";
|
||||
for (Map m : imageList) {
|
||||
imageStr += m.get("url") + ",";
|
||||
|
||||
}
|
||||
|
||||
if (imageStr!=null &&!imageStr.isEmpty()){
|
||||
String substring = imageStr.substring(0, imageStr.length() - 1);
|
||||
bookClockinEntity.setImages(substring);
|
||||
}else {
|
||||
bookClockinEntity.setImages("");
|
||||
}
|
||||
|
||||
|
||||
|
||||
bookClockinEntity.setDelFlag(0);
|
||||
bookClockinService.save(bookClockinEntity);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody BookClockinEntity bookClockinEntity) {
|
||||
bookClockinService.updateById(bookClockinEntity);
|
||||
return R.ok("提交成功");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids) {
|
||||
bookClockinService.removeByIds(Arrays.asList(ids));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 全部评价
|
||||
*
|
||||
* @param bookId
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("commentAll")
|
||||
public R commentAll(@RequestParam("bookId") Integer bookId) {
|
||||
List applist = new ArrayList<>();
|
||||
Map<String, Object> productMap = new HashMap<>();
|
||||
//根据bookid查找出签到表中签到的用户数据
|
||||
List<BookClockinEntity> bookid = bookClockinService.getBaseMapper().selectList(new QueryWrapper<BookClockinEntity>()
|
||||
.eq("book_id", bookId)
|
||||
.orderByDesc("create_time"));
|
||||
|
||||
for (BookClockinEntity book : bookid) {
|
||||
HashMap<Object, Object> map = new HashMap<>();
|
||||
|
||||
Integer bookid1 = book.getBookId();
|
||||
//BookClockinEntity获取点赞总数
|
||||
String likes = book.getLikeSum();
|
||||
|
||||
Integer userid1 = book.getUserId();
|
||||
Integer taskId = book.getTaskId();
|
||||
Integer id1 = book.getId();
|
||||
applist.add(taskId);
|
||||
//根据id和bookid查询出对应的签到下评论的全部数据
|
||||
|
||||
productMap.put("bookid",bookid1);
|
||||
productMap.put("userid",userid1);
|
||||
}
|
||||
PageUtils pages = bookClockinService.queryPage(productMap);
|
||||
return R.ok().put("days",applist).put("pages",pages);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 我的 ：我的签到记录
|
||||
* @param id
|
||||
* @param bookId
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("/myinfo")
|
||||
public R myinfo(@RequestParam("userid") Integer id,
|
||||
@RequestParam("bookid") Integer bookId) {
|
||||
|
||||
|
||||
List<BookClockinEntity> bookClockinEntityList = bookClockinService.getBaseMapper().selectList(new QueryWrapper<BookClockinEntity>()
|
||||
.eq("user_id",id) .eq("book_id",bookId).orderByDesc("create_time"));
|
||||
List list = new ArrayList<>();
|
||||
|
||||
for (BookClockinEntity bookClockinEntity : bookClockinEntityList) {
|
||||
Map<String, Object> productMap = new HashMap<>();
|
||||
Integer userId = bookClockinEntity.getUserId();
|
||||
Integer dayId = bookClockinEntity.getDayId();
|
||||
Integer bookIds = bookClockinEntity.getBookId();
|
||||
Integer typeId = bookClockinEntity.getTaskId();
|
||||
String content = bookClockinEntity.getContent();
|
||||
Object images = bookClockinEntity.getImages();
|
||||
Date createTime = bookClockinEntity.getCreateTime();
|
||||
BookEntity byId = bookService.getById(bookId);
|
||||
String name = byId.getName();
|
||||
String images1 = byId.getImages();
|
||||
BookTaskEntity bookTaskEntity = bookTaskService.getById(typeId);
|
||||
String heading = bookTaskEntity.getHeading();
|
||||
|
||||
|
||||
String myUsername = "";
|
||||
String avatar="";
|
||||
List<MyUserEntity> myUserid = myUserService.getBaseMapper().selectList(new QueryWrapper<MyUserEntity>().eq("id", userId));
|
||||
for (MyUserEntity user : myUserid) {
|
||||
myUsername = user.getNickname();
|
||||
avatar = user.getAvatar();
|
||||
}
|
||||
|
||||
productMap.put("myUseravatar",avatar);
|
||||
productMap.put("myUsername",myUsername);
|
||||
|
||||
productMap.put("dayId",dayId);
|
||||
productMap.put("userId",userId);
|
||||
productMap.put("taskId",typeId);
|
||||
productMap.put("content",content);
|
||||
productMap.put("clockinimages",images);
|
||||
productMap.put("createTime",createTime);
|
||||
productMap.put("bookId",bookIds);
|
||||
productMap.put("bookname",name);
|
||||
productMap.put("bookimages",images1);
|
||||
productMap.put("TaskHeading",heading);
|
||||
list.add(productMap);
|
||||
|
||||
}
|
||||
// Collections.sort(list);
|
||||
// Collections.reverse(list);
|
||||
return R.ok().put("ClockinList", list);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 详情页我的签到评论
|
||||
* @param id
|
||||
* @param taskid
|
||||
* @param bookId
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("/myinfolist")
|
||||
public R myinfolist(@RequestParam("userid") Integer id,
|
||||
@RequestParam("taskid") Integer taskid,
|
||||
@RequestParam("bookid") Integer bookId
|
||||
) {
|
||||
List list = new ArrayList<>();
|
||||
Map<String, Object> productMap = new HashMap<>();
|
||||
BookClockinEntity bookClockin = bookClockinService.getBaseMapper().selectOne(new QueryWrapper<BookClockinEntity>()
|
||||
.eq("user_id",id)
|
||||
.eq("task_id",taskid)
|
||||
.eq("book_id",bookId)
|
||||
);
|
||||
BookClockinPunchEntity bookClockinPunchEntity = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("user_id",id)
|
||||
.eq("t_id",taskid)
|
||||
.eq("book_id",bookId)
|
||||
);
|
||||
|
||||
|
||||
if (bookClockin == null ) {
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
Integer userId = bookClockin.getUserId();
|
||||
Integer bookIds = bookClockin.getBookId();
|
||||
Integer taskId = bookClockin.getTaskId();
|
||||
Integer dayId = bookClockin.getDayId();
|
||||
String content = bookClockin.getContent();
|
||||
Object images = bookClockin.getImages();
|
||||
Date createTime = bookClockin.getCreateTime();
|
||||
BookEntity byId = bookService.getById(bookId);
|
||||
String name = byId.getName();
|
||||
String images1 = byId.getImages();
|
||||
BookTaskEntity bookTaskEntity = bookTaskService.getById(taskId);
|
||||
String heading = bookTaskEntity.getHeading();
|
||||
|
||||
|
||||
|
||||
String myUsername = "";
|
||||
String avatar="";
|
||||
List<MyUserEntity> myUserid = myUserService.getBaseMapper().selectList(new QueryWrapper<MyUserEntity>().eq("id", userId));
|
||||
for (MyUserEntity user : myUserid) {
|
||||
myUsername = user.getNickname();
|
||||
avatar = user.getAvatar();
|
||||
}
|
||||
|
||||
productMap.put("myUseravatar",avatar);
|
||||
productMap.put("myUsername",myUsername);
|
||||
|
||||
|
||||
|
||||
productMap.put("userId",userId);
|
||||
productMap.put("taskId",taskId);
|
||||
productMap.put("dayId",dayId);
|
||||
|
||||
productMap.put("content",content);
|
||||
productMap.put("clockinimages",images);
|
||||
productMap.put("createTime",createTime);
|
||||
productMap.put("bookId",bookIds);
|
||||
productMap.put("bookname",name);
|
||||
productMap.put("bookimages",images1);
|
||||
productMap.put("TaskHeading",heading);
|
||||
list.add(productMap);
|
||||
|
||||
Collections.reverse(list);
|
||||
return R.ok().put("productlist", list);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,225 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.BookClockinCommentEntity;
|
||||
import com.peanut.modules.book.entity.BookClockinPunchEntity;
|
||||
import com.peanut.modules.book.entity.BookEntity;
|
||||
import com.peanut.modules.book.entity.MyUserEntity;
|
||||
import com.peanut.modules.book.service.BookClockinCommentService;
|
||||
import com.peanut.modules.book.service.BookClockinPunchService;
|
||||
import com.peanut.modules.book.service.BookService;
|
||||
import com.peanut.modules.book.service.MyUserService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import java.util.*;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("book/clockinPunch")
|
||||
public class BookClockinPunchController {
|
||||
@Autowired
|
||||
private BookClockinPunchService bookClockinPunchService;
|
||||
@Autowired
|
||||
private BookService bookService;
|
||||
@Autowired
|
||||
private MyUserService myUserService;
|
||||
@Autowired
|
||||
private BookClockinCommentService bookClockinCommentService;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 列表 app post请求 /applistSS
|
||||
*/
|
||||
@RequestMapping("/applist")
|
||||
public R applist(@RequestParam Map<String, Object> params) {
|
||||
PageUtils page = bookClockinPunchService.queryPage(params);
|
||||
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 计算打卡天数
|
||||
*/
|
||||
@RequestMapping("/clockindays")
|
||||
public R applists(@RequestParam("bookId") String bookid,
|
||||
@RequestParam("userId") String userid) {
|
||||
ArrayList<Object> list = new ArrayList<>();
|
||||
|
||||
//查询用户id图书id 根据第一天打卡天数开始计算
|
||||
BookClockinPunchEntity bookClockinEntity = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("book_id", bookid)
|
||||
.eq("user_id", userid)
|
||||
.eq("days",1)
|
||||
|
||||
);
|
||||
List<BookClockinPunchEntity> bookClockinEntityList = bookClockinPunchService.getBaseMapper().selectList(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("book_id", bookid)
|
||||
.eq("user_id", userid)
|
||||
|
||||
);
|
||||
for (BookClockinPunchEntity bookClock : bookClockinEntityList) {
|
||||
Integer days = bookClock.getDays();
|
||||
|
||||
list.add(days);
|
||||
}
|
||||
|
||||
if (bookClockinEntity != null) {
|
||||
Date createTime = bookClockinEntity.getCreateTime();
|
||||
long createTimeMillis = createTime.getTime();
|
||||
//获取第一次打卡天数createTimeMillis毫秒数，时间戳减并除以毫秒数（24 * 60 * 60 * 1000）计算打卡总天数+1
|
||||
int daysBetween = (int) (System.currentTimeMillis() - createTimeMillis) / (24 * 60 * 60 * 1000)+1;
|
||||
return R.ok().put("daysBetween", daysBetween).put("dayslist", list);
|
||||
|
||||
} else if (bookClockinEntity == null) {
|
||||
Date createTime = new Date();
|
||||
long createTimeMillis = createTime.getTime();
|
||||
//获取第一次打卡天数createTimeMillis毫秒数，时间戳减并除以毫秒数（24 * 60 * 60 * 1000）计算打卡总天数+1
|
||||
int daysBetween = (int) (System.currentTimeMillis() - createTimeMillis) / (24 * 60 * 60 * 1000)+1;
|
||||
return R.ok().put("daysBetween", daysBetween).put("dayslist",list );
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
return R.error("无信息记录");
|
||||
}
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id) {
|
||||
BookClockinPunchEntity bookClockinPunchEntity = bookClockinPunchService.getById(id);
|
||||
|
||||
return R.ok().put("bookClockinPunchEntity", bookClockinPunchEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
//请求接口时是从task的info或者list中发出的，理论上
|
||||
public R save(@RequestBody BookClockinPunchEntity bookClockinPunchEntity) {
|
||||
Integer bookid1 = bookClockinPunchEntity.getBookId();
|
||||
Integer userId = bookClockinPunchEntity.getUserId();
|
||||
Integer taskId = bookClockinPunchEntity.getTId();
|
||||
BookEntity bookEntity = bookService.getBaseMapper().selectById(bookid1);
|
||||
Boolean canListen = bookEntity.getCanListen();
|
||||
BookClockinPunchEntity bookClock = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("book_id", bookid1)
|
||||
.eq("user_id", userId)
|
||||
.eq("t_id", taskId)
|
||||
|
||||
|
||||
|
||||
);
|
||||
if (bookClock !=null) {
|
||||
return R.error("您已经签到，请勿重复签到");
|
||||
}
|
||||
|
||||
|
||||
if(canListen == true){
|
||||
boolean b = myUserService.bookAuthenticate(bookid1,userId);
|
||||
if (b){
|
||||
bookClockinPunchEntity.setDelFlag(0);
|
||||
bookClockinPunchService.save(bookClockinPunchEntity);
|
||||
return R.ok("签到成功");
|
||||
}
|
||||
|
||||
}else {
|
||||
return R.error("购买此书即可参与签到");
|
||||
}
|
||||
|
||||
return R.ok("跳方法001");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody BookClockinPunchEntity bookClockinPunchEntity) {
|
||||
bookClockinPunchService.updateById(bookClockinPunchEntity);
|
||||
return R.ok("提交成功");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids) {
|
||||
bookClockinPunchService.removeByIds(Arrays.asList(ids));
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取评论
|
||||
* @param bookClockinPunchEntity
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping("/punchcoments")
|
||||
public R punchcoments(@RequestBody BookClockinPunchEntity bookClockinPunchEntity) {
|
||||
//图书Id
|
||||
Integer bookId = bookClockinPunchEntity.getBookId();
|
||||
//用户id
|
||||
Integer userId = bookClockinPunchEntity.getUserId();
|
||||
//天数
|
||||
Integer days = bookClockinPunchEntity.getDays();
|
||||
|
||||
ArrayList<Object> list = new ArrayList<>();
|
||||
List<BookClockinCommentEntity> bookClockinCommentEntities = bookClockinCommentService.getBaseMapper().selectList(new QueryWrapper<BookClockinCommentEntity>()
|
||||
.eq("user_id", userId)
|
||||
.eq("book_id", bookId)
|
||||
.eq("task_id", days)
|
||||
//pid等于1时为一级评论
|
||||
// .eq("pid",1)
|
||||
);
|
||||
for (BookClockinCommentEntity bookClockinCommentEntity : bookClockinCommentEntities) {
|
||||
HashMap<Object, Object> map = new HashMap<>();
|
||||
String name = "";
|
||||
String avatar="";
|
||||
|
||||
Integer userId1 = bookClockinCommentEntity.getUserId();
|
||||
Integer bookId1 = bookClockinCommentEntity.getBookId();
|
||||
String content = bookClockinCommentEntity.getContent();
|
||||
String images = bookClockinCommentEntity.getImages();
|
||||
Date createTime = bookClockinCommentEntity.getCreateTime();
|
||||
|
||||
|
||||
|
||||
List<MyUserEntity> id = myUserService.getBaseMapper().selectList(new QueryWrapper<MyUserEntity>().eq("id", userId));
|
||||
for (MyUserEntity user : id) {
|
||||
name = user.getNickname();
|
||||
avatar = user.getAvatar();
|
||||
}
|
||||
map.put("userid", userId1);
|
||||
map.put("name", name);
|
||||
map.put("avatar", avatar);
|
||||
map.put("bookid", bookId1);
|
||||
map.put("content", content);
|
||||
map.put("images", images);
|
||||
map.put("createdate", createTime);
|
||||
list.add(map);
|
||||
|
||||
}
|
||||
|
||||
Collections.reverse(list);
|
||||
return R.ok().put("list", list);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.BookForumArticlesEntity;
|
||||
import com.peanut.modules.book.entity.BookForumCommentEntity;
|
||||
import com.peanut.modules.book.service.BookForumArticlesService;
|
||||
import com.peanut.modules.book.service.BookForumCommenService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("forum/articles")
|
||||
public class BookForumArticlesServiceController {
|
||||
@Autowired
|
||||
private BookForumArticlesService bookForumArticlesService;
|
||||
@Autowired
|
||||
private BookForumCommenService bookForumCommenService;
|
||||
|
||||
/**
|
||||
* 列表 (开始时间倒叙) 后台get请求
|
||||
*/
|
||||
@RequestMapping("/desccreatelist")
|
||||
public R Desccreatelist(@RequestParam Map<String, Object> params){
|
||||
PageUtils page = bookForumArticlesService.queryPage(params);
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 列表 (修改时间倒叙) app页面
|
||||
*/
|
||||
@RequestMapping("/descupdatelist")
|
||||
public R Descupdatelist(@RequestParam Map<String, Object> params){
|
||||
PageUtils page = bookForumArticlesService.queryPages(params);
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 后台信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id){
|
||||
BookForumArticlesEntity forumArticles = bookForumArticlesService.getById(id);
|
||||
return R.ok().put("BookForumArticlesEntity", forumArticles);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* app信息
|
||||
*/
|
||||
@RequestMapping("/appinfo/{id}")
|
||||
public R appinfo(@PathVariable("id") Integer id){
|
||||
BookForumArticlesEntity forumArticles = bookForumArticlesService.getById(id);
|
||||
return R.ok().put("BookForumArticlesEntity", forumArticles);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
|
||||
public R save(@RequestBody BookForumArticlesEntity bookForumArticlesEntity){
|
||||
bookForumArticlesEntity.setCreateTime(new Date());
|
||||
bookForumArticlesEntity.setDelflag(0);
|
||||
bookForumArticlesService.saveOrUpdate(bookForumArticlesEntity);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody BookForumArticlesEntity bookForumArticlesEntity){
|
||||
bookForumArticlesEntity.setUpdateTime(new Date());
|
||||
bookForumArticlesService.updateById(bookForumArticlesEntity);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids){
|
||||
bookForumArticlesService.removeByIds(Arrays.asList(ids));
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.BookForumCommentEntity;
|
||||
import com.peanut.modules.book.service.BookForumArticlesService;
|
||||
import com.peanut.modules.book.service.BookForumCommenService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* 评价文章
|
||||
*
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("forum/comment")
|
||||
public class BookForumCommentController {
|
||||
|
||||
@Autowired
|
||||
private BookForumCommenService bookForumCommentService;
|
||||
@Autowired
|
||||
private BookForumArticlesService bookForumArticlesService;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
public R list(@RequestParam Map<String, Object> params){
|
||||
PageUtils page = bookForumCommentService.queryPage(params);
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id){
|
||||
BookForumCommentEntity forumCom = bookForumCommentService.getById(id);
|
||||
|
||||
return R.ok().put("BookForumCommentEntity", forumCom);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
|
||||
public R save(@RequestBody BookForumCommentEntity bookForumCommentEntity){
|
||||
bookForumCommentEntity.setDelflag(0);
|
||||
bookForumCommentService.saveOrUpdate(bookForumCommentEntity);
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody BookForumCommentEntity bookForumCommentEntity){
|
||||
bookForumCommentService.updateById(bookForumCommentEntity);
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids){
|
||||
bookForumCommentService.removeByIds(Arrays.asList(ids));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.BookListeningEntity;
|
||||
import com.peanut.modules.book.service.BookListeningService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 听书进度表
|
||||
*
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("book/listening")
|
||||
public class BookListeningController {
|
||||
|
||||
@Autowired
|
||||
private BookListeningService bookListeningService;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
public R list(@RequestParam Map<String, Object> params){
|
||||
PageUtils page = bookListeningService.queryPage(params);
|
||||
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id){
|
||||
BookListeningEntity bookReadRate = bookListeningService.getById(id);
|
||||
|
||||
return R.ok().put("bookReadRate", bookReadRate);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
public R save( BookListeningEntity booklistening){
|
||||
Integer bookId = booklistening.getBookId();
|
||||
Integer userId = booklistening.getUserId();
|
||||
BookListeningEntity booklisteningEntity = bookListeningService.getBaseMapper().selectOne(new QueryWrapper<BookListeningEntity>().eq("book_id", bookId)
|
||||
.eq("user_id", userId));
|
||||
if (booklisteningEntity != null) {
|
||||
BookListeningEntity one = bookListeningService.getOne(new QueryWrapper<BookListeningEntity>()
|
||||
.eq("book_id", booklistening.getBookId())
|
||||
.eq("user_id", booklistening.getUserId()));
|
||||
Integer id = one.getId();
|
||||
// 构建新的BookListeningEntity对象，设置需要修改的字段
|
||||
BookListeningEntity updatedEntity = new BookListeningEntity();
|
||||
updatedEntity.setId(id);
|
||||
updatedEntity.setPrecent(booklistening.getPrecent());
|
||||
updatedEntity.setChapterId(booklistening.getChapterId());
|
||||
updatedEntity.setChapterName(booklistening.getChapterName());
|
||||
updatedEntity.setUpdateTime(new Date());
|
||||
// 执行更新操作
|
||||
bookListeningService.updateById(updatedEntity);
|
||||
return R.ok().put("bookListeningId",booklisteningEntity.getId());
|
||||
}else {
|
||||
|
||||
bookListeningService.save(booklistening);
|
||||
}
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody BookListeningEntity booklistening) {
|
||||
BookListeningEntity one = bookListeningService.getOne(new QueryWrapper<BookListeningEntity>()
|
||||
.eq("book_id", booklistening.getBookId())
|
||||
.eq("user_id", booklistening.getUserId()));
|
||||
if (one != null) {
|
||||
Integer id = one.getId();
|
||||
|
||||
// 构建新的BookListeningEntity对象，设置需要修改的字段
|
||||
BookListeningEntity updatedEntity = new BookListeningEntity();
|
||||
updatedEntity.setId(id);
|
||||
updatedEntity.setPrecent(booklistening.getPrecent());
|
||||
updatedEntity.setChapterId(booklistening.getChapterId());
|
||||
updatedEntity.setChapterName(booklistening.getChapterName());
|
||||
updatedEntity.setUpdateTime(new Date());
|
||||
|
||||
// 执行更新操作
|
||||
bookListeningService.updateById(updatedEntity);
|
||||
|
||||
|
||||
}
|
||||
return R.ok();
|
||||
}
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids){
|
||||
bookListeningService.removeByIds(Arrays.asList(ids));
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取阅读进度
|
||||
*/
|
||||
@RequestMapping("/getReadRate")
|
||||
public R getReadRate(@RequestBody BookListeningEntity booklistening){
|
||||
BookListeningEntity one = bookListeningService.getOne(new QueryWrapper<BookListeningEntity>().eq("user_id", booklistening.getUserId()).eq("book_id", booklistening.getBookId()));
|
||||
return R.ok().put("readRate",one);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.BookBrowseRecordsEntity;
|
||||
import com.peanut.modules.book.entity.BookListeningEntity;
|
||||
import com.peanut.modules.book.entity.BookListeningShelfEntity;
|
||||
import com.peanut.modules.book.entity.BookShelfEntity;
|
||||
import com.peanut.modules.book.service.BookBrowseRecordsService;
|
||||
import com.peanut.modules.book.service.BookListeningService;
|
||||
import com.peanut.modules.book.service.BookListeningShelfService;
|
||||
import com.peanut.modules.book.service.BookShelfService;
|
||||
import com.peanut.modules.book.vo.BookShelfVo;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("book/BookListeningShelf")
|
||||
public class BookListeningShelfController {
|
||||
@Autowired
|
||||
private BookListeningShelfService bookListeningShelfService;
|
||||
@Autowired
|
||||
private BookBrowseRecordsService bookBrowseRecordsService;
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
|
||||
public R list(@RequestParam Map<String, Object> params){
|
||||
PageUtils page = bookListeningShelfService.queryPage(params);
|
||||
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
|
||||
public R info(@PathVariable("id") Integer id){
|
||||
BookListeningShelfEntity bookShelf = bookListeningShelfService.getById(id);
|
||||
|
||||
return R.ok().put("bookShelf", bookShelf);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
// @RequiresPermissions("book:bookshelf:delete")
|
||||
public R delete(@RequestBody Integer[] ids){
|
||||
bookBrowseRecordsService.removeByIds(Arrays.asList(ids));
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 获取用户听书书架 getUserBookChapterRead
|
||||
*/
|
||||
// @RequestMapping("/getUserBookChapterRead")
|
||||
// public R getUserBookChapterRead(@RequestParam Integer userId){
|
||||
// List<BookShelfVo> bookShelfVos = bookBrowseRecordsService.getUserBookChapterRead(userId);
|
||||
//
|
||||
// return R.ok().put("bookShelfVos",bookShelfVos);
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.BookClockinEntity;
|
||||
import com.peanut.modules.book.entity.BookClockinPunchEntity;
|
||||
import com.peanut.modules.book.entity.BookTaskEntity;
|
||||
import com.peanut.modules.book.service.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
||||
/**
|
||||
* 发布签到任务
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("book/task")
|
||||
public class BookTaskController {
|
||||
|
||||
@Autowired
|
||||
private BookTaskService bookTaskService;
|
||||
@Autowired
|
||||
private BookService bookService;
|
||||
@Autowired
|
||||
private BookClockinService bookClockinService;
|
||||
@Autowired
|
||||
private MyUserService myUserService;
|
||||
@Autowired
|
||||
private BookClockinPunchService bookClockinPunchService;
|
||||
|
||||
/**
|
||||
* 列表后台
|
||||
*
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
public R list(@RequestParam Map<String, Object> params) {
|
||||
PageUtils page = bookTaskService.queryPage(params);
|
||||
|
||||
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 列表app根据days查询
|
||||
*
|
||||
*/
|
||||
@RequestMapping("/applist")
|
||||
public R applist(@RequestParam Map<String, Object> params) {
|
||||
PageUtils page = bookTaskService.queryPageServi(params);
|
||||
|
||||
|
||||
return R.ok().put("page", page);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id) {
|
||||
|
||||
//根据id找到详细数据信息
|
||||
BookTaskEntity bookTaskEntity = bookTaskService.getById(id);
|
||||
Integer ids = bookTaskEntity.getId();
|
||||
Integer bookid = bookTaskEntity.getBookid();
|
||||
List<BookClockinPunchEntity> bookClockinPunchEntity = bookClockinPunchService.getBaseMapper().selectList(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("user_id", ids)
|
||||
.eq("book_id", bookid));
|
||||
|
||||
// 遍历 bookClockinEntityList 中的每个 bookClockinEntity，查询 BookClockinEntity 表中对应的总数
|
||||
int total = 0;
|
||||
for ( BookClockinPunchEntity bookClockin : bookClockinPunchEntity) {
|
||||
|
||||
Integer id1 = bookClockin.getId();
|
||||
// BookClockinEntity byId = bookClockinService.getById(id1);
|
||||
//++获取到总条数
|
||||
total ++;
|
||||
}
|
||||
//返回总条数
|
||||
|
||||
return R.ok().put("bookTaskEntity", bookTaskEntity).put("totalCont",total);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
public R save(@RequestBody BookTaskEntity bookTaskEntity) {
|
||||
|
||||
bookTaskEntity.setDelFlag(0);
|
||||
bookTaskService.save(bookTaskEntity);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody BookTaskEntity bookTaskEntity) {
|
||||
|
||||
bookTaskService.updateById(bookTaskEntity);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids) {
|
||||
bookTaskService.removeByIds(Arrays.asList(ids));
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 总条数
|
||||
*/
|
||||
@RequestMapping("/totalsum")
|
||||
public R totalsum(@RequestBody BookTaskEntity bookTaskEntity) {
|
||||
|
||||
// 获取 BookTaskEntity 表中所有的 bookid和id
|
||||
String days = bookTaskEntity.getDays();
|
||||
Integer bookid = bookTaskEntity.getBookid();
|
||||
List<BookClockinPunchEntity> books = bookClockinPunchService.getBaseMapper().selectList(new QueryWrapper<BookClockinPunchEntity>()
|
||||
.eq("days", days)
|
||||
.eq("book_id", bookid));
|
||||
|
||||
|
||||
|
||||
// 遍历 bookClockinEntityList 中的每个 bookClockinEntity，查询 BookClockinEntity 表中对应的总数
|
||||
int total = 0;
|
||||
for ( BookClockinPunchEntity book : books) {
|
||||
// 使用 bookClockinEntity 进行匹配查询
|
||||
Integer id1 = book.getId();
|
||||
BookClockinPunchEntity byId = bookClockinPunchService.getById(id1);
|
||||
//++获取到总条数
|
||||
total ++;
|
||||
}
|
||||
//返回总条数
|
||||
return R.ok().put("totalSum",total);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.MyUserEntity;
|
||||
import com.peanut.modules.book.entity.UserFeedbackEntity;
|
||||
import com.peanut.modules.book.entity.UserRecordEntity;
|
||||
import com.peanut.modules.book.service.MyUserService;
|
||||
import com.peanut.modules.book.service.UserFeedbackSerivce;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 追加评论后游客评论无限制
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/user/feedback")
|
||||
public class UserFeedbackController {
|
||||
|
||||
|
||||
@Autowired
|
||||
private UserFeedbackSerivce userFeedbackService;
|
||||
@Autowired
|
||||
private MyUserService myUserService;
|
||||
|
||||
/**
|
||||
* 查看我的评价
|
||||
*/
|
||||
@RequestMapping("/Allevaluations")
|
||||
public R Allevaluations(@RequestBody UserFeedbackEntity userFeedbackEntity){
|
||||
List<UserFeedbackEntity> userid = userFeedbackService.getBaseMapper().selectList(new QueryWrapper<UserFeedbackEntity>().eq("userid", userFeedbackEntity.getUserId()
|
||||
));
|
||||
return R.ok().put("Allevaluations",userid);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查看全部评价
|
||||
*/
|
||||
@RequestMapping("/All")
|
||||
public R All(@RequestBody UserFeedbackEntity userFeedbackEntity){
|
||||
HashMap<Object, Object> maps = new HashMap<>();
|
||||
List list = new ArrayList<>();
|
||||
List<UserFeedbackEntity> bookid = userFeedbackService.getBaseMapper().selectList(new QueryWrapper<UserFeedbackEntity>().eq("bookid", userFeedbackEntity.getBookid()));
|
||||
for (UserFeedbackEntity userFe : bookid) {
|
||||
HashMap<Object, Object> map = new HashMap<>();
|
||||
Integer book = userFe.getBookid();
|
||||
Integer use = userFe.getUserId();
|
||||
List<MyUserEntity> id = myUserService.getBaseMapper().selectList(new QueryWrapper<MyUserEntity>().eq("id", use));
|
||||
String usser="";
|
||||
String name = "";
|
||||
for (MyUserEntity user : id) {
|
||||
usser = user.getAvatar();
|
||||
name =user.getNickname();
|
||||
|
||||
}
|
||||
map.put("Avatar",usser);
|
||||
map.put("name",name);
|
||||
map.put("bookid",book);
|
||||
map.put("orderSn",userFeedbackEntity.getOrdersn());
|
||||
map.put("userid",use);
|
||||
map.put("content",userFeedbackEntity.getContent());
|
||||
map.put("create_date",userFeedbackEntity.getCreate_date());
|
||||
map.put("rid",userFeedbackEntity.getRid());
|
||||
map.put("fuid",userFeedbackEntity.getFuid());
|
||||
list.add(map);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
maps.put("list",list);
|
||||
|
||||
return R.ok().put("list",list);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 游客评价
|
||||
*/
|
||||
@RequestMapping("/userbacksave")
|
||||
public R userbacksave(@RequestBody UserFeedbackEntity userFeedbackEntity ) {
|
||||
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,196 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
|
||||
import cn.com.marsoft.tool.ToolObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.*;
|
||||
import com.peanut.modules.book.service.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import static com.peanut.common.utils.R.error;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/user/followUp")
|
||||
public class UserFollowUpController {
|
||||
|
||||
|
||||
@Autowired
|
||||
private UserFollowUpService userFollowUpService;
|
||||
@Autowired
|
||||
private UserRecordService userRecordService;
|
||||
@Autowired
|
||||
private MyUserService myUserService;
|
||||
@Autowired
|
||||
private BuyOrderService buyOrderService;
|
||||
@Autowired
|
||||
private BuyOrderDetailService buyOrderDetailService;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
public R list(@RequestParam Map<String, Object> params ){
|
||||
PageUtils page = userFollowUpService.queryPage(params);
|
||||
return R.ok().put("page", page);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 我的评价
|
||||
*/
|
||||
@RequestMapping("/Allevaluations")
|
||||
public R Allevaluations(@RequestBody UserFollowUpEntity userFollowUpEntity){
|
||||
List<UserFollowUpEntity> userid = userFollowUpService.getBaseMapper().selectList(new QueryWrapper<UserFollowUpEntity>().eq("userid", userFollowUpEntity.getUserId()));
|
||||
return R.ok().put("Allevaluations",userid);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 全部评价
|
||||
*/
|
||||
@RequestMapping("/Alllevas")
|
||||
public R Alllevas(@RequestBody UserFollowUpEntity users){
|
||||
HashMap<Object, Object> maps = new HashMap<>();
|
||||
List list = new ArrayList<>();
|
||||
List<UserFollowUpEntity> bookid = userFollowUpService.getBaseMapper().selectList(new QueryWrapper<UserFollowUpEntity>().eq("bookid", users.getBookid()));
|
||||
for (UserFollowUpEntity userRecord : bookid) {
|
||||
HashMap<Object, Object> map = new HashMap<>();
|
||||
Integer bookid1 = userRecord.getBookid();
|
||||
Integer userid1 = userRecord.getUserId();
|
||||
List<MyUserEntity> id = myUserService.getBaseMapper().selectList(new QueryWrapper<MyUserEntity>().eq("id", userid1));
|
||||
String usser="";
|
||||
String name = "";
|
||||
for (MyUserEntity user : id) {
|
||||
usser = user.getAvatar();
|
||||
name =user.getNickname();
|
||||
|
||||
}
|
||||
map.put("Avatar",usser);
|
||||
map.put("name",name);
|
||||
map.put("userId", users.getUserId());
|
||||
map.put("bookid",bookid1);
|
||||
map.put("userid",userid1);
|
||||
map.put("content",users.getConTent());
|
||||
map.put("create_date",users.getCreateDate());
|
||||
map.put("oid",users.getOid());
|
||||
map.put("praIse",users.getPraIse());
|
||||
|
||||
list.add(map);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
maps.put("list",list);
|
||||
|
||||
return R.ok().put("list",list);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* 追加评论(用户只可评论一次)
|
||||
*
|
||||
* */
|
||||
@RequestMapping("/userFollowUp")
|
||||
public Object UserFollowUp(@RequestBody UserFollowUpEntity userFollowUpEntity ) {
|
||||
|
||||
|
||||
//根据传过来的userid和oid查询出来userRecordEntity中关联数据
|
||||
UserRecordEntity userRecord = userRecordService.getBaseMapper().selectOne(new QueryWrapper<UserRecordEntity>()
|
||||
.eq("userid", userFollowUpEntity.getUserId()).last("LIMIT 1")
|
||||
.eq("bookid", userFollowUpEntity.getBookid())
|
||||
.eq("id",userFollowUpEntity.getOid())
|
||||
);
|
||||
if (userRecord==null){
|
||||
return R.error("请先评论再追评");
|
||||
}
|
||||
String orderSn = userRecord.getOrderSn();
|
||||
BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>()
|
||||
.eq("order_sn",orderSn).last("LIMIT 1")
|
||||
);
|
||||
|
||||
Integer orderId = buyOrderEntity.getOrderId();
|
||||
Integer bookid = userRecord.getBookid();
|
||||
Integer userid = userRecord.getUserid();
|
||||
Integer id1 = userRecord.getId();
|
||||
BuyOrderDetailEntity detailEntity = buyOrderDetailService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderDetailEntity>()
|
||||
.eq("Order_id", orderId).eq("product_id",bookid));
|
||||
|
||||
UserFollowUpEntity followUpEntity = userFollowUpService.getBaseMapper().selectOne(new QueryWrapper<UserFollowUpEntity>().eq("userid", userid).eq("oid",id1).last("LIMIT 1"));
|
||||
|
||||
// if (followUpEntity != null) {
|
||||
// return R.error("您已评价过");
|
||||
// }
|
||||
|
||||
buyOrderEntity.setRecordId(2);
|
||||
buyOrderService.saveOrUpdate(buyOrderEntity);
|
||||
if (userFollowUpEntity.getImages()!=null) {
|
||||
|
||||
List<Map<String,String>> imageList = (ArrayList<Map<String,String>>)userFollowUpEntity.getImages();
|
||||
String imageStr = "";
|
||||
for(Map m : imageList){
|
||||
imageStr += m.get("url") + ",";
|
||||
}
|
||||
|
||||
userFollowUpEntity.setImages(imageStr);
|
||||
|
||||
}
|
||||
|
||||
userFollowUpEntity.setOid(id1);
|
||||
userFollowUpEntity.setDelflag(0);
|
||||
userFollowUpEntity.setCreateDate(new Date());
|
||||
userFollowUpService.saveOrUpdate(userFollowUpEntity);
|
||||
return R.ok("成功").put("userFollowUpEntity",userFollowUpEntity);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id){
|
||||
UserFollowUpEntity user = userFollowUpService.getById(id);
|
||||
|
||||
return R.ok().put("UserFollowUpEntity", user);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody UserRecordEntity user){
|
||||
userRecordService.updateById(user);
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids){
|
||||
userRecordService.removeByIds(Arrays.asList(ids));
|
||||
|
||||
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,236 @@
|
||||
package com.peanut.modules.book.controller;
|
||||
import cn.com.marsoft.tool.ToolObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.google.gson.Gson;
|
||||
import com.peanut.common.utils.PageUtils;
|
||||
import com.peanut.common.utils.R;
|
||||
import com.peanut.modules.book.entity.*;
|
||||
import com.peanut.modules.book.service.*;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static com.peanut.common.utils.R.error;
|
||||
@RestController
|
||||
@RequestMapping("buy/record")
|
||||
public class UserRecordController {
|
||||
@Autowired
|
||||
private UserRecordService userRecordService;
|
||||
@Autowired
|
||||
private BuyOrderService buyOrderService;
|
||||
@Autowired
|
||||
private MyUserService myUserService;
|
||||
@Autowired
|
||||
private BuyOrderDetailService buyOrderDetailService;
|
||||
@Autowired
|
||||
private UserFollowUpService userFollowUpService;
|
||||
|
||||
|
||||
/**
|
||||
* 列表
|
||||
*/
|
||||
@RequestMapping("/list")
|
||||
public R list(@RequestParam Map<String, Object> params ){
|
||||
PageUtils page = userRecordService.queryPage(params);
|
||||
return R.ok().put("page", page);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看我的评价
|
||||
*/
|
||||
@RequestMapping("/Allevaluations")
|
||||
public R Allevaluations(@RequestBody UserRecordEntity userRecordEntity){
|
||||
List<UserRecordEntity> userid = userRecordService.getBaseMapper().selectList(new QueryWrapper<UserRecordEntity>().eq("userid", userRecordEntity.getUserid()).orderByDesc("create_date"));
|
||||
return R.ok().put("Allevaluations",userid);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看全部评价
|
||||
*/
|
||||
@RequestMapping("/All")
|
||||
public R All(@RequestBody UserRecordEntity userRecordEntity) {
|
||||
|
||||
List list = new ArrayList<>();
|
||||
List<UserRecordEntity> bookid = userRecordService.getBaseMapper().selectList(new QueryWrapper<UserRecordEntity>().eq("bookid", userRecordEntity.getBookid()).orderByDesc("create_date"));
|
||||
for (UserRecordEntity userRecord : bookid) {
|
||||
HashMap<Object, Object> map = new HashMap<>();
|
||||
Integer bookid1 = userRecord.getBookid();
|
||||
Integer userid1 = userRecord.getUserid();
|
||||
Integer id1 = userRecord.getId();
|
||||
List<MyUserEntity> id = myUserService.getBaseMapper().selectList(new QueryWrapper<MyUserEntity>().eq("id", userid1));
|
||||
String usser = "";
|
||||
String name = "";
|
||||
for (MyUserEntity user : id) {
|
||||
usser = user.getAvatar();
|
||||
name = user.getNickname();
|
||||
}
|
||||
|
||||
List<UserFollowUpEntity> followUpEntity = userFollowUpService.getBaseMapper().selectList(new QueryWrapper<UserFollowUpEntity>()
|
||||
.eq("oid", id1)
|
||||
.eq("userId", userid1)
|
||||
.orderByDesc("create_date"));
|
||||
String conTent = "";
|
||||
Date date = null;
|
||||
for (UserFollowUpEntity followUp : followUpEntity) {
|
||||
conTent = followUp.getConTent();
|
||||
date = followUp.getCreateDate();
|
||||
|
||||
}
|
||||
|
||||
map.put("followUpdate", date);
|
||||
map.put("followUpcontent", conTent);
|
||||
map.put("avatar", usser);
|
||||
map.put("name", name);
|
||||
map.put("bookid", bookid1);
|
||||
map.put("orderSn", userRecord.getOrderSn());
|
||||
map.put("userid", userid1);
|
||||
map.put("content", userRecord.getContent());
|
||||
map.put("images", userRecord.getImages());
|
||||
map.put("starlevel", userRecord.getStarLevel());
|
||||
map.put("createdate", userRecord.getCreateDate());
|
||||
list.add(map);
|
||||
|
||||
|
||||
|
||||
}
|
||||
return R.ok().put("list", list);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 信息
|
||||
*/
|
||||
@RequestMapping("/info/{id}")
|
||||
public R info(@PathVariable("id") Integer id){
|
||||
UserRecordEntity userRecordEntity = userRecordService.getById(id);
|
||||
return R.ok().put("bookChapterContent", userRecordEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@RequestMapping("/save")
|
||||
public R save(@RequestBody UserRecordEntity userRecordEntity){
|
||||
userRecordService.save(userRecordEntity);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改
|
||||
*/
|
||||
@RequestMapping("/update")
|
||||
public R update(@RequestBody UserRecordEntity userRecordEntity){
|
||||
userRecordService.updateById(userRecordEntity);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*/
|
||||
@RequestMapping("/delete")
|
||||
public R delete(@RequestBody Integer[] ids){
|
||||
userRecordService.removeByIds(Arrays.asList(ids));
|
||||
userRecordService.getBaseMapper().deleteBatchIds(Arrays.asList(ids));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* test
|
||||
* */
|
||||
@RequestMapping("/commodityComment")
|
||||
public R commodityComment(String userid, String orderSn, String starLevel, String comment){
|
||||
userRecordService.commodityComment(userid, orderSn, starLevel, comment);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* 生成评论
|
||||
* */
|
||||
@RequestMapping("/comment")
|
||||
public Object commodityComments( Integer userid, String orderSn, Integer bookid, String comment) {
|
||||
|
||||
|
||||
BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>()
|
||||
.eq("order_sn",orderSn).last("LIMIT 1").eq("order_status","3")
|
||||
//状态3为已收货
|
||||
// .eq("order_status","3")
|
||||
);
|
||||
UserRecordEntity userRecordEntity = new UserRecordEntity();
|
||||
|
||||
|
||||
if (!ToolObject.isNullOrEmpty(buyOrderEntity))
|
||||
{
|
||||
return error("您已评价过了，请勿重复评论");
|
||||
//
|
||||
}else {
|
||||
userRecordEntity.setId(buyOrderEntity.getOrderId());
|
||||
userRecordEntity.setContent(comment);
|
||||
//商品评价
|
||||
userRecordEntity.setBookid(bookid);
|
||||
userRecordEntity.setUserid(userid);
|
||||
userRecordEntity.setOrderSn(orderSn);
|
||||
userRecordEntity.setOrderCode(userRecordEntity.getOrderCode());
|
||||
userRecordEntity.setDelflag(0);
|
||||
userRecordService.saveOrUpdate(userRecordEntity);
|
||||
return R.ok("成功").put("userRecordEntity",userRecordEntity);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @param recordEntity
|
||||
* @return 生成评论（上传图片，星级评价
|
||||
*
|
||||
*/
|
||||
@RequestMapping("/UserRecordcomment")
|
||||
public R commodity(@RequestBody UserRecordEntity recordEntity ) {
|
||||
//todo 已收货限制字段，只可评价一次
|
||||
BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderEntity>()
|
||||
.eq("order_sn",recordEntity.getOrderSn())
|
||||
);
|
||||
|
||||
Integer orderId = buyOrderEntity.getOrderId();
|
||||
BuyOrderDetailEntity detailEntity = buyOrderDetailService.getBaseMapper().selectOne(new QueryWrapper<BuyOrderDetailEntity>().eq("Order_id", orderId).eq("product_id",recordEntity.getBookid()));
|
||||
Integer orderId1 = detailEntity.getOrderId();
|
||||
UserRecordEntity userRecordEntity = userRecordService.getBaseMapper().selectOne(new QueryWrapper<UserRecordEntity>().eq("orderSn", recordEntity.getOrderSn()).eq("userid", recordEntity.getUserid()).eq("orderdid",orderId1).last("LIMIT 1"));
|
||||
|
||||
if (userRecordEntity != null) {
|
||||
return R.error("您已评价过");
|
||||
}
|
||||
if (recordEntity.getImages()!=null) {
|
||||
List<Map<String, String>> imageList = (ArrayList<Map<String, String>>) recordEntity.getImages();
|
||||
String imageStr = "";
|
||||
for (Map m : imageList) {
|
||||
imageStr += m.get("url") + ",";
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
recordEntity.setImages(imageStr);
|
||||
}
|
||||
recordEntity.setDelflag(0);
|
||||
recordEntity.setOrderdid(orderId1);
|
||||
userRecordService.saveOrUpdate(recordEntity);
|
||||
|
||||
|
||||
detailEntity.setRecordId(1);
|
||||
buyOrderDetailService.saveOrUpdate(detailEntity);
|
||||
|
||||
|
||||
|
||||
return R.ok("成功").put("userRecordEntity",recordEntity);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user