cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

彻底移除jpa依赖，菜单管理添加缓存，优化页面刷新速度

Browse Source
This commit is contained in:
xuwenbo
2020-05-20 18:39:30 +08:00
parent 6277b5bdf4
commit 3a49e1b1c3
27 changed files with 46 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
yshop-system/src/main/java/co/yixiang/modules/system/rest/MenuController.java
View File

@ -104,23 +104,8 @@ public class MenuController {
if (resources.getId() != null) {
throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
}
Menu menu = menuService.getOne(new QueryWrapper<Menu>().eq("name",resources.getName()));
if(menu != null){
throw new EntityExistException(Menu.class,"name",resources.getName());
}
if(StringUtils.isNotBlank(resources.getComponentName())){
menu = menuService.getOne(new QueryWrapper<Menu>().eq("component_name",resources.getComponentName()));
if(menu != null){
throw new EntityExistException(Menu.class,"componentName",resources.getComponentName());
}
}
if(resources.getIFrame()){
String http = "http://", https = "https://";
if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) {
throw new BadRequestException("外链必须以http://或者https://开头");
}
}
return new ResponseEntity<>(menuService.save(resources),HttpStatus.CREATED);
return new ResponseEntity<>(menuService.create(resources),HttpStatus.CREATED);
}
@Log("修改菜单")

2
yshop-system/src/main/java/co/yixiang/modules/system/service/MenuService.java
View File

@ -104,4 +104,6 @@ public interface MenuService extends BaseService<Menu>{
* @param resources /
*/
void update(Menu resources);
Object create(Menu resources);
}

2
yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java
View File

@ -30,8 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;

2
yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java
View File

@ -30,8 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;

2
yshop-system/src/main/java/co/yixiang/modules/system/service/impl/JobServiceImpl.java
View File

@ -31,8 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;

33
yshop-system/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java
View File

@ -30,7 +30,9 @@ import co.yixiang.modules.system.service.MenuService;
import co.yixiang.modules.system.service.dto.MenuDto;
import co.yixiang.modules.system.service.dto.MenuQueryCriteria;
import co.yixiang.modules.system.service.mapper.MenuMapper;
import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@ -58,7 +60,7 @@ import java.util.stream.Collectors;
*/
@Service
@AllArgsConstructor
//@CacheConfig(cacheNames = "menu")
@CacheConfig(cacheNames = "menu")
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implements MenuService {
@ -67,7 +69,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
private final RoleMapper roleMapper;
@Override
//@Cacheable
@Cacheable
public Map<String, Object> queryAll(MenuQueryCriteria criteria, Pageable pageable) {
getPage(pageable);
PageInfo<Menu> page = new PageInfo<>(queryAll(criteria));
@ -79,7 +81,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
@Override
//@Cacheable
@Cacheable
public List<Menu> queryAll(MenuQueryCriteria criteria){
return baseMapper.selectList(QueryHelpPlus.getPredicate(Menu.class, criteria));
}
@ -204,6 +206,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
* @return /
*/
@Override
@Cacheable(key = "'tree'")
public Object getMenuTree(List<Menu> menus) {
List<Map<String,Object>> list = new LinkedList<>();
menus.forEach(menu -> {
@ -249,6 +252,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
* @return /
*/
@Override
@Cacheable(key = "'pid:'+#p0")
public List<Menu> findByPid(long pid) {
return menuMapper.findByPid(pid);
}
@ -276,6 +280,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
* @param menuSet /
*/
@Override
@CacheEvict(allEntries = true)
public void delete(Set<Menu> menuSet) {
for (Menu menu : menuSet) {
roleMapper.untiedMenu(menu.getId());
@ -289,6 +294,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
* @param resources /
*/
@Override
@CacheEvict(allEntries = true)
public void update(Menu resources) {
if(resources.getId().equals(resources.getPid())) {
throw new BadRequestException("上级不能为自己");
@ -329,4 +335,25 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
menu.setType(resources.getType());
this.saveOrUpdate(menu);
}
@Override
@CacheEvict(allEntries = true)
public MenuDto create(Menu resources) {
if(this.getOne(lambdaQuery().eq(Menu::getName,resources.getName())) != null){
throw new EntityExistException(Menu.class,"name",resources.getName());
}
if(StringUtils.isNotBlank(resources.getComponentName())){
if(this.getOne(lambdaQuery().eq(Menu::getComponentName,resources.getComponentName())) != null){
throw new EntityExistException(Menu.class,"componentName",resources.getComponentName());
}
}
if(resources.getIFrame()){
String http = "http://", https = "https://";
if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) {
throw new BadRequestException("外链必须以http://或者https://开头");
}
}
this.save(resources);
return generator.convert(resources,MenuDto.class);
}
}

3
yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java
View File

@ -44,9 +44,6 @@ import org.springframework.transaction.annotation.Transactional;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.QueryHelp;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;

2
yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java
View File

@ -30,8 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;

2
yshop-system/src/main/resources/template/generator/admin/ServiceImpl.ftl
View File

@ -41,8 +41,6 @@ import cn.hutool.core.util.IdUtil;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;

2
yshop-system/src/main/resources/template/generator/admin/ServiceImplP.ftl
View File

@ -46,8 +46,6 @@ import cn.hutool.core.util.IdUtil;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import co.yixiang.utils.PageUtil;
import co.yixiang.utils.QueryHelp;
import java.util.List;
import java.util.Map;
import java.io.IOException;