Skip to content

GitLab

Q
qk_backend
Commit 8d828fab authored by shiyu's avatar shiyu
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a0514228 43f35cbd
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 23 deletions
ch-dao/src/main/java/com/wwdz/ch/db/manager/FavoritesCoinsRelationDao.java → ch-dao/src/main/java/com/wwdz/ch/db/manager/FavoritesCoinsRelationManager.java
View file @ 8d828fab
......@@ -5,7 +5,7 @@ import com.wwdz.ch.db.domain.FavoritesCoinsRelation;
import java.util.List;
public interface FavoritesCoinsRelationDao {
public interface FavoritesCoinsRelationManager {
int add(FavoritesCoinsRelation record);
int batchAdd(List<FavoritesCoinsRelation> list);
int deleteByFavoritesId(Long favoritesId, List<Long> favoritesIds);
......
ch-dao/src/main/java/com/wwdz/ch/db/manager/FavoritesDao.java → ch-dao/src/main/java/com/wwdz/ch/db/manager/FavoritesManager.java
View file @ 8d828fab
......@@ -5,7 +5,7 @@ import com.wwdz.ch.db.domain.Favorites;
import java.util.List;
public interface FavoritesDao {
public interface FavoritesManager {
int add(Favorites record);
int delete(Long id);
int update(Favorites record);
......
ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/FavoritesCoinsRelationDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/FavoritesCoinsRelationManagerImpl.java
View file @ 8d828fab
......@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
import com.wwdz.ch.db.dao.FavoritesCoinsRelationMapper;
import com.wwdz.ch.db.domain.FavoritesCoinsRelation;
import com.wwdz.ch.db.domain.FavoritesCoinsRelationExample;
import com.wwdz.ch.db.manager.FavoritesCoinsRelationDao;
import com.wwdz.ch.db.manager.FavoritesCoinsRelationManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
......@@ -13,7 +13,7 @@ import org.springframework.util.CollectionUtils;
import java.util.List;
@Repository
public class FavoritesCoinsRelationDaoImpl implements FavoritesCoinsRelationDao {
public class FavoritesCoinsRelationManagerImpl implements FavoritesCoinsRelationManager {
@Autowired
private FavoritesCoinsRelationMapper favoritesCoinsRelationMapper;
......
ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/FavoritesDaoImpl.java → ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/FavoritesManagerImpl.java
View file @ 8d828fab
......@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
import com.wwdz.ch.db.dao.FavoritesMapper;
import com.wwdz.ch.db.domain.Favorites;
import com.wwdz.ch.db.domain.FavoritesExample;
import com.wwdz.ch.db.manager.FavoritesDao;
import com.wwdz.ch.db.manager.FavoritesManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
......@@ -15,7 +15,7 @@ import java.util.List;
import java.util.Objects;
@Repository
public class FavoritesDaoImpl implements FavoritesDao {
public class FavoritesManagerImpl implements FavoritesManager {
@Autowired
private FavoritesMapper favoritesMapper;
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/impl/FavoritesServiceImpl.java
View file @ 8d828fab
......@@ -3,8 +3,8 @@ package com.wwdz.ch.wx.service.impl;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.domain.Favorites;
import com.wwdz.ch.db.domain.FavoritesCoinsRelation;
import com.wwdz.ch.db.manager.FavoritesCoinsRelationDao;
import com.wwdz.ch.db.manager.FavoritesDao;
import com.wwdz.ch.db.manager.FavoritesCoinsRelationManager;
import com.wwdz.ch.db.manager.FavoritesManager;
import com.wwdz.ch.wx.entity.request.FavoritesRequestDto;
import com.wwdz.ch.wx.service.FavoritesService;
import org.apache.commons.collections.CollectionUtils;
......@@ -24,14 +24,14 @@ public class FavoritesServiceImpl implements FavoritesService {
private static final Logger logger = LoggerFactory.getLogger(FavoritesServiceImpl.class);
@Autowired
private FavoritesDao favoritesDao;
private FavoritesManager favoritesManager;
@Autowired
private FavoritesCoinsRelationDao favoritesCoinsRelationDao;
private FavoritesCoinsRelationManager favoritesCoinsRelationManager;
@Override
public Result page(FavoritesRequestDto dto) {
try {
return Result.success(favoritesDao.pageByUid(dto.getUid(), dto.getPage(), dto.getSize()));
return Result.success(favoritesManager.pageByUid(dto.getUid(), dto.getPage(), dto.getSize()));
} catch (Exception e) {
logger.error("查询收藏册列表失败，原因：" + e.getMessage(), e);
return Result.failed(-1, "查询收藏册列表失败");
......@@ -43,7 +43,7 @@ public class FavoritesServiceImpl implements FavoritesService {
public Result add(FavoritesRequestDto dto) {
try {
// 判断收藏册标题是否已存在
if (favoritesDao.isExisted(null, dto.getUid(), dto.getTitle())) {
if (favoritesManager.isExisted(null, dto.getUid(), dto.getTitle())) {
return Result.failed(-1, "收藏册的标题不能重复");
}
......@@ -56,7 +56,7 @@ public class FavoritesServiceImpl implements FavoritesService {
favorites.setAddTime(date);
favorites.setUpdateTime(date);
favorites.setDeleted(false);
favoritesDao.add(favorites);
favoritesManager.add(favorites);
return Result.success();
} catch (Exception e) {
logger.error("新增收藏册失败，原因：" + e.getMessage(), e);
......@@ -69,12 +69,12 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override
public Result update(FavoritesRequestDto dto) {
try {
Favorites favorites = favoritesDao.info(dto.getId());
Favorites favorites = favoritesManager.info(dto.getId());
if (Objects.isNull(favorites)) {
return Result.failed("数据异常，记录不存在");
}
// 判断收藏册标题是否已存在
if (favoritesDao.isExisted(dto.getId(), dto.getUid(), dto.getTitle())) {
if (favoritesManager.isExisted(dto.getId(), dto.getUid(), dto.getTitle())) {
return Result.failed("收藏册的标题不能重复");
}
......@@ -82,7 +82,7 @@ public class FavoritesServiceImpl implements FavoritesService {
favorites.setDescription(dto.getDescription());
favorites.setImages(dto.getImages());
favorites.setUpdateTime(new Date());
favoritesDao.update(favorites);
favoritesManager.update(favorites);
return Result.success();
} catch (Exception e) {
logger.error("新增收藏册失败，原因：" + e.getMessage(), e);
......@@ -94,7 +94,7 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override
public Result info(FavoritesRequestDto dto) {
try {
Favorites favorites = favoritesDao.info(dto.getId());
Favorites favorites = favoritesManager.info(dto.getId());
if (Objects.isNull(favorites)) {
return Result.failed("数据异常，记录不存在");
}
......@@ -109,7 +109,7 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override
public Result delete(FavoritesRequestDto dto) {
try {
List<FavoritesCoinsRelation> list = favoritesCoinsRelationDao.listByFavoritesId(dto.getId(), null);
List<FavoritesCoinsRelation> list = favoritesCoinsRelationManager.listByFavoritesId(dto.getId(), null);
if (CollectionUtils.isNotEmpty(list)) {
return Result.failed("收藏册内有藏品，清先移除藏品");
}
......@@ -117,10 +117,10 @@ public class FavoritesServiceImpl implements FavoritesService {
//TODO 删除该收藏册下用户创建的钱币
// 删除收藏册和钱币的关联
favoritesCoinsRelationDao.deleteByFavoritesId(dto.getId(), null);
favoritesCoinsRelationManager.deleteByFavoritesId(dto.getId(), null);
// 删除收藏册
favoritesDao.delete(dto.getId(), null);
favoritesManager.delete(dto.getId(), null);
return Result.success();
} catch (Exception e) {
logger.error("批量删除收藏册失败，原因：" + e.getMessage(), e);
......@@ -133,14 +133,14 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override
public Result batchDelete(FavoritesRequestDto dto) {
try {
List<FavoritesCoinsRelation> list = favoritesCoinsRelationDao.listByFavoritesId(null, dto.getIds());
List<FavoritesCoinsRelation> list = favoritesCoinsRelationManager.listByFavoritesId(null, dto.getIds());
//TODO 删除该收藏册下用户创建的钱币
// 删除收藏册和钱币的关联
favoritesCoinsRelationDao.deleteByFavoritesId(null, dto.getIds());
favoritesCoinsRelationManager.deleteByFavoritesId(null, dto.getIds());
// 删除收藏册
favoritesDao.delete(null, dto.getIds());
favoritesManager.delete(null, dto.getIds());
return Result.success();
} catch (Exception e) {
logger.error("批量删除收藏册失败，原因：" + e.getMessage(), e);
......
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