用户权限

sckw-auth/src/main/java/com/sckw/auth/controller/IndexController.java

@@ -1,6 +1,7 @@
 package com.sckw.auth.controller;
 
 import com.sckw.auth.model.vo.req.LoginReqVo;
+import com.sckw.auth.model.vo.req.RegisterReqVo;
 import com.sckw.auth.service.IIndexService;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.api.RemoteUserService;
@@ -45,10 +46,14 @@ public class IndexController {
     }
 
     /**
-     * 注册
+     * @param reqDto 注册入参
+     * @return HttpResult
+     * @desc: 用户注册
+     * @author: czh
+     * @date: 2023/6/16
      */
     @PostMapping("/register")
-    public HttpResult register(@RequestBody RegisterReqDto reqDto) {
+    public HttpResult register(@RequestBody RegisterReqVo reqDto) {
         indexService.register(reqDto);
         return HttpResult.ok();
     }

sckw-auth/src/main/java/com/sckw/auth/model/vo/req/RegisterReqVo.java

@@ -0,0 +1,44 @@
+package com.sckw.auth.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @desc: 用户注册入参
+ * @author: czh
+ * @date: 2023/6/16
+ */
+@Data
+public class RegisterReqVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 2422369748989567136L;
+
+    /**
+     * 企业名称
+     */
+    private String entName;
+
+    /**
+     * 企业代表人
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String telephone;
+
+    /**
+     *系统类型(1运营端、2企业开户)
+     */
+    private Integer systemType;
+
+    /**
+     * 验证码
+     */
+    private String captcha;
+
+}

sckw-auth/src/main/java/com/sckw/auth/service/IIndexService.java

@@ -1,6 +1,7 @@
 package com.sckw.auth.service;
 
 import com.sckw.auth.model.vo.req.LoginReqVo;
+import com.sckw.auth.model.vo.req.RegisterReqVo;
 import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.auth.model.vo.res.LoginResVo;
 
@@ -14,8 +15,10 @@ public interface IIndexService {
     LoginResVo login(LoginReqVo reqVo);
 
     /**
-     * 注册
-     * @param reqVo
+     * @param reqVo 注册入参
+     * @desc: 用户注册
+     * @author: czh
+     * @date: 2023/6/16
      */
-    void register(RegisterReqDto reqVo);
+    void register(RegisterReqVo reqVo);
 }

sckw-auth/src/main/java/com/sckw/auth/service/impl/IndexServiceImpl.java

@@ -2,6 +2,7 @@ package com.sckw.auth.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.sckw.auth.model.vo.req.LoginReqVo;
+import com.sckw.auth.model.vo.req.RegisterReqVo;
 import com.sckw.auth.model.vo.res.DeptInfoResVo;
 import com.sckw.auth.model.vo.res.EntInfoResVo;
 import com.sckw.auth.model.vo.res.LoginResVo;
@@ -111,8 +112,17 @@ public class IndexServiceImpl implements IIndexService {
     }
 
     @Override
