work/book-api
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: work:a6719d57a392130cd4e945e55aeebdc56cf78b4b
Branches Tags
work:master
work:main
work:xiaoqiantx
..
compare: work:f8814cd44c242b434bf5eb243d8940bab8c41692
Branches Tags
work:master
work:main
work:xiaoqiantx

No commits in common. "a6719d57a392130cd4e945e55aeebdc56cf78b4b" and "f8814cd44c242b434bf5eb243d8940bab8c41692" have entirely different histories.
a6719d57a3 ... f8814cd44c

11 changed files with 17 additions and 53 deletions
Show Stats Expand all files Collapse all files

2
maku-framework/src/main/resources/auth.yml
View File

@ -14,6 +14,6 @@ auth:
- /maku/t_book/{id}
- /maku/t_book/{id}
- /user/login
- /maku/t_shopping_trolley/**
- /maku/t_shopping_trolley/aaa

7
maku-server/src/main/java/net/maku/maku/controller/TBookController.java
View File

@ -65,24 +65,27 @@ public class TBookController {
return Result.ok(entity);
}
@PostMapping("/collection")
@GetMapping("/collection")
@Operation(summary = "收藏图书")
public Result<String> setbookcollection(HttpServletRequest request, @RequestParam Integer bookId) {
public Result setbookcollection(HttpServletRequest request, @RequestParam Integer bookId) {
// 首先验证token的有效性，然后从Redis中获取用户信息
String token = request.getHeader("token");
if(token==null || token.isEmpty()){
return Result.error("token is error");
}
TUserEntity tUserEntity = (TUserEntity) redisCache.get(token);
Integer userId=tUserEntity.getId();
LocalDateTime currentTime = LocalDateTime.now();
ZoneId zoneId = ZoneId.systemDefault();
//DATE没有时区二localDateTime有时区,为了将 LocalDateTime 转换为 Date，你需要指定一个时区，因为 Date 是基于UTC的
// 将LocalDateTime转换为ZonedDateTime，然后转换为Instant，最后转换为Date
ZonedDateTime zdt = currentTime.atZone(zoneId);
Date date = Date.from(zdt.toInstant());
tBookCollectionService.save(userId,bookId,date);
return Result.ok("收藏图书成功");
}

17
maku-server/src/main/java/net/maku/maku/controller/TShoppingTrolleyController.java
View File

@ -63,16 +63,13 @@ public class TShoppingTrolleyController {
@GetMapping("page")
@Operation(summary = "分页")
@PreAuthorize("hasAuthority('maku:t_shopping_trolley:page')")
public Result<PageResult<TShoppingTrolleyVO>> page(@ParameterObject @Valid TShoppingTrolleyQuery query){
PageResult<TShoppingTrolleyVO> page = tShoppingTrolleyService.page(query);
return Result.ok(page);
}
@GetMapping("/list")
@Operation(summary = "列表")
public Result<List<TShoppingTrolleyEntity>> list(){
return Result.ok(tShoppingTrolleyService.list());
}
@GetMapping("{id}")
@Operation(summary = "信息")
// @PreAuthorize("hasAuthority('maku:t_shopping_trolley:info')")
@ -81,6 +78,7 @@ public class TShoppingTrolleyController {
return Result.ok(TShoppingTrolleyConvert.INSTANCE.convert(entity));
}
@PostMapping
@Operation(summary = "保存")
@PreAuthorize("hasAuthority('maku:t_shopping_trolley:save')")
@ -89,6 +87,7 @@ public class TShoppingTrolleyController {
return Result.ok();
}
@PutMapping
@Operation(summary = "修改")
@PreAuthorize("hasAuthority('maku:t_shopping_trolley:update')")
@ -101,15 +100,9 @@ public class TShoppingTrolleyController {
@DeleteMapping
@Operation(summary = "删除")
@PreAuthorize("hasAuthority('maku:t_shopping_trolley:delete')")
public Result<String> delete( @RequestBody List<Long> idList){
public Result<String> delete(@RequestBody List<Long> idList){
tShoppingTrolleyService.delete(idList);
return Result.ok();
}
@PostMapping("/add")
@Operation(summary = "添加购物车")
public Result<String> add(@RequestBody TShoppingTrolleyEntity entity){
tShoppingTrolleyService.add(entity);
return Result.ok("加入购物车成功");
}
}

1
maku-server/src/main/java/net/maku/maku/controller/TUserController.java
View File

@ -62,6 +62,7 @@ public class TUserController {
}
}
@PutMapping("/updateUser")
@Operation(summary = "修改")
public Result<TUserVO> updateUser(@RequestBody TUserVO vo){

2
maku-server/src/main/java/net/maku/maku/entity/TBookEntity.java
View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
*
*
*
* @author 阿沐 babamu@126.com
* @since 1.0.0 2024-07-16

2
maku-server/src/main/java/net/maku/maku/entity/TShoppingTrolleyEntity.java
View File

@ -22,8 +22,6 @@ public class TShoppingTrolleyEntity {
private Integer bookId;
private Integer number;
private Date createTime;
private Date updateTime;

3
maku-server/src/main/java/net/maku/maku/service/TShoppingTrolleyService.java
View File

@ -26,7 +26,4 @@ public interface TShoppingTrolleyService extends BaseService<TShoppingTrolleyEnt
void delete(List<Long> idList);
void save(Integer userId, Integer bookId, Date date);
TShoppingTrolleyEntity add(TShoppingTrolleyEntity entity);
}

1
maku-server/src/main/java/net/maku/maku/service/TUserService.java
View File

@ -28,5 +28,4 @@ public interface TUserService extends BaseService<TUserEntity> {
TUserVO updateUser(TUserVO vo);
}

8
maku-server/src/main/java/net/maku/maku/service/impl/TBookServiceImpl.java
View File

@ -9,7 +9,6 @@ import net.maku.framework.common.exception.ServerException;
import net.maku.framework.common.utils.PageResult;
import net.maku.framework.mybatis.service.impl.BaseServiceImpl;
import net.maku.maku.convert.TBookConvert;
import net.maku.maku.entity.TBookCommentEntity;
import net.maku.maku.entity.TBookEntity;
import net.maku.maku.query.TBookQuery;
import net.maku.maku.vo.TBookVO;
@ -66,14 +65,13 @@ public class TBookServiceImpl extends BaseServiceImpl<TBookDao, TBookEntity> imp
}
@Override
public TBookEntity getByName(String bookName) {
public List<TBookEntity> getByName(String bookName) {
LambdaQueryWrapper<TBookEntity> wrapper = Wrappers.lambdaQuery();
wrapper.like(TBookEntity::getBookName, bookName);
TBookEntity tBookEntity = baseMapper.selectOne(wrapper);
wrapper.eq(TBookEntity::getBookName, bookName);
List<TBookEntity> tBookEntity = baseMapper.selectList(wrapper);
if (ObjectUtil.isNull(tBookEntity)){
throw new ServerException("没有找到书籍");
}
tBookEntity.setBookCover("obhhi");
return tBookEntity;
}

25
maku-server/src/main/java/net/maku/maku/service/impl/TShoppingTrolleyServiceImpl.java
View File

@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import net.maku.framework.common.utils.PageResult;
import net.maku.framework.common.utils.Result;
import net.maku.framework.mybatis.service.impl.BaseServiceImpl;
import net.maku.maku.convert.TShoppingTrolleyConvert;
import net.maku.maku.entity.TBookCollectionEntity;
import net.maku.maku.entity.TShoppingTrolleyEntity;
import net.maku.maku.query.TShoppingTrolleyQuery;
import net.maku.maku.vo.TShoppingTrolleyVO;
@ -78,27 +78,4 @@ public class TShoppingTrolleyServiceImpl extends BaseServiceImpl<TShoppingTrolle
this.save(entity);
}
@Override
public TShoppingTrolleyEntity add(TShoppingTrolleyEntity entity) {
LambdaQueryWrapper<TShoppingTrolleyEntity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TShoppingTrolleyEntity::getUserId, entity.getUserId());
TShoppingTrolleyEntity existingEntity = baseMapper.selectOne(queryWrapper);
if (existingEntity != null) {
Integer number = existingEntity.getNumber();
if (number != null) {
existingEntity.setNumber(number + 1);
} else {
existingEntity.setNumber(1);
}
baseMapper.updateById(existingEntity);
return existingEntity;
} else {
TShoppingTrolleyEntity newEntity = new TShoppingTrolleyEntity();
newEntity.setUserId(entity.getUserId());
newEntity.setNumber(1);
baseMapper.insert(newEntity);
return newEntity;
}
}
}

2
maku-server/src/main/java/net/maku/maku/vo/TShoppingTrolleyVO.java
View File

@ -24,8 +24,6 @@ public class TShoppingTrolleyVO implements Serializable {
private Integer bookId;
private Integer number;
@JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
private Date createTime;