ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/RemoteCompanyUserService.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.company.api.domain.User; import com.ruoyi.company.api.domain.dto.MgtCompanyDTO; import com.ruoyi.company.api.factory.RemoteCompanyUserServiceFallbackFactory; import com.ruoyi.company.api.model.RegisterUser; import org.springframework.cloud.openfeign.FeignClient; @@ -12,7 +13,7 @@ @FeignClient(contextId = "remoteCompanyUserService", value = ServiceNameConstants.COMPANY_SERVICE, fallbackFactory = RemoteCompanyUserServiceFallbackFactory.class) public interface RemoteCompanyUserService { @PostMapping("/front/user/register") R<Boolean> registerUser(@RequestBody RegisterUser registerUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); R<Boolean> registerUser(@RequestBody MgtCompanyDTO registerUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @GetMapping("/front/user/getUserByAccountName") R<User> getUserByAccountName(@RequestParam("accountName") String accountName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/domain/User.java
@@ -23,6 +23,9 @@ /** 手机号 */ private String phone; /** 头像 */ private String avatar; /** 状态：1-激活 2-禁用 */ private Integer status;
@@ -110,4 +110,6 @@ @Schema(description = "登录密码") private String password; private String smsCode; } ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/factory/RemoteCompanyUserServiceFallbackFactory.java
@@ -3,6 +3,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.company.api.RemoteCompanyUserService; import com.ruoyi.company.api.domain.User; import com.ruoyi.company.api.domain.dto.MgtCompanyDTO; import com.ruoyi.company.api.model.RegisterUser; import lombok.extern.log4j.Log4j2; import org.springframework.cloud.openfeign.FallbackFactory; @@ -18,7 +19,7 @@ return new RemoteCompanyUserService() { @Override public R<Boolean> registerUser(RegisterUser registerUser, String source) { public R<Boolean> registerUser(MgtCompanyDTO registerUser, String source) { return R.fail("用户注册失败:"+cause.getMessage()); }
@@ -39,6 +39,10 @@ @Schema(description = "用户名称") private String userName; /** 头像 */ @Schema(description = "头像") private String avatar; /** 注册时间 */ @Schema(description = "注册时间") private LocalDateTime registerTime; ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -19,6 +19,7 @@ import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.company.api.RemoteCompanyUserService; import com.ruoyi.company.api.domain.User; import com.ruoyi.company.api.domain.dto.MgtCompanyDTO; import com.ruoyi.company.api.model.RegisterUser; import com.ruoyi.system.api.model.AppUser; import com.ruoyi.system.api.model.LoginUser; @@ -110,7 +111,7 @@ @PostMapping("companyRegister") @Operation(summary = "用户注册接口",description = "用户注册接口") public R<?> companyRegister(@RequestBody RegisterUser registerUser) public R<?> companyRegister(@RequestBody MgtCompanyDTO registerUser) { // 用户注册 sysLoginService.companyRegister(registerUser); ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
@@ -19,6 +19,7 @@ import com.ruoyi.company.api.RemoteCompanyUserService; import com.ruoyi.company.api.domain.Company; import com.ruoyi.company.api.domain.User; import com.ruoyi.company.api.domain.dto.MgtCompanyDTO; import com.ruoyi.company.api.model.RegisterUser; import com.ruoyi.system.api.RemoteUserService; import com.ruoyi.system.api.domain.SysUser; @@ -148,7 +149,7 @@ recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功"); } public void companyRegister(RegisterUser registerUser) { public void companyRegister(MgtCompanyDTO registerUser) { String accountName = registerUser.getAccountName(); String password = registerUser.getPassword(); // 用户名或密码为空 错误 ruoyi-modules/ruoyi-company/src/main/java/com/ruoyi/company/controller/front/UserController.java
@@ -9,6 +9,7 @@ import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.annotation.InnerAuth; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.company.api.domain.Company; import com.ruoyi.company.api.domain.User; import com.ruoyi.company.api.domain.dto.MgtCompanyDTO; import com.ruoyi.company.api.model.RegisterUser; @@ -35,7 +36,6 @@ private final CompanyService companyService; private final RedisService redisService; @PostMapping("/register") public R register(@RequestBody MgtCompanyDTO mgtCompanyDTO) { companyService.saveCompany(mgtCompanyDTO); @@ -47,8 +47,11 @@ public R<UserDetail> getUserDetail() { AppUser appLoginUser = SecurityUtils.getAppLoginUser(); User user = userService.getById(appLoginUser.getUserId()); Company company = companyService.getOne(new LambdaQueryWrapper<Company>() .eq(Company::getUserId, user.getUserId())); UserDetail userDetail = new UserDetail(); BeanUtils.copyProperties(user, userDetail); BeanUtils.copyProperties(company, userDetail); return R.ok(userDetail); }
@@ -33,26 +33,39 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> implements CompanyService { private final UserService userService; private final HttpServletResponse response; /** * 获取企业列表 * * @param query * @return */ @Override public PageDTO<MgtCompanyVO> queryPage(MgtCompanyQuery query) { Page<Company> page = this.lambdaQuery() .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getCompanyName, query.getCompanyInfo()) .like(StringUtils.isNotBlank(query.getCompanyInfo()), Company::getSocialCode, query.getCompanyInfo()) .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getLegalPersonName, query.getLegalPersonInfo()) .like(StringUtils.isNotBlank(query.getLegalPersonInfo()), Company::getIdCardNumber, query.getLegalPersonInfo()) .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactName, query.getContactInfo()) .like(StringUtils.isNotBlank(query.getContactInfo()), Company::getContactPhone, query.getContactInfo()) .and(StringUtils.isNotBlank(query.getCompanyInfo()), queryWrapper -> queryWrapper .like(Company::getCompanyName, query.getCompanyInfo()) .or() .like(Company::getSocialCode, query.getCompanyInfo())) .and(StringUtils.isNotBlank(query.getLegalPersonInfo()), queryWrapper -> queryWrapper .like(Company::getLegalPersonName, query.getLegalPersonInfo()) .or() .like(Company::getIdCardNumber, query.getLegalPersonInfo())) .and(StringUtils.isNotBlank(query.getContactInfo()), queryWrapper -> queryWrapper .like(Company::getContactName, query.getContactInfo()) .or() .like(Company::getContactPhone, query.getContactInfo())) .orderByDesc(Company::getCreateTime) .page(new Page<>(query.getPageCurr(), query.getPageSize())); return PageDTO.of(page,MgtCompanyVO.class); } /** * 获取企业详情 * * @param id * @return */ @@ -74,6 +87,7 @@ /** * 新增企业 * * @param dto * @return */ @@ -101,11 +115,12 @@ /** * 编辑企业 * * @param dto */ @Override public void editCompany(MgtCompanyDTO dto) { if (Objects.isNull(dto.getId())){ if (Objects.isNull(dto.getId())) { throw new ServiceException("企业id不能为空"); } //查询企业 @@ -124,14 +139,14 @@ } //用户信息 User userUpd = BeanUtils.copyBean(dto, User.class); if (StringUtils.isNotBlank(dto.getPassword())){ if (StringUtils.isNotBlank(dto.getPassword())) { userUpd.setPassword(SecurityUtils.encryptPassword(dto.getPassword())); } userUpd.setUserId(user.getUserId()); userUpd.setUpdateBy(SecurityUtils.getUserId()); userService.updateById(userUpd); //根据公司名称查询数据库 Long count = this.lambdaQuery().ne(Company::getId,dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count(); Long count = this.lambdaQuery().ne(Company::getId, dto.getId()).eq(Company::getCompanyName, company.getCompanyName()).count(); if (count > 0) { throw new ServiceException("该公司账号已存在"); } @@ -142,6 +157,7 @@ /** * 删除企业 * * @param id */ @Override @@ -152,7 +168,7 @@ throw new ServiceException("删除失败，该企业不存在"); } //删除企业账号 userService.removeById(company.getUserId()); userService.removeById(company.getUserId()); //删除企业信息 this.removeById(id);