-    public void register(RegisterReqDto reqDto) {
-        remoteUserService.register(reqDto);
+    public void register(RegisterReqVo reqVo) {
+        /*1、校验验证码*/
+        String sms = RedissonUtils.get("xxx").toString();
+        if (!reqVo.getCaptcha().equals(sms)) {
+            throw new SystemException(HttpStatus.CODE_10301, HttpStatus.CAPTCHA_ERROR);
+        }
+
+        RegisterReqDto registerReqDto = new RegisterReqDto();
+        BeanUtils.copyProperties(reqVo, registerReqDto);
+        registerReqDto.setIsMain(Global.YES);
+        remoteUserService.register(registerReqDto);
     }
 
 

sckw-common/sckw-common-core/pom.xml

@@ -88,11 +88,6 @@
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.sckw</groupId>
-            <artifactId>sckw-common-remote</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/RegisterReqDto.java

@@ -2,23 +2,27 @@ package com.sckw.system.api.model.dto.req;
 
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 
+/**
+ * @desc: 用户注册入参
+ * @author: czh
+ * @date: 2023/6/16
+ */
 @Data
 public class RegisterReqDto implements Serializable {
 
-    /**
-     * 用户名
-     */
-    private String account;
+    @Serial
+    private static final long serialVersionUID = 970722902418698166L;
 
     /**
-     * 密码
+     * 企业名称
      */
-    private String password;
+    private String entName;
 
     /**
-     *真实姓名
+     * 真实姓名
      */
     private String name;
 
@@ -28,23 +32,13 @@ public class RegisterReqDto implements Serializable {
     private String telephone;
 
     /**
-     * 照片
-     */
-    private String photo;
-
-    /**
-     * 邮件
-     */
-    private String email;
-
-    /**
-     * 是否是企业管理（0是 1否）
+     * 是否是企业管理（1是 0否）
      */
-    private String isMain;
+    private Integer isMain;
 
     /**
      *系统类型(1运营端、2企业开户)
      */
-    private String systemType;
+    private Integer systemType;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -7,6 +7,7 @@ import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.system.model.KwsUser;
+import com.sckw.system.model.vo.req.CheckAccountValidReqVo;
 import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
 import com.sckw.system.model.vo.req.UpdatePasswordReqVo;
 import com.sckw.system.model.vo.req.UserAddReqVo;
@@ -150,6 +151,19 @@ public class KwsUserController {
         return HttpResult.ok();
     }
 
+    /**
+     * @param reqVo 校验账号有效性入参
+     * @return HttpResult
+     * @desc: 校验账号有效性
+     * @author: czh
+     * @date: 2023/6/16
+     */
+    @PostMapping
+    public HttpResult checkAccountValid(@RequestBody CheckAccountValidReqVo reqVo){
+        kwsUserService.checkAccountValid(reqVo);
+        return HttpResult.ok();
+    }
+
     @PostMapping("testEdit")
     public HttpResult testEdit() {
         return HttpResult.ok(HttpStatus.MSG_005);

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteUserServiceImpl.java

@@ -117,7 +117,7 @@ public class RemoteUserServiceImpl implements RemoteUserService {
 
     @Override
     public void register(RegisterReqDto reqDto) {
-
+        kwsUserService.register(reqDto);
     }
 
     @Override

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/CheckAccountValidReqVo.java

@@ -0,0 +1,29 @@
+package com.sckw.system.model.vo.req;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * @author czh
+ * @desc 验证账号入参
+ * @date 2023/6/16
+ */
+@Data
+public class CheckAccountValidReqVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -7239208718700569113L;
+
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 系统类型 (1运营端、2企业开户)
+     */
+    private Integer systemType;
+
+}

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -1,5 +1,5 @@
 package com.sckw.system.service;
-import com.google.common.collect.Lists;
+
 import java.util.Date;
 
 import java.util.*;
@@ -152,7 +152,7 @@ public class KwsEnterpriseService {
             if (!CollectionUtils.isEmpty(kwsEntCertificates)) {
                 kwsEntCertificates.forEach(item -> {
                     item.setDelFlag(Global.YES);
-                    if(kwsEntCertificateDao.update(item) <= 0){
+                    if (kwsEntCertificateDao.update(item) <= 0) {
                         throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
                     }
                 });
@@ -166,7 +166,7 @@ public class KwsEnterpriseService {
                 KwsEntCertificate kwsEntCertificate = new KwsEntCertificate();
                 kwsEntCertificate.setEntId(entId);
                 BeanUtils.copyProperties(item, kwsEntCertificate);
-                if(kwsEntCertificateDao.insert(kwsEntCertificate) <= 0) {
+                if (kwsEntCertificateDao.insert(kwsEntCertificate) <= 0) {
                     throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
                 }
                 return;
@@ -181,9 +181,9 @@ public class KwsEnterpriseService {
 
     }
 
-    public KwsEntCertificate checkEntCertificate(long id){
+    public KwsEntCertificate checkEntCertificate(long id) {
         KwsEntCertificate kwsEntCertificate = kwsEntCertificateDao.selectByKey(id);
-        if(Objects.isNull(kwsEntCertificate) || kwsEntCertificate.getDelFlag() == Global.YES){
+        if (Objects.isNull(kwsEntCertificate) || kwsEntCertificate.getDelFlag() == Global.YES) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENTCERTIFICATES_NOT_EXISTS);
         }
         return kwsEntCertificate;
@@ -202,7 +202,6 @@ public class KwsEnterpriseService {
     }
 
 
-
     /**
      * @param reqVo
      * @return HttpResult
@@ -309,7 +308,7 @@ public class KwsEnterpriseService {
             kwsEntDept.setEntPid(reqVo.getEntPid());
             kwsEntDept.setId(new IdWorker(1L).nextId());
             kwsEntDept.setRemark("");
-            if(kwsEntDeptDao.insert(kwsEntDept) <= 0){
+            if (kwsEntDeptDao.insert(kwsEntDept) <= 0) {
                 throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
             }
             return;
@@ -419,7 +418,7 @@ public class KwsEnterpriseService {
     }
 
     /**
-     * @param  userId 用户id
+     * @param userId 用户id
      * @return KwsEnterprise
      * @desc: 根据用户id查企业
      * @author: czh

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsUserService.java

@@ -1,19 +1,18 @@
 package com.sckw.system.service;
+import java.util.Date;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.redis.utils.RedissonUtils;
+import com.sckw.system.api.model.dto.req.RegisterReqDto;
 import com.sckw.system.dao.KwsEntCheckTrackDao;
 import com.sckw.system.dao.KwsUserDao;
 import com.sckw.system.dao.KwsUserDeptDao;
 import com.sckw.system.model.KwsDept;
 import com.sckw.system.model.KwsUser;
 import com.sckw.system.model.KwsUserDept;
-import com.sckw.system.model.vo.req.ForgetPasswordReqVo;
-import com.sckw.system.model.vo.req.UpdatePasswordReqVo;
-import com.sckw.system.model.vo.req.UserAddReqVo;
-import com.sckw.system.model.vo.req.UserBindRoleReqVo;
+import com.sckw.system.model.vo.req.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,8 +58,7 @@ public class KwsUserService {
         /*3、存库*/
         long userId = new IdWorker(1).nextId();
         kwsUser.setId(userId);
-        int count = kwsUserDao.insert(kwsUser);
-        if (count <= 0) {
+        if (kwsUserDao.insert(kwsUser) <= 0) {
            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
 
@@ -69,6 +67,26 @@ public class KwsUserService {
 
     }
 
+    public void register(RegisterReqDto reqDto) {
+        /*存用户表、企业表，暂时不处理角色关系，需要认证*/
+        KwsUser kwsUser = new KwsUser();
+        kwsUser.setSystemType(reqDto.getSystemType());
+        kwsUser.setAccount(reqDto.getTelephone());
+        kwsUser.setName(reqDto.getName());
+        kwsUser.setTelephone(reqDto.getTelephone());
+        kwsUser.setIsMain(reqDto.getIsMain());
+        kwsUser.setId(new IdWorker(1).nextId());
+
+        //填充密码、入库
+        fillPassword(kwsUser);
+        if (kwsUserDao.insert(kwsUser) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
+
+        //存企业
+
+    }
+
 
     private void fillUserRole(UserAddReqVo reqVo, long userId) {
         UserBindRoleReqVo userBindRoleReqVo = new UserBindRoleReqVo();
@@ -80,7 +98,7 @@ public class KwsUserService {
     private void fillPassword(KwsUser kwsUser) {
         //密码为空时，以登录名作为密码
         if (StringUtils.isBlank(kwsUser.getPassword())) {
-            String password = PasswordUtils.entryptPassword( PasswordUtils.md5(kwsUser.getAccount()));
+            String password = PasswordUtils.entryptPassword(PasswordUtils.md5(kwsUser.getAccount()));
             kwsUser.setPassword(password);
         } else {
             String password = PasswordUtils.entryptPassword(kwsUser.getPassword());
@@ -240,7 +258,11 @@ public class KwsUserService {
     }
 
     /**
-     * 根据登录名校验
+     * @param account 账号 systemType 系统类型
+     * @return KwsUser
+     * @desc: 根据登录名校验，为空抛异常用户信息不存在或已失效
+     * @author: czh
+     * @date: 2023/6/16
      */
     public KwsUser checkUserBase(String account, int systemType) {
         KwsUser kwsUser = getUserByAccount(account, systemType);
@@ -279,4 +301,16 @@ public class KwsUserService {
     public List<KwsDept> queryDeptByIds(List<Long> list) {
         return kwsUserDao.queryDeptByIds(list);
     }
+
+    /**
+     * @param reqVo 校验账号有效性入参
+     * @desc: 校验账号有效性,存在抛异常用户账号已存在
+     * @author: czh
+     * @date: 2023/6/16
+     */
+    public void checkAccountValid(CheckAccountValidReqVo reqVo) {
+        if (!Objects.isNull(getUserByAccount(reqVo.getAccount(), reqVo.getSystemType()))) {
+            throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.ACCOUNT_EXISTS);
+        }
+    }
 }