From 25c155c60ae53f4b4c27d4179ef7eb8a270d25dc Mon Sep 17 00:00:00 2001 From: wu Date: Mon, 27 Nov 2023 13:27:48 +0800 Subject: [PATCH] bug fix --- .../java/com/ruoyi/system/domain/BPoster.java | 117 +++----- .../ruoyi/system/mapper/BShanghuMapper.java | 19 +- .../system/service/IBShanghuService.java | 16 +- .../service/impl/BPosterServiceImpl.java | 12 +- .../service/impl/BShanghuServiceImpl.java | 25 ++ .../controller/system/SysLoginController.java | 54 ++-- .../system/SysRegisterController.java | 19 +- .../controller/system/SysUserController.java | 8 - .../resources/mapper/netEwm/BNetMapper.xml | 2 +- .../mapper/netEwm/BShanghuMapper.xml | 15 +- .../web/service/SysPermissionService.java | 52 ++-- .../web/service/SysRegisterService.java | 92 ++++--- .../com/ruoyi/system/domain/SysShanghu.java | 131 +++++++++ .../ruoyi/system/mapper/SysShanghuMapper.java | 23 ++ .../service/impl/SysUserServiceImpl.java | 254 +++++++----------- .../mapper/system/SysShanghuMapper.xml | 53 ++++ 16 files changed, 520 insertions(+), 372 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysShanghu.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysShanghuMapper.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysShanghuMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BPoster.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BPoster.java index 9ac0855..f09cd69 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BPoster.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BPoster.java @@ -1,116 +1,65 @@ package com.ruoyi.system.domain; -import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import java.util.List; /** * 广告对象 b_poster - * + * * @author ruoyi * @date 2023-11-21 */ -public class BPoster extends BaseEntity -{ +@Data +@EqualsAndHashCode(callSuper = true) +public class BPoster extends BaseEntity { private static final long serialVersionUID = 1L; - /** $column.columnComment */ + /** + * $column.columnComment + */ private Long id; - /** 广告名称 */ + /** + * 广告名称 + */ @Excel(name = "广告名称") private String posterName; - /** 有效起始时间 */ + /** + * 有效起始时间 + */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "有效起始时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "有效起始时间" , width = 30, dateFormat = "yyyy-MM-dd") private Date startTime; - /** 有效结束时间 */ + /** + * 有效结束时间 + */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "有效结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "有效结束时间" , width = 30, dateFormat = "yyyy-MM-dd") private Date endTime; - /** 视频封面 */ + /** + * 视频封面 + */ @Excel(name = "视频封面") private String videoLogo; - /** 视频路径 */ + /** + * 视频路径 + */ @Excel(name = "视频路径") private String videoPath; - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - public void setPosterName(String posterName) - { - this.posterName = posterName; - } - - public String getPosterName() - { - return posterName; - } - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStartTime() - { - return startTime; - } - public void setEndTime(Date endTime) - { - this.endTime = endTime; - } - - public Date getEndTime() - { - return endTime; - } - public void setVideoLogo(String videoLogo) - { - this.videoLogo = videoLogo; - } - - public String getVideoLogo() - { - return videoLogo; - } - public void setVideoPath(String videoPath) - { - this.videoPath = videoPath; - } - - public String getVideoPath() - { - return videoPath; - } + /** + * 广告关联的商户id + */ + private List shanghuIdList; - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("posterName", getPosterName()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("videoLogo", getVideoLogo()) - .append("videoPath", getVideoPath()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BShanghuMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BShanghuMapper.java index b64779a..0810385 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BShanghuMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/BShanghuMapper.java @@ -63,8 +63,8 @@ public interface BShanghuMapper { /** * 为商户批量填充广告 * - * @param posterId 广告id - * @param list 商户id集合 + * @param posterId 广告id + * @param list 商户id集合 */ void editPostIdByIds(@Param("posterId") Long posterId, @Param("list") List list); @@ -76,4 +76,19 @@ public interface BShanghuMapper { * @param shanghuName 商户名称 */ void editPostIdByReq(@Param("posterId") Long posterId, @Param("shanghuCity") String shanghuCity, @Param("shanghuName") String shanghuName); + + /** + * 根据广告id查询商户id集合 + * + * @param id 广告id + * @return 商户id集合 + */ + List findIdByPosterId(@Param("id") Long id); + + /** + * 根据手机号查询商户 + * @param phoneNumber 手机号 + * @return 商户信息 + */ + BShanghu findByPhone(@Param("phoneNumber") String phoneNumber); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBShanghuService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBShanghuService.java index d9fd3b7..e7fcc62 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBShanghuService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBShanghuService.java @@ -1,6 +1,6 @@ package com.ruoyi.system.service; -import com.ruoyi.system.domain.BNet; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.system.domain.BShanghu; import java.util.List; @@ -77,4 +77,18 @@ public interface IBShanghuService { */ void editPostIdByReq(Long posterId, String shanghuCity, String shanghuName); + /** + * 根据广告id查询商户id集合 + * + * @param id 广告id + * @return 商户id集合 + */ + List findIdByPosterId(Long id); + + /** + * 根据手机号查询商户 + * @param phoneNumber 手机号 + * @return 商户信息 + */ + BShanghu findByPhone(String phoneNumber); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BPosterServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BPosterServiceImpl.java index 0545235..a338e79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BPosterServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BPosterServiceImpl.java @@ -38,7 +38,13 @@ public class BPosterServiceImpl implements IBPosterService { */ @Override public BPoster selectBPosterById(Long id) { - return bPosterMapper.selectBPosterById(id); + BPoster bPoster = bPosterMapper.selectBPosterById(id); + // 查询广告关联的商户id + if (BeanUtil.isNotEmpty(bPoster)) { + List shanghuIdList = shanghuService.findIdByPosterId(bPoster.getId()); + bPoster.setShanghuIdList(shanghuIdList); + } + return bPoster; } /** @@ -113,8 +119,8 @@ public class BPosterServiceImpl implements IBPosterService { shanghuService.editPostIdByIds(req.getPosterId(), req.getShanghuIds()); return; } - if (StrUtil.isNotEmpty(req.getShanghuCity())||StrUtil.isNotEmpty(req.getShanghuName())) { - shanghuService.editPostIdByReq(req.getPosterId(),req.getShanghuCity(),req.getShanghuName()); + if (StrUtil.isNotEmpty(req.getShanghuCity()) || StrUtil.isNotEmpty(req.getShanghuName())) { + shanghuService.editPostIdByReq(req.getPosterId(), req.getShanghuCity(), req.getShanghuName()); return; } throw new ServiceException("参数错误"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BShanghuServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BShanghuServiceImpl.java index b9ce9f8..5552d14 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BShanghuServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BShanghuServiceImpl.java @@ -77,6 +77,9 @@ public class BShanghuServiceImpl implements IBShanghuService { if (!userService.checkUserNameUnique(user)) { throw new ServiceException("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); } + Long[] roleIds = new Long[1]; + roleIds[0] = 2L; + user.setRoleIds(roleIds); userService.insertUser(user); return bShanghuMapper.insertBShanghu(bShanghu); } @@ -145,4 +148,26 @@ public class BShanghuServiceImpl implements IBShanghuService { public void editPostIdByReq(Long posterId, String shanghuCity, String shanghuName) { bShanghuMapper.editPostIdByReq(posterId, shanghuCity, shanghuName); } + + /** + * 根据广告id查询商户id集合 + * + * @param id 广告id + * @return 商户id集合 + */ + @Override + public List findIdByPosterId(Long id) { + return bShanghuMapper.findIdByPosterId(id); + } + + /** + * 根据手机号查询商户 + * + * @param phoneNumber 手机号 + * @return 商户信息 + */ + @Override + public BShanghu findByPhone(String phoneNumber) { + return bShanghuMapper.findByPhone(phoneNumber); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index d959a17..58c1cf1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -1,12 +1,5 @@ package com.ruoyi.web.controller.system; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysMenu; @@ -15,34 +8,45 @@ import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.framework.web.service.SysLoginService; import com.ruoyi.framework.web.service.SysPermissionService; +import com.ruoyi.system.domain.BShanghu; +import com.ruoyi.system.service.IBShanghuService; import com.ruoyi.system.service.ISysMenuService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Set; /** * 登录验证 - * + * * @author ruoyi */ @RestController -public class SysLoginController -{ - @Autowired +public class SysLoginController { + @Resource private SysLoginService loginService; - @Autowired + @Resource private ISysMenuService menuService; - @Autowired + @Resource private SysPermissionService permissionService; + @Resource + private IBShanghuService shanghuService; + /** * 登录方法 - * + * * @param loginBody 登录信息 * @return 结果 */ @PostMapping("/login") - public AjaxResult login(@RequestBody LoginBody loginBody) - { + public AjaxResult login(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), @@ -53,32 +57,32 @@ public class SysLoginController /** * 获取用户信息 - * + * * @return 用户信息 */ @GetMapping("getInfo") - public AjaxResult getInfo() - { + public AjaxResult getInfo() { SysUser user = SecurityUtils.getLoginUser().getUser(); // 角色集合 Set roles = permissionService.getRolePermission(user); // 权限集合 Set permissions = permissionService.getMenuPermission(user); + BShanghu shanghu = shanghuService.findByPhone(user.getUserName()); AjaxResult ajax = AjaxResult.success(); - ajax.put("user", user); - ajax.put("roles", roles); - ajax.put("permissions", permissions); + ajax.put("user" , user); + ajax.put("roles" , roles); + ajax.put("shanghu" , shanghu); + ajax.put("permissions" , permissions); return ajax; } /** * 获取路由信息 - * + * * @return 路由信息 */ @GetMapping("getRouters") - public AjaxResult getRouters() - { + public AjaxResult getRouters() { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuTreeByUserId(userId); return AjaxResult.success(menuService.buildMenus(menus)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index fe19249..916c954 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -1,24 +1,23 @@ package com.ruoyi.web.controller.system; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.model.RegisterBody; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.web.service.SysRegisterService; import com.ruoyi.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; /** * 注册验证 - * + * * @author ruoyi */ @RestController -public class SysRegisterController extends BaseController -{ +public class SysRegisterController extends BaseController { @Autowired private SysRegisterService registerService; @@ -26,10 +25,8 @@ public class SysRegisterController extends BaseController private ISysConfigService configService; @PostMapping("/register") - public AjaxResult register(@RequestBody RegisterBody user) - { - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) - { + public AjaxResult register(@RequestBody RegisterBody user) { + if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return error("当前系统没有开启注册功能！"); } String msg = registerService.register(user); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index d74df55..e03dabd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -129,14 +129,6 @@ public class SysUserController extends BaseController { } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } - // 添加商户 - BShanghu shangHu = new BShanghu(); - shangHu.setAddress(user.getAddress()); - shangHu.setPosName(user.getPosName()); - shangHu.setPhoneNumber(user.getUserName()); - shangHu.setLinkMan(user.getNickName()); - - bShanghuService.insertBShanghu(shangHu); user.setCreateBy(getUsername()); if (StringUtils.isEmpty(user.getPassword())) { user.setPassword("123456"); diff --git a/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml b/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml index 38c7fe4..850b2d6 100644 --- a/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/netEwm/BNetMapper.xml @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, shanghu_id, wifi_name, wifi_pass, create_by, create_time, update_by, update_time, remark from b_net + select id,net_name, shanghu_id, wifi_name, wifi_pass, create_by, create_time, update_by, update_time, remark from b_net - + + + + + insert into b_shanghu diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java index d1fb4ed..9928aae 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java @@ -1,24 +1,24 @@ package com.ruoyi.framework.web.service; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.ISysRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * 用户权限处理 - * + * * @author ruoyi */ @Component -public class SysPermissionService -{ +public class SysPermissionService { @Autowired private ISysRoleService roleService; @@ -27,20 +27,16 @@ public class SysPermissionService /** * 获取角色数据权限 - * + * * @param user 用户信息 * @return 角色权限信息 */ - public Set getRolePermission(SysUser user) - { + public Set getRolePermission(SysUser user) { Set roles = new HashSet(); // 管理员拥有所有权限 - if (user.isAdmin()) - { + if (user.isAdmin()) { roles.add("admin"); - } - else - { + } else { roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId())); } return roles; @@ -48,33 +44,25 @@ public class SysPermissionService /** * 获取菜单数据权限 - * + * * @param user 用户信息 * @return 菜单权限信息 */ - public Set getMenuPermission(SysUser user) - { + public Set getMenuPermission(SysUser user) { Set perms = new HashSet(); // 管理员拥有所有权限 - if (user.isAdmin()) - { + if (user.isAdmin()) { perms.add("*:*:*"); - } - else - { + } else { List roles = user.getRoles(); - if (!CollectionUtils.isEmpty(roles)) - { + if (!CollectionUtils.isEmpty(roles)) { // 多角色设置permissions属性，以便数据权限匹配权限 - for (SysRole role : roles) - { + for (SysRole role : roles) { Set rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId()); role.setPermissions(rolePerms); perms.addAll(rolePerms); } - } - else - { + } else { perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId())); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java index f2afe31..fe69e17 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java @@ -1,7 +1,5 @@ package com.ruoyi.framework.web.service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; @@ -15,75 +13,78 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.manager.AsyncManager; import com.ruoyi.framework.manager.factory.AsyncFactory; +import com.ruoyi.system.domain.SysShanghu; +import com.ruoyi.system.mapper.SysShanghuMapper; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; /** * 注册校验方法 - * + * * @author ruoyi */ @Component -public class SysRegisterService -{ - @Autowired +public class SysRegisterService { + + @Resource private ISysUserService userService; - @Autowired + @Resource private ISysConfigService configService; - @Autowired + @Resource private RedisCache redisCache; + @Resource + private SysShanghuMapper shanghuMapper; + /** * 注册 */ - public String register(RegisterBody registerBody) - { - String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword(); + public String register(RegisterBody registerBody) { + String msg = "" , username = registerBody.getUsername(), password = registerBody.getPassword(); SysUser sysUser = new SysUser(); sysUser.setUserName(username); // 验证码开关 boolean captchaEnabled = configService.selectCaptchaEnabled(); - if (captchaEnabled) - { + if (captchaEnabled) { validateCaptcha(username, registerBody.getCode(), registerBody.getUuid()); } - if (StringUtils.isEmpty(username)) - { + if (StringUtils.isEmpty(username)) { msg = "用户名不能为空"; - } - else if (StringUtils.isEmpty(password)) - { + } else if (StringUtils.isEmpty(password)) { msg = "用户密码不能为空"; - } - else if (username.length() < UserConstants.USERNAME_MIN_LENGTH - || username.length() > UserConstants.USERNAME_MAX_LENGTH) - { + } else if (username.length() < UserConstants.USERNAME_MIN_LENGTH + || username.length() > UserConstants.USERNAME_MAX_LENGTH) { msg = "账户长度必须在2到20个字符之间"; - } - else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH - || password.length() > UserConstants.PASSWORD_MAX_LENGTH) - { + } else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH + || password.length() > UserConstants.PASSWORD_MAX_LENGTH) { msg = "密码长度必须在5到20个字符之间"; - } - else if (!userService.checkUserNameUnique(sysUser)) - { + } else if (!userService.checkUserNameUnique(sysUser)) { msg = "保存用户'" + username + "'失败，注册账号已存在"; - } - else - { + } else { sysUser.setNickName(username); sysUser.setPassword(SecurityUtils.encryptPassword(password)); - boolean regFlag = userService.registerUser(sysUser); - if (!regFlag) - { + Long[] roleIds = new Long[1]; + roleIds[0] = 2L; + sysUser.setRoleIds(roleIds); + boolean regFlag = userService.insertUser(sysUser) > 0; +// boolean regFlag = userService.registerUser(sysUser); + if (!regFlag) { msg = "注册失败,请联系系统管理人员"; - } - else - { + } else { + // 添加商户 + SysShanghu shangHu = new SysShanghu(); + shangHu.setAddress(sysUser.getAddress()); + shangHu.setPosName(sysUser.getPosName()); + shangHu.setPhoneNumber(sysUser.getUserName()); + shangHu.setLinkMan(sysUser.getNickName()); + shanghuMapper.insertBShanghu(shangHu); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"))); } } @@ -92,23 +93,20 @@ public class SysRegisterService /** * 校验验证码 - * + * * @param username 用户名 - * @param code 验证码 - * @param uuid 唯一标识 + * @param code 验证码 + * @param uuid 唯一标识 * @return 结果 */ - public void validateCaptcha(String username, String code, String uuid) - { + public void validateCaptcha(String username, String code, String uuid) { String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, ""); String captcha = redisCache.getCacheObject(verifyKey); redisCache.deleteObject(verifyKey); - if (captcha == null) - { + if (captcha == null) { throw new CaptchaExpireException(); } - if (!code.equalsIgnoreCase(captcha)) - { + if (!code.equalsIgnoreCase(captcha)) { throw new CaptchaException(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysShanghu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysShanghu.java new file mode 100644 index 0000000..95bc8fb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysShanghu.java @@ -0,0 +1,131 @@ +package com.ruoyi.system.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 商户对象 b_shanghu + * + * @author ruoyi + * @date 2023-11-21 + */ +public class SysShanghu extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * $column.columnComment + */ + private Long id; + + /** + * 商户名称 + */ + @Excel(name = "商户名称") + private String posName; + + /** + * 手机号 + */ + @Excel(name = "手机号") + private String phoneNumber; + + /** + * 联系人 + */ + @Excel(name = "联系人") + private String linkMan; + + /** + * 城市 + */ + @Excel(name = "城市") + private String city; + + /** + * 地址信息 + */ + @Excel(name = "地址信息") + private String address; + + /** + * 广告标识 + */ + @Excel(name = "广告标识") + private Long posterId; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getPosName() { + return posName; + } + + public void setPosName(String posName) { + this.posName = posName; + } + + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public String getLinkMan() { + return linkMan; + } + + public void setLinkMan(String linkMan) { + this.linkMan = linkMan; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public Long getPosterId() { + return posterId; + } + + public void setPosterId(Long posterId) { + this.posterId = posterId; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("posName", getPosName()) + .append("phoneNumber", getPhoneNumber()) + .append("linkMan", getLinkMan()) + .append("city", getCity()) + .append("address", getAddress()) + .append("posterId", getPosterId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysShanghuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysShanghuMapper.java new file mode 100644 index 0000000..09389c8 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysShanghuMapper.java @@ -0,0 +1,23 @@ +package com.ruoyi.system.mapper; + +import com.ruoyi.system.domain.SysShanghu; + +/** + * 商户Mapper接口 + * + * @author ruoyi + * @date 2023-11-21 + */ +public interface SysShanghuMapper { + + + /** + * 新增商户 + * + * @param bShanghu 商户 + * @return 结果 + */ + int insertBShanghu(SysShanghu bShanghu); + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index b371060..ff35d0a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,15 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import javax.validation.Validator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysRole; @@ -29,113 +19,109 @@ import com.ruoyi.system.mapper.SysUserPostMapper; import com.ruoyi.system.mapper.SysUserRoleMapper; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import javax.validation.Validator; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; /** * 用户 业务层处理 - * + * * @author ruoyi */ @Service -public class SysUserServiceImpl implements ISysUserService -{ +public class SysUserServiceImpl implements ISysUserService { private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); - + @Autowired + protected Validator validator; @Autowired private SysUserMapper userMapper; - @Autowired private SysRoleMapper roleMapper; - @Autowired private SysPostMapper postMapper; - @Autowired private SysUserRoleMapper userRoleMapper; - @Autowired private SysUserPostMapper userPostMapper; - @Autowired private ISysConfigService configService; - @Autowired - protected Validator validator; - /** * 根据条件分页查询用户列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUserList(SysUser user) - { + @DataScope(deptAlias = "d" , userAlias = "u") + public List selectUserList(SysUser user) { return userMapper.selectUserList(user); } /** * 根据条件分页查询已分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectAllocatedList(SysUser user) - { + @DataScope(deptAlias = "d" , userAlias = "u") + public List selectAllocatedList(SysUser user) { return userMapper.selectAllocatedList(user); } /** * 根据条件分页查询未分配用户角色列表 - * + * * @param user 用户信息 * @return 用户信息集合信息 */ @Override - @DataScope(deptAlias = "d", userAlias = "u") - public List selectUnallocatedList(SysUser user) - { + @DataScope(deptAlias = "d" , userAlias = "u") + public List selectUnallocatedList(SysUser user) { return userMapper.selectUnallocatedList(user); } /** * 通过用户名查询用户 - * + * * @param userName 用户名 * @return 用户对象信息 */ @Override - public SysUser selectUserByUserName(String userName) - { + public SysUser selectUserByUserName(String userName) { return userMapper.selectUserByUserName(userName); } /** * 通过用户ID查询用户 - * + * * @param userId 用户ID * @return 用户对象信息 */ @Override - public SysUser selectUserById(Long userId) - { + public SysUser selectUserById(Long userId) { return userMapper.selectUserById(userId); } /** * 查询用户所属角色组 - * + * * @param userName 用户名 * @return 结果 */ @Override - public String selectUserRoleGroup(String userName) - { + public String selectUserRoleGroup(String userName) { List list = roleMapper.selectRolesByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { + if (CollectionUtils.isEmpty(list)) { return StringUtils.EMPTY; } return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); @@ -143,16 +129,14 @@ public class SysUserServiceImpl implements ISysUserService /** * 查询用户所属岗位组 - * + * * @param userName 用户名 * @return 结果 */ @Override - public String selectUserPostGroup(String userName) - { + public String selectUserPostGroup(String userName) { List list = postMapper.selectPostsByUserName(userName); - if (CollectionUtils.isEmpty(list)) - { + if (CollectionUtils.isEmpty(list)) { return StringUtils.EMPTY; } return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); @@ -160,17 +144,15 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户名称是否唯一 - * + * * @param user 用户信息 * @return 结果 */ @Override - public boolean checkUserNameUnique(SysUser user) - { + public boolean checkUserNameUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); SysUser info = userMapper.checkUserNameUnique(user.getUserName()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -183,12 +165,10 @@ public class SysUserServiceImpl implements ISysUserService * @return */ @Override - public boolean checkPhoneUnique(SysUser user) - { + public boolean checkPhoneUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -201,12 +181,10 @@ public class SysUserServiceImpl implements ISysUserService * @return */ @Override - public boolean checkEmailUnique(SysUser user) - { + public boolean checkEmailUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); SysUser info = userMapper.checkEmailUnique(user.getEmail()); - if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) - { + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; @@ -214,33 +192,28 @@ public class SysUserServiceImpl implements ISysUserService /** * 校验用户是否允许操作 - * + * * @param user 用户信息 */ @Override - public void checkUserAllowed(SysUser user) - { - if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) - { + public void checkUserAllowed(SysUser user) { + if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) { throw new ServiceException("不允许操作超级管理员用户"); } } /** * 校验用户是否有数据权限 - * + * * @param userId 用户id */ @Override - public void checkUserDataScope(Long userId) - { - if (!SysUser.isAdmin(SecurityUtils.getUserId())) - { + public void checkUserDataScope(Long userId) { + if (!SysUser.isAdmin(SecurityUtils.getUserId())) { SysUser user = new SysUser(); user.setUserId(userId); List users = SpringUtils.getAopProxy(this).selectUserList(user); - if (StringUtils.isEmpty(users)) - { + if (StringUtils.isEmpty(users)) { throw new ServiceException("没有权限访问用户数据！"); } } @@ -248,14 +221,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增保存用户信息 - * + * * @param user 用户信息 * @return 结果 */ @Override @Transactional - public int insertUser(SysUser user) - { + public int insertUser(SysUser user) { // 新增用户信息 int rows = userMapper.insertUser(user); // 新增用户岗位关联 @@ -267,26 +239,24 @@ public class SysUserServiceImpl implements ISysUserService /** * 注册用户信息 - * + * * @param user 用户信息 * @return 结果 */ @Override - public boolean registerUser(SysUser user) - { + public boolean registerUser(SysUser user) { return userMapper.insertUser(user) > 0; } /** * 修改保存用户信息 - * + * * @param user 用户信息 * @return 结果 */ @Override @Transactional - public int updateUser(SysUser user) - { + public int updateUser(SysUser user) { Long userId = user.getUserId(); // 删除用户与角色关联 userRoleMapper.deleteUserRoleByUserId(userId); @@ -301,104 +271,94 @@ public class SysUserServiceImpl implements ISysUserService /** * 用户授权角色 - * - * @param userId 用户ID + * + * @param userId 用户ID * @param roleIds 角色组 */ @Override @Transactional - public void insertUserAuth(Long userId, Long[] roleIds) - { + public void insertUserAuth(Long userId, Long[] roleIds) { userRoleMapper.deleteUserRoleByUserId(userId); insertUserRole(userId, roleIds); } /** * 修改用户状态 - * + * * @param user 用户信息 * @return 结果 */ @Override - public int updateUserStatus(SysUser user) - { + public int updateUserStatus(SysUser user) { return userMapper.updateUser(user); } /** * 修改用户基本信息 - * + * * @param user 用户信息 * @return 结果 */ @Override - public int updateUserProfile(SysUser user) - { + public int updateUserProfile(SysUser user) { return userMapper.updateUser(user); } /** * 修改用户头像 - * + * * @param userName 用户名 - * @param avatar 头像地址 + * @param avatar 头像地址 * @return 结果 */ @Override - public boolean updateUserAvatar(String userName, String avatar) - { + public boolean updateUserAvatar(String userName, String avatar) { return userMapper.updateUserAvatar(userName, avatar) > 0; } /** * 重置用户密码 - * + * * @param user 用户信息 * @return 结果 */ @Override - public int resetPwd(SysUser user) - { + public int resetPwd(SysUser user) { return userMapper.updateUser(user); } /** * 重置用户密码 - * + * * @param userName 用户名 * @param password 密码 * @return 结果 */ @Override - public int resetUserPwd(String userName, String password) - { + public int resetUserPwd(String userName, String password) { return userMapper.resetUserPwd(userName, password); } /** * 新增用户角色信息 - * + * * @param user 用户对象 */ - public void insertUserRole(SysUser user) - { + public void insertUserRole(SysUser user) { this.insertUserRole(user.getUserId(), user.getRoleIds()); } /** * 新增用户岗位信息 - * + * * @param user 用户对象 */ - public void insertUserPost(SysUser user) - { + public void insertUserPost(SysUser user) { Long[] posts = user.getPostIds(); - if (StringUtils.isNotEmpty(posts)) - { + if (StringUtils.isNotEmpty(posts)) { // 新增用户与岗位管理 List list = new ArrayList(posts.length); - for (Long postId : posts) - { + for (Long postId : posts) { SysUserPost up = new SysUserPost(); up.setUserId(user.getUserId()); up.setPostId(postId); @@ -410,18 +370,15 @@ public class SysUserServiceImpl implements ISysUserService /** * 新增用户角色信息 - * - * @param userId 用户ID + * + * @param userId 用户ID * @param roleIds 角色组 */ - public void insertUserRole(Long userId, Long[] roleIds) - { - if (StringUtils.isNotEmpty(roleIds)) - { + public void insertUserRole(Long userId, Long[] roleIds) { + if (StringUtils.isNotEmpty(roleIds)) { // 新增用户与角色管理 List list = new ArrayList(roleIds.length); - for (Long roleId : roleIds) - { + for (Long roleId : roleIds) { SysUserRole ur = new SysUserRole(); ur.setUserId(userId); ur.setRoleId(roleId); @@ -433,14 +390,13 @@ public class SysUserServiceImpl implements ISysUserService /** * 通过用户ID删除用户 - * + * * @param userId 用户ID * @return 结果 */ @Override @Transactional - public int deleteUserById(Long userId) - { + public int deleteUserById(Long userId) { // 删除用户与角色关联 userRoleMapper.deleteUserRoleByUserId(userId); // 删除用户与岗位表 @@ -450,16 +406,14 @@ public class SysUserServiceImpl implements ISysUserService /** * 批量删除用户信息 - * + * * @param userIds 需要删除的用户ID * @return 结果 */ @Override @Transactional - public int deleteUserByIds(Long[] userIds) - { - for (Long userId : userIds) - { + public int deleteUserByIds(Long[] userIds) { + for (Long userId : userIds) { checkUserAllowed(new SysUser(userId)); checkUserDataScope(userId); } @@ -472,17 +426,15 @@ public class SysUserServiceImpl implements ISysUserService /** * 导入用户数据 - * - * @param userList 用户数据列表 + * + * @param userList 用户数据列表 * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据 - * @param operName 操作用户 + * @param operName 操作用户 * @return 结果 */ @Override - public String importUser(List userList, Boolean isUpdateSupport, String operName) - { - if (StringUtils.isNull(userList) || userList.size() == 0) - { + public String importUser(List userList, Boolean isUpdateSupport, String operName) { + if (StringUtils.isNull(userList) || userList.size() == 0) { throw new ServiceException("导入用户数据不能为空！"); } int successNum = 0; @@ -490,23 +442,18 @@ public class SysUserServiceImpl implements ISysUserService StringBuilder successMsg = new StringBuilder(); StringBuilder failureMsg = new StringBuilder(); String password = configService.selectConfigByKey("sys.user.initPassword"); - for (SysUser user : userList) - { - try - { + for (SysUser user : userList) { + try { // 验证是否存在这个用户 SysUser u = userMapper.selectUserByUserName(user.getUserName()); - if (StringUtils.isNull(u)) - { + if (StringUtils.isNull(u)) { BeanValidators.validateWithException(validator, user); user.setPassword(SecurityUtils.encryptPassword(password)); user.setCreateBy(operName); userMapper.insertUser(user); successNum++; successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 导入成功"); - } - else if (isUpdateSupport) - { + } else if (isUpdateSupport) { BeanValidators.validateWithException(validator, user); checkUserAllowed(u); checkUserDataScope(u.getUserId()); @@ -515,28 +462,21 @@ public class SysUserServiceImpl implements ISysUserService userMapper.updateUser(user); successNum++; successMsg.append("
" + successNum + "、账号 " + user.getUserName() + " 更新成功"); - } - else - { + } else { failureNum++; failureMsg.append("
" + failureNum + "、账号 " + user.getUserName() + " 已存在"); } - } - catch (Exception e) - { + } catch (Exception e) { failureNum++; String msg = "
" + failureNum + "、账号 " + user.getUserName() + " 导入失败："; failureMsg.append(msg + e.getMessage()); log.error(msg, e); } } - if (failureNum > 0) - { + if (failureNum > 0) { failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下："); throw new ServiceException(failureMsg.toString()); - } - else - { + } else { successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下："); } return successMsg.toString(); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysShanghuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysShanghuMapper.xml new file mode 100644 index 0000000..8f7c440 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysShanghuMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + insert into b_shanghu + + pos_name, + phone_number, + link_man, + city, + address, + poster_id, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{posName}, + #{phoneNumber}, + #{linkMan}, + #{city}, + #{address}, + #{posterId}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + \ No newline at end of file