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

QueryWrapper全部升级LambdaQueryWrapper

Browse Source
This commit is contained in:
LIONCITYS\lioncity
2020-10-16 14:51:38 +08:00
parent 15b9680209
commit 4c89f55a05
44 changed files with 242 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java
View File

@ -41,7 +41,7 @@ public class VisitsServiceImpl extends BaseServiceImpl<VisitsMapper, Visits> imp
@Override
public void save() {
LocalDate localDate = LocalDate.now();
Visits visits = this.getOne(new QueryWrapper<Visits>().lambda()
Visits visits = this.getOne(new LambdaQueryWrapper<Visits>()
.eq(Visits::getDate,localDate.toString()));
if(visits == null){
visits = new Visits();
@ -56,7 +56,7 @@ public class VisitsServiceImpl extends BaseServiceImpl<VisitsMapper, Visits> imp
@Override
public void count(HttpServletRequest request) {
LocalDate localDate = LocalDate.now();
Visits visits = this.getOne(new QueryWrapper<Visits>().lambda()
Visits visits = this.getOne(new LambdaQueryWrapper<Visits>()
.eq(Visits::getDate,localDate.toString()));
visits.setPvCounts(visits.getPvCounts()+1);
long ipCounts = logMapper.findIp(localDate.toString(), localDate.plusDays(1).toString());
@ -68,7 +68,7 @@ public class VisitsServiceImpl extends BaseServiceImpl<VisitsMapper, Visits> imp
public Object get() {
Map<String,Object> map = new HashMap<>(4);
LocalDate localDate = LocalDate.now();
Visits visits = this.getOne(new QueryWrapper<Visits>().lambda()
Visits visits = this.getOne(new LambdaQueryWrapper<Visits>()
.eq(Visits::getDate,localDate.toString()));
List<Visits> list = visitsMapper.findAllVisits(localDate.minusDays(6).toString(),localDate.plusDays(1).toString());

4
yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java
View File

@ -17,7 +17,7 @@ import co.yixiang.modules.quartz.service.dto.QuartzJobQueryCriteria;
import co.yixiang.modules.quartz.service.dto.QuartzLogDto;
import co.yixiang.modules.quartz.service.dto.QuartzLogQueryCriteria;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@ -134,7 +134,7 @@ public class QuartzJobController {
@PutMapping(value = "/exec/{id}")
@PreAuthorize("@el.check('admin','timing:edit')")
public ResponseEntity<Object> execution(@PathVariable Long id){
quartzJobService.execution(quartzJobService.getOne(new QueryWrapper<QuartzJob>().eq("id",id)));
quartzJobService.execution(quartzJobService.getOne(new LambdaQueryWrapper<QuartzJob>().eq(QuartzJob::getId,id)));
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}

6
yshop-admin/src/main/java/co/yixiang/modules/system/rest/DeptController.java
View File

@ -16,7 +16,7 @@ import co.yixiang.modules.system.service.DeptService;
import co.yixiang.modules.system.service.dto.DeptDto;
import co.yixiang.modules.system.service.dto.DeptQueryCriteria;
import co.yixiang.utils.ValidationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.http.HttpStatus;
@ -98,7 +98,7 @@ public class DeptController {
if(resources.getId().equals(resources.getPid())) {
throw new BadRequestException("上级不能为自己");
}
Dept dept = deptService.getOne(new QueryWrapper<Dept>().lambda()
Dept dept = deptService.getOne(new LambdaQueryWrapper<Dept>()
.eq(Dept::getId,resources.getId()));
ValidationUtil.isNull( dept.getId(),"Dept","id",resources.getId());
resources.setId(dept.getId());
@ -115,7 +115,7 @@ public class DeptController {
List<Long> deptIds = new ArrayList<>();
for (Long id : ids) {
List<Dept> deptList = deptService.findByPid(id);
Dept dept = deptService.getOne(new QueryWrapper<Dept>().eq("id",id));
Dept dept = deptService.getOne(new LambdaQueryWrapper<Dept>().eq(Dept::getId,id));
if(null!=dept){
deptIds.add(dept.getId());
}

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

@ -17,7 +17,7 @@ import co.yixiang.modules.system.service.dto.MenuDto;
import co.yixiang.modules.system.service.dto.MenuQueryCriteria;
import co.yixiang.modules.system.service.dto.UserDto;
import co.yixiang.utils.SecurityUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.http.HttpStatus;
@ -131,7 +131,7 @@ public class MenuController {
Set<Menu> menuSet = new HashSet<>();
for (Long id : ids) {
List<Menu> menuList = menuService.findByPid(id);
menuSet.add(menuService.getOne(new QueryWrapper<Menu>().eq("id",id)));
menuSet.add(menuService.getOne(new LambdaQueryWrapper<Menu>().eq(Menu::getId,id)));
menuSet = menuService.getDeleteMenus(menuList, menuSet);
}
menuService.delete(menuSet);

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

@ -190,7 +190,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
for (Dept dept : deptList) {
deptDtos.add((DeptDto)generator.convert(deptList,DeptDto.class));
List<Dept> depts = Collections.singletonList(this.getOne(new QueryWrapper<Dept>().eq("id", dept.getId())));
List<Dept> depts = Collections.singletonList(this.getOne(new LambdaQueryWrapper<Dept>().eq("id", dept.getId())));
if(depts!=null && depts.size()!=0){
getDeleteDepts(depts, deptDtos);
}

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

@ -28,7 +28,7 @@ import co.yixiang.modules.system.service.mapper.RoleMapper;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.StringUtils;
import co.yixiang.utils.ValidationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
@ -306,7 +306,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
isExitHttp(resources);
Menu menu1 = this.getOne(new QueryWrapper<Menu>().lambda()
Menu menu1 = this.getOne(new LambdaQueryWrapper<Menu>()
.eq(Menu::getName,resources.getName()));
if(menu1 != null && !menu1.getId().equals(menu.getId())){
@ -318,7 +318,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
if(menuCount > 1) {
throw new YshopException("请保持菜单组件名称唯一");
}
menu1 = this.getOne(new QueryWrapper<Menu>().lambda()
menu1 = this.getOne(new LambdaQueryWrapper<Menu>()
.eq(Menu::getComponentName,resources.getComponentName()));
if(menu1 != null && !menu1.getId().equals(menu.getId())){
throw new EntityExistException(Menu.class,"componentName",resources.getComponentName());
@ -345,11 +345,11 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
@CacheEvict(allEntries = true)
public MenuDto create(Menu resources) {
isExitHttp(resources);
if(this.getOne(new QueryWrapper<Menu>().eq("name",resources.getName())) != null){
if(this.getOne(new LambdaQueryWrapper<Menu>().eq(Menu::getName,resources.getName())) != null){
throw new EntityExistException(Menu.class,"name",resources.getName());
}
if(StringUtils.isNotBlank(resources.getComponentName())){
if(this.getOne(new QueryWrapper<Menu>().eq("component_name",resources.getComponentName())) != null){
if(this.getOne(new LambdaQueryWrapper<Menu>().eq(Menu::getComponentName,resources.getComponentName())) != null){
throw new EntityExistException(Menu.class,"componentName",resources.getComponentName());
}
}

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

@ -30,7 +30,6 @@ import co.yixiang.modules.system.service.mapper.RoleMapper;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Pageable;
@ -190,11 +189,11 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
// @CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public RoleDto create(Role resources) {
if (this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName, resources.getName())) != null) {
if (this.getOne(new LambdaQueryWrapper<Role>().eq(Role::getName, resources.getName())) != null) {
throw new EntityExistException(Role.class, "username", resources.getName());
}
if (this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName, resources.getName())) != null) {
if (this.getOne(new LambdaQueryWrapper<Role>().eq(Role::getName, resources.getName())) != null) {
throw new EntityExistException(Role.class, "username", resources.getName());
}
this.save(resources);
@ -216,12 +215,12 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, Role> implement
public void update(Role resources) {
Role role = this.getById(resources.getId());
Role role1 = this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getName, resources.getName()));
Role role1 = this.getOne(new LambdaQueryWrapper<Role>().eq(Role::getName, resources.getName()));
if (role1 != null && !role1.getId().equals(role.getId())) {
throw new EntityExistException(Role.class, "username", resources.getName());
}
role1 = this.getOne(new QueryWrapper<Role>().lambda().eq(Role::getPermission, resources.getPermission()));
role1 = this.getOne(new LambdaQueryWrapper<Role>().eq(Role::getPermission, resources.getPermission()));
if (role1 != null && !role1.getId().equals(role.getId())) {
throw new EntityExistException(Role.class, "permission", resources.getPermission());
}

16
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java
View File

@ -32,7 +32,7 @@ import co.yixiang.utils.RedisUtils;
import co.yixiang.utils.SecurityUtils;
import co.yixiang.utils.StringUtils;
import co.yixiang.utils.ValidationUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Pageable;
@ -172,9 +172,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
*/
@Override
public void updateAvatar(MultipartFile multipartFile) {
User user = this.getOne(new QueryWrapper<User>().lambda()
User user = this.getOne(new LambdaQueryWrapper<User>()
.eq(User::getUsername,SecurityUtils.getUsername()));
UserAvatar userAvatar = userAvatarService.getOne(new QueryWrapper<UserAvatar>().lambda()
UserAvatar userAvatar = userAvatarService.getOne(new LambdaQueryWrapper<UserAvatar>()
.eq(UserAvatar::getId,user.getAvatarId()));
String oldPath = "";
if(userAvatar != null){
@ -217,12 +217,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
//@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public boolean create(User resources) {
User userName = this.getOne(new QueryWrapper<User>().lambda()
User userName = this.getOne(new LambdaQueryWrapper<User>()
.eq(User::getUsername,resources.getUsername()));
if(userName != null){
throw new EntityExistException(User.class,"username",resources.getUsername());
}
User userEmail = this.getOne(new QueryWrapper<User>().lambda()
User userEmail = this.getOne(new LambdaQueryWrapper<User>()
.eq(User::getEmail,resources.getEmail()));
if(userEmail != null){
throw new EntityExistException(User.class,"email",resources.getEmail());
@ -251,12 +251,12 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, User> imp
//@CacheEvict(allEntries = true)
@Transactional(rollbackFor = Exception.class)
public void update(User resources) {
User user = this.getOne(new QueryWrapper<User>().lambda()
User user = this.getOne(new LambdaQueryWrapper<User>()
.eq(User::getId,resources.getId()));
ValidationUtil.isNull(user.getId(),"User","id",resources.getId());
User user1 = this.getOne(new QueryWrapper<User>().lambda()
User user1 = this.getOne(new LambdaQueryWrapper<User>()
.eq(User::getUsername,resources.getUsername()));
User user2 = this.getOne(new QueryWrapper<User>().lambda()
User user2 = this.getOne(new LambdaQueryWrapper<User>()
.eq(User::getEmail,resources.getEmail()));
if(user1 !=null&&!user.getId().equals(user1.getId())){