From c6618d41418643efb17f88cb9de0bedf5eb11063 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Thu, 14 May 2020 21:51:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90mp=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Controller.java => SysUserController.java} | 4 ++-- .../system/service/UserAvatarService.java | 2 ++ .../system/service/impl/DeptServiceImpl.java | 4 ++-- .../system/service/impl/RoleServiceImpl.java | 4 +--- ...rviceImpl.java => SysUserServiceImpl.java} | 23 ++++++++++++------- .../service/impl/UserAvatarServiceImpl.java | 6 +++++ .../{UserMapper.java => SysUserMapper.java} | 2 +- .../main/resources/config/application-dev.yml | 2 +- 8 files changed, 30 insertions(+), 17 deletions(-) rename yshop-system/src/main/java/co/yixiang/modules/system/rest/{UserController.java => SysUserController.java} (97%) rename yshop-system/src/main/java/co/yixiang/modules/system/service/impl/{UserServiceImpl.java => SysUserServiceImpl.java} (86%) rename yshop-system/src/main/java/co/yixiang/modules/system/service/mapper/{UserMapper.java => SysUserMapper.java} (96%) diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/SysUserController.java similarity index 97% rename from yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java rename to yshop-system/src/main/java/co/yixiang/modules/system/rest/SysUserController.java index b4c05299..83d76236 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/UserController.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/SysUserController.java @@ -55,7 +55,7 @@ import java.util.stream.Collectors; @Api(tags = "系统：用户管理") @RestController @RequestMapping("/api/users") -public class UserController { +public class SysUserController { @Value("${rsa.private_key}") private String privateKey; @@ -67,7 +67,7 @@ public class UserController { private final VerificationCodeService verificationCodeService; private final IGenerator generator; - public UserController(PasswordEncoder passwordEncoder, UserService userService, DataScope dataScope, DeptService deptService, RoleService roleService, VerificationCodeService verificationCodeService, IGenerator generator) { + public SysUserController(PasswordEncoder passwordEncoder, UserService userService, DataScope dataScope, DeptService deptService, RoleService roleService, VerificationCodeService verificationCodeService, IGenerator generator) { this.passwordEncoder = passwordEncoder; this.userService = userService; this.dataScope = dataScope; diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java index c59952a8..e7310772 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java @@ -45,4 +45,6 @@ public interface UserAvatarService extends BaseService{ * @throws IOException / */ void download(List all, HttpServletResponse response) throws IOException; + + UserAvatar saveFile(UserAvatar userAvatar); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java index 6f1649e2..530e3e15 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java @@ -161,9 +161,9 @@ public class DeptServiceImpl extends BaseServiceImpl implement */ @Override public Set getDeleteDepts(List deptList, Set deptDtos) { + for (Dept dept : deptList) { - //todo - //deptDtos.add(generator.convert(dept,deptDtos)); + deptDtos.add((DeptDto)generator.convert(deptList,DeptDto.class)); List depts = Collections.singletonList(this.getOne(new QueryWrapper().eq("id", dept.getId()))); if(depts!=null && depts.size()!=0){ getDeleteDepts(depts, deptDtos); diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java index f7890c50..92ca2a3d 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/RoleServiceImpl.java @@ -149,9 +149,7 @@ public class RoleServiceImpl extends BaseServiceImpl implement */ @Override public void updateMenu(Role resources, RoleDto roleDto) { - //Role role =generator.convert(resources,roleDto); - //todo - Role role = new Role(); + Role role =generator.convert(roleDto,Role.class); role.setMenus(resources.getMenus()); this.save(role); } diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java similarity index 86% rename from yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserServiceImpl.java rename to yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java index 22daf53c..2d5e5d9d 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/SysUserServiceImpl.java @@ -11,6 +11,7 @@ package co.yixiang.modules.system.service.impl; import co.yixiang.modules.system.domain.User; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.system.domain.UserAvatar; +import co.yixiang.modules.system.service.UserAvatarService; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,8 +22,7 @@ import co.yixiang.utils.FileUtil; import co.yixiang.modules.system.service.UserService; import co.yixiang.modules.system.service.dto.UserDto; import co.yixiang.modules.system.service.dto.UserQueryCriteria; -import co.yixiang.modules.system.service.mapper.UserMapper; -import lombok.AllArgsConstructor; +import co.yixiang.modules.system.service.mapper.SysUserMapper; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -48,16 +48,23 @@ import java.util.LinkedHashMap; * @date 2020-05-14 */ @Service -@AllArgsConstructor +//@AllArgsConstructor //@CacheConfig(cacheNames = "user") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class UserServiceImpl extends BaseServiceImpl implements UserService { +public class SysUserServiceImpl extends BaseServiceImpl implements UserService { @Value("${file.avatar}") private String avatar; private final IGenerator generator; - private final UserMapper userMapper; + private final SysUserMapper userMapper; + private final UserAvatarService userAvatarService; + + public SysUserServiceImpl(IGenerator generator, SysUserMapper userMapper, UserAvatarService userAvatarService) { + this.generator = generator; + this.userMapper = userMapper; + this.userAvatarService = userAvatarService; + } @Override //@Cacheable @@ -139,9 +146,9 @@ public class UserServiceImpl extends BaseServiceImpl implement } File file = FileUtil.upload(multipartFile, avatar); assert file != null; - //todo - //userAvatar = userAvatarService.save(new UserAvatar(userAvatar,file.getName(), file.getPath(), FileUtil.getSize(multipartFile.getSize()))); - user.setUserAvatar(userAvatar); + UserAvatar saveUserAvatar = new UserAvatar(userAvatar,file.getName(), file.getPath(), FileUtil.getSize(multipartFile.getSize())); + userAvatarService.save(saveUserAvatar); + user.setUserAvatar(saveUserAvatar); this.save(user); if(StringUtils.isNotBlank(oldPath)){ FileUtil.del(oldPath); diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java index 39052435..df6a76de 100644 --- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java +++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/UserAvatarServiceImpl.java @@ -87,4 +87,10 @@ public class UserAvatarServiceImpl extends BaseServiceImpl { +public interface SysUserMapper extends CoreMapper { /** * 修改密码 diff --git a/yshop-system/src/main/resources/config/application-dev.yml b/yshop-system/src/main/resources/config/application-dev.yml index ea421852..39c76abc 100644 --- a/yshop-system/src/main/resources/config/application-dev.yml +++ b/yshop-system/src/main/resources/config/application-dev.yml @@ -6,7 +6,7 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://localhost:3306/yxshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: root password: root