user/role/tright 5.14

个体用户还需要增加Token
准备企业用户注册

src/main/java/com/pangding/web/authority/cloudvo/ComputerRegisterUserReturnVo.java

+package com.pangding.web.authority.cloudvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 17:48
+ */
+public class ComputerRegisterUserReturnVo {
+    private String companyId;
+
+    private String merchantId;
+
+    private int companyType;
+
+    public int getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(int companyType) {
+        this.companyType = companyType;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(String merchantId) {
+        this.merchantId = merchantId;
+    }
+}

src/main/java/com/pangding/web/authority/dto/MobileRegisterUserReturnDto.java → src/main/java/com/pangding/web/authority/cloudvo/MobileRegisterUserReturnVo.java

-package com.pangding.web.authority.dto;
+package com.pangding.web.authority.cloudvo;
 
 /**
  * @Author zhangjinyao
  * @create 2019/5/13 16:15
  */
-public class MobileRegisterUserReturnDto {
+public class MobileRegisterUserReturnVo {
 
     private String companyId;
 
     private String merchantId;
 
-    private String companyType;
+    private int companyType;
 
-    public String getCompanyType() {
+    public int getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(String companyType) {
+    public void setCompanyType(int companyType) {
         this.companyType = companyType;
     }
 

src/main/java/com/pangding/web/authority/controller/ComputerRegisterController.java

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.authority.cloudvo.ComputerRegisterUserReturnVo;
+import com.pangding.web.authority.currency.Result;
+import com.pangding.web.authority.dto.RegisterEnterpriceDto;
+import com.pangding.web.authority.dto.RegisterIndividualDto;
+import com.pangding.web.authority.dto.RegisterUserDto;
+import com.pangding.web.authority.service.MobileRegisterService;
+import com.pangding.web.authority.service.UserService;
+import com.pangding.web.authority.utils.Md5AndSalt;
+import com.pangding.web.authority.vo.CompanyVo;
+import com.pangding.web.authority.vo.MobileLoginInfo;
+import com.pangding.web.authority.vo.UserVo;
+import com.yanzuoguang.token.TokenHelper;
+import com.yanzuoguang.util.helper.StringHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 16:28
+ */
+
+@RestController
+@RequestMapping(value="/computer")
+public class ComputerRegisterController {
+    @Autowired
+    MobileRegisterService mobileRegisterServiceImpl;
+    @Autowired
+    UserService userServiceImpl;
+
+    /**
+     * 验证注册第一页数据的合法性并保存
+     *
+     * @param registerUserDto
+     * @return
+     */
+    @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object saveUser(@RequestBody RegisterUserDto registerUserDto){
+
+        if (!userServiceImpl.isValid(registerUserDto.getAccount())){
+            return new Result(4001,"用户名由字母与数字组成，且不能为纯数字",registerUserDto);
+        }
+
+        UserVo userVo = new UserVo();
+        userVo.setAccount(registerUserDto.getAccount());
+        userServiceImpl.checkAccount(userVo);
+
+        String merchantId = registerUserDto.getMerchantId();
+        if (!mobileRegisterServiceImpl.checkMerchantId(merchantId)){
+            return new Result(4001,"注册编码错误",registerUserDto);
+        }
+
+        String companyId = StringHelper.getNewID();
+        userVo.setPassword(Md5AndSalt.generate(registerUserDto.getPassword()));
+        userVo.setId(StringHelper.getNewID());
+        userVo.setRemark(registerUserDto.getPassword());
+        userVo.setCompanyId(companyId);
+        mobileRegisterServiceImpl.saveUser(userVo);
+        ComputerRegisterUserReturnVo returnVo = new ComputerRegisterUserReturnVo();
+        returnVo.setCompanyId(companyId);
+        returnVo.setMerchantId(merchantId);
+        returnVo.setCompanyType(registerUserDto.getCompanyType());
+
+        /*token内容暂时不能用，以后要改动，需要存入用户及企业信息*/
+        String token = StringHelper.getNewID();
+        TokenHelper.write(token,returnVo);
+
+        return new Result(0,"SUCCESS",null);
+    }
+
+    /**
+     * 当用户类型选择为“个体”时进入此方法
+     * 验证注册第二页数据的合法性并保存
+     *
+     * @param individualDto
+     * @return
+     */
+    @RequestMapping(value="/individual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object saveIndividual(@RequestBody RegisterIndividualDto individualDto){
+
+        mobileRegisterServiceImpl.checkPhone(individualDto);
+
+        CompanyVo companyVo = new CompanyVo();
+
+        /*token内容暂时不能用，以后要改动*/
+        ComputerRegisterUserReturnVo returnVo = TokenHelper.get(ComputerRegisterUserReturnVo.class);
+
+        companyVo.setId(returnVo.getCompanyId());
+        companyVo.setCompanyType(returnVo.getCompanyType());
+        companyVo.setMerchantId(returnVo.getMerchantId());
+        companyVo.setContactName(individualDto.getContactName());
+        companyVo.setContactCode(individualDto.getContactCode());
+        companyVo.setCompanyAttribute(individualDto.getCompanyAttribute());
+        companyVo.setContactPhone(individualDto.getContactPhone());
+        if (individualDto.getCompanyAttribute().equals("5")){
+            companyVo.setCompanyName(individualDto.getExtraChoseOne());
+            companyVo.setBusinessLicenseCode(individualDto.getExtraChoseTwo());
+        }else{
+            companyVo.setCompanyName(individualDto.getExtraChoseOne());
+            companyVo.setAddress(individualDto.getExtraChoseTwo());
+        }
+        mobileRegisterServiceImpl.saveCompany(companyVo);
+        return new Result(0,"SUCCESS",null);
+    }
+
+    @RequestMapping(value="/enterprise", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object saveEnterprise(@RequestBody RegisterEnterpriceDto enterpriceDto){
+        return null;
+    }
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object login(@RequestBody MobileLoginInfo info){
+
+        String accountOrPhone = info.getAccountOrPhone();
+        UserVo userVo;
+        if (userServiceImpl.isNumeric(accountOrPhone)){
+            userVo = userServiceImpl.getUserByPhone(accountOrPhone);
+        }else {
+            userVo = userServiceImpl.getUserByAccount(accountOrPhone);
+        }
+
+        if (userVo == null){
+            return new Result(4001,"没有此用户",info);
+        }
+
+        if (!Md5AndSalt.verify(info.getPassword(),userVo.getPassword())){
+            return new Result(4001,"用户名或密码错误",info);
+        }
+
+        /*token内容暂时不能用，以后要改动*/
+        String token = StringHelper.getNewID();
+        TokenHelper.write(token,userVo);
+
+        return new Result(0,"SUCCESS",null);
+    }
+}

src/main/java/com/pangding/web/authority/controller/MobileRegisterController.java

 package com.pangding.web.authority.controller;
 
 import com.pangding.web.authority.currency.Result;
-import com.pangding.web.authority.dto.MobileRegisterCompanyDto;
-import com.pangding.web.authority.dto.MobileRegisterUserDto;
-import com.pangding.web.authority.dto.MobileRegisterUserReturnDto;
+import com.pangding.web.authority.dto.RegisterIndividualDto;
+import com.pangding.web.authority.dto.RegisterUserDto;
+import com.pangding.web.authority.cloudvo.MobileRegisterUserReturnVo;
 import com.pangding.web.authority.service.MobileRegisterService;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.utils.Md5AndSalt;
 import com.pangding.web.authority.vo.CompanyVo;
+import com.pangding.web.authority.vo.MobileLoginInfo;
 import com.pangding.web.authority.vo.UserVo;
+import com.yanzuoguang.token.TokenHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @create 2019/5/13 11:26
  */
 @RestController
-@RequestMapping(value="/mobileRegister")
+@RequestMapping(value="/mobile")
 public class MobileRegisterController {
 
     @Autowired
@@ -30,13 +32,23 @@ public class MobileRegisterController {
     @Autowired
     UserService userServiceImpl;
 
+    /**
+     * 验证注册第一页数据的合法性并保存
+     *
+     * @param registerUserDto
+     * @return
+     */
     @RequestMapping(value = "/user", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Object saveUser(@RequestBody MobileRegisterUserDto registerUserDto){
+    public Object saveUser(@RequestBody RegisterUserDto registerUserDto){
 
-        if (!registerUserDto.getCompanyType().equals("个体")){
+        if (registerUserDto.getCompanyType() != 0){
             return new Result(4001,"目前仅支持个体用户",registerUserDto);
         }
 
+        if (!userServiceImpl.isValid(registerUserDto.getAccount())){
+            return new Result(4001,"用户名由字母与数字组成，且不能为纯数字",registerUserDto);
+        }
+
         UserVo userVo = new UserVo();
         userVo.setAccount(registerUserDto.getAccount());
         userServiceImpl.checkAccount(userVo);
@@ -52,19 +64,78 @@ public class MobileRegisterController {
         userVo.setRemark(registerUserDto.getPassword());
         userVo.setCompanyId(companyId);
         mobileRegisterServiceImpl.saveUser(userVo);
-        MobileRegisterUserReturnDto returnDto = new MobileRegisterUserReturnDto();
-        returnDto.setCompanyId(companyId);
-        returnDto.setMerchantId(merchantId);
-        returnDto.setCompanyType(registerUserDto.getCompanyType());
-        return new Result(0,"SUCCESS",returnDto);
+        MobileRegisterUserReturnVo returnVo = new MobileRegisterUserReturnVo();
+        returnVo.setCompanyId(companyId);
+        returnVo.setMerchantId(merchantId);
+        returnVo.setCompanyType(registerUserDto.getCompanyType());
+
+        /*token内容暂时不能用，以后要改动，需要存入用户及企业信息*/
+        String token = StringHelper.getNewID();
+        TokenHelper.write(token,returnVo);
+
+        return new Result(0,"SUCCESS",null);
     }
 
-    @RequestMapping(value="company")
-    public Object saveCompany(@RequestBody MobileRegisterCompanyDto companyDto){
+    /**
+     * 验证注册第二页数据的合法性并保存
+     *
+     * @param individualDto
+     * @return
+     */
+    @RequestMapping(value="/individual", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object saveIndividual(@RequestBody RegisterIndividualDto individualDto){
+
+        mobileRegisterServiceImpl.checkPhone(individualDto);
 
         CompanyVo companyVo = new CompanyVo();
-        companyVo.setId(companyDto.getCompanyId());
 
-        return null;
+        /*token内容暂时不能用，以后要改动*/
+        MobileRegisterUserReturnVo returnVo = TokenHelper.get(MobileRegisterUserReturnVo.class);
+
+        companyVo.setId(returnVo.getCompanyId());
+        companyVo.setCompanyType(returnVo.getCompanyType());
+        companyVo.setMerchantId(returnVo.getMerchantId());
+        companyVo.setContactName(individualDto.getContactName());
+        companyVo.setContactCode(individualDto.getContactCode());
+        companyVo.setCompanyAttribute(individualDto.getCompanyAttribute());
+        companyVo.setContactPhone(individualDto.getContactPhone());
+        if (individualDto.getCompanyAttribute().equals("5")){
+            companyVo.setCompanyName(individualDto.getExtraChoseOne());
+            companyVo.setBusinessLicenseCode(individualDto.getExtraChoseTwo());
+        }else{
+            companyVo.setCompanyName(individualDto.getExtraChoseOne());
+            companyVo.setAddress(individualDto.getExtraChoseTwo());
+        }
+        mobileRegisterServiceImpl.saveCompany(companyVo);
+        return new Result(0,"SUCCESS",null);
+    }
+
+
+
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public Object login(@RequestBody MobileLoginInfo info){
+
+        String accountOrPhone = info.getAccountOrPhone();
+        UserVo userVo;
+        if (userServiceImpl.isNumeric(accountOrPhone)){
+            userVo = userServiceImpl.getUserByPhone(accountOrPhone);
+        }else {
+            userVo = userServiceImpl.getUserByAccount(accountOrPhone);
+        }
+
+        if (userVo == null){
+            return new Result(4001,"没有此用户",info);
+        }
+
+        if (!Md5AndSalt.verify(info.getPassword(),userVo.getPassword())){
+            return new Result(4001,"用户名或密码错误",info);
+        }
+
+        /*token内容暂时不能用，以后要改动*/
+        String token = StringHelper.getNewID();
+        TokenHelper.write(token,userVo);
+
+        return new Result(0,"SUCCESS",null);
     }
 }

src/main/java/com/pangding/web/authority/controller/UserController.java

@@ -33,7 +33,11 @@ public class UserController {
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object saveUser(@RequestBody UserDto userDto){
 
+        if (!userServiceImpl.isValid(userDto.getAccount())){
+            return new Result(4001,"用户名由字母与数字组成，且不能为纯数字",userDto);
+        }
         userServiceImpl.checkAccount(userDto);
+        userServiceImpl.checkPhone(userDto);
         userDto.setRemark(userDto.getPassword());
         String saltPassword = userServiceImpl.passwordEncoder(userDto.getPassword());
         userDto.setPassword(saltPassword);
@@ -51,6 +55,7 @@ public class UserController {
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object updateUser(@RequestBody UserDto userDto){
         userServiceImpl.checkAccount(userDto);
+        userServiceImpl.checkPhone(userDto);
         userDto.setRemark(userDto.getPassword());
         userDto.setPassword(userServiceImpl.passwordEncoder(userDto.getPassword()));
         userServiceImpl.updateUser(userDto);

src/main/java/com/pangding/web/authority/dao/ComputerRegisterDao.java

+package com.pangding.web.authority.dao;
+
+import com.yanzuoguang.dao.BaseDao;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 16:32
+ */
+public interface ComputerRegisterDao extends BaseDao {
+}

src/main/java/com/pangding/web/authority/dao/MobileRegisterDao.java

 package com.pangding.web.authority.dao;
 
+import com.pangding.web.authority.vo.CompanyVo;
 import com.yanzuoguang.dao.BaseDao;
 
 /**
@@ -7,4 +8,10 @@ import com.yanzuoguang.dao.BaseDao;
  * @create 2019/5/13 14:24
  */
 public interface MobileRegisterDao extends BaseDao {
+    /**
+     * 检查电话号码是否已存在
+     *
+     * @param companyVo CompanyVo对象
+     */
+    void checkPhone(CompanyVo companyVo);
 }

src/main/java/com/pangding/web/authority/dao/UserDao.java

 package com.pangding.web.authority.dao;
 
+import com.pangding.web.authority.reqvo.GetUserByCompanyIdReqVo;
 import com.pangding.web.authority.reqvo.GetUserByIdReqVo;
 import com.pangding.web.authority.vo.UserVo;
 import com.yanzuoguang.dao.BaseDao;
@@ -13,13 +14,20 @@ public interface UserDao extends BaseDao {
 
 
     /**
-     * 通过账户名获取相同的UserVo对象
+     * 检查用户名是否存在
      *
      * @param account 账户名
      * @return UserVo对象
      */
     void checkAccount(UserVo account);
 
+    /**
+     * 检查电话号码是否存在
+     *
+     * @param phone 电话号码
+     */
+    void checkPhone(UserVo phone);
+
     /**
      * 获取UserVo对象列表
      *
@@ -34,4 +42,12 @@ public interface UserDao extends BaseDao {
      * @return UserVo对象
      */
     UserVo getUserById(GetUserByIdReqVo id);
+
+    /**
+     * 根据公司id获取UserVo对象
+     *
+     * @param companyId GetUserByCompanyIdReqVo请求对象，封装公司id
+     * @return UserVo对象
+     */
+    UserVo getUserByCompanyId(GetUserByCompanyIdReqVo companyId);
 }

src/main/java/com/pangding/web/authority/dao/impl/ComputerRegisterDaoImpl.java

+package com.pangding.web.authority.dao.impl;
+
+import com.pangding.web.authority.dao.ComputerRegisterDao;
+import com.yanzuoguang.dao.impl.BaseDaoImpl;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 16:33
+ */
+public class ComputerRegisterDaoImpl extends BaseDaoImpl implements ComputerRegisterDao {
+    @Override
+    protected void init() {
+
+    }
+}

src/main/java/com/pangding/web/authority/dao/impl/MobileRegisterDaoImpl.java

@@ -11,8 +11,19 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class MobileRegisterDaoImpl extends BaseDaoImpl implements MobileRegisterDao {
+
+    private static final String CHECK_PHONE = "CHECK_PHONE";
+
     @Override
     protected void init() {
+
         register(CompanyVo.class);
+
+        table.addExist(CHECK_PHONE,"contact_phone");
+    }
+
+    @Override
+    public void checkPhone(CompanyVo companyVo) {
+        this.checkExist(CHECK_PHONE,companyVo,"电话号码已存在");
     }
 }

src/main/java/com/pangding/web/authority/dao/impl/UserDaoImpl.java

 package com.pangding.web.authority.dao.impl;
 
 import com.pangding.web.authority.dao.UserDao;
+import com.pangding.web.authority.reqvo.GetUserByCompanyIdReqVo;
 import com.pangding.web.authority.reqvo.GetUserByIdReqVo;
 import com.pangding.web.authority.vo.UserVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
@@ -17,6 +18,7 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
 
     private static final String SELECT = "SELECT";
     private static final String CHECK_ACCOUNT = "CHECK_ACCOUNT";
+    private static final String CHECK_PHONE = "CHECK_PHONE";
 
     @Override
     protected void init() {
@@ -26,6 +28,8 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
 
         table.addExist(CHECK_ACCOUNT,"account");
 
+        table.addExist(CHECK_PHONE,"phone");
+
     }
 
     @Override
@@ -33,6 +37,10 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
         this.checkExist(CHECK_ACCOUNT,account,"用戶名已存在");
     }
 
+    @Override
+    public void checkPhone(UserVo phone) {
+        this.checkExist(CHECK_PHONE,phone,"手机号已存在");
+    }
 
     @Override
     public List<UserVo> listUserVo() {
@@ -45,4 +53,9 @@ public class UserDaoImpl extends BaseDaoImpl implements UserDao {
     public UserVo getUserById(GetUserByIdReqVo id) {
         return this.load(id,UserVo.class);
     }
+
+    @Override
+    public UserVo getUserByCompanyId(GetUserByCompanyIdReqVo companyId) {
+        return this.load(companyId,UserVo.class);
+    }
 }

src/main/java/com/pangding/web/authority/dto/RegisterEnterpriceDto.java

+package com.pangding.web.authority.dto;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 18:30
+ */
+public class RegisterEnterpriceDto {
+    private String enterpriceName;
+
+    private String companyAttribute;
+
+    private String extraChoseOne;
+
+    private String extraChoseTwo;
+
+    private String enterpricePhone;
+
+    private String contactName;
+
+    private String contactCode;
+
+    private String contactPhone;
+
+    private String depositBank;
+
+    private String depositAccount;
+
+    private String depositAddress;
+
+    public String getEnterpriceName() {
+        return enterpriceName;
+    }
+
+    public void setEnterpriceName(String enterpriceName) {
+        this.enterpriceName = enterpriceName;
+    }
+
+    public String getCompanyAttribute() {
+        return companyAttribute;
+    }
+
+    public void setCompanyAttribute(String companyAttribute) {
+        this.companyAttribute = companyAttribute;
+    }
+
+    public String getExtraChoseOne() {
+        return extraChoseOne;
+    }
+
+    public void setExtraChoseOne(String extraChoseOne) {
+        this.extraChoseOne = extraChoseOne;
+    }
+
+    public String getExtraChoseTwo() {
+        return extraChoseTwo;
+    }
+
+    public void setExtraChoseTwo(String extraChoseTwo) {
+        this.extraChoseTwo = extraChoseTwo;
+    }
+
+    public String getEnterpricePhone() {
+        return enterpricePhone;
+    }
+
+    public void setEnterpricePhone(String enterpricePhone) {
+        this.enterpricePhone = enterpricePhone;
+    }
+
+    public String getContactName() {
+        return contactName;
+    }
+
+    public void setContactName(String contactName) {
+        this.contactName = contactName;
+    }
+
+    public String getContactCode() {
+        return contactCode;
+    }
+
+    public void setContactCode(String contactCode) {
+        this.contactCode = contactCode;
+    }
+
+    public String getContactPhone() {
+        return contactPhone;
+    }
+
+    public void setContactPhone(String contactPhone) {
+        this.contactPhone = contactPhone;
+    }
+
+    public String getDepositBank() {
+        return depositBank;
+    }
+
+    public void setDepositBank(String depositBank) {
+        this.depositBank = depositBank;
+    }
+
+    public String getDepositAccount() {
+        return depositAccount;
+    }
+
+    public void setDepositAccount(String depositAccount) {
+        this.depositAccount = depositAccount;
+    }
+
+    public String getDepositAddress() {
+        return depositAddress;
+    }
+
+    public void setDepositAddress(String depositAddress) {
+        this.depositAddress = depositAddress;
+    }
+}

src/main/java/com/pangding/web/authority/dto/MobileRegisterCompanyDto.java → src/main/java/com/pangding/web/authority/dto/RegisterIndividualDto.java

@@ -4,13 +4,7 @@ package com.pangding.web.authority.dto;
  * @Author zhangjinyao
  * @create 2019/5/13 17:32
  */
-public class MobileRegisterCompanyDto {
-
-    private String companyId;
-
-    private String merchantId;
-
-    private String companyType;
+public class RegisterIndividualDto {
 
     private String contactName;
 
@@ -40,30 +34,6 @@ public class MobileRegisterCompanyDto {
         this.extraChoseTwo = extraChoseTwo;
     }
 
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    public String getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(String merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public String getCompanyType() {
-        return companyType;
-    }
-
-    public void setCompanyType(String companyType) {
-        this.companyType = companyType;
-    }
-
     public String getContactName() {
         return contactName;
     }

src/main/java/com/pangding/web/authority/dto/MobileRegisterUserDto.java → src/main/java/com/pangding/web/authority/dto/RegisterUserDto.java

@@ -6,13 +6,13 @@ import com.pangding.web.authority.vo.UserVo;
  * @Author zhangjinyao
  * @create 2019/5/13 15:17
  */
-public class MobileRegisterUserDto {
+public class RegisterUserDto {
 
     private String account;
 
     private String password;
 
-    private String companyType;
+    private int companyType;
 
     private String merchantId;
 
@@ -32,11 +32,11 @@ public class MobileRegisterUserDto {
         this.password = password;
     }
 
-    public String getCompanyType() {
+    public int getCompanyType() {
         return companyType;
     }
 
-    public void setCompanyType(String companyType) {
+    public void setCompanyType(int companyType) {
         this.companyType = companyType;
     }
 

src/main/java/com/pangding/web/authority/reqvo/GetUserByAccountReqVo.java

@@ -10,16 +10,6 @@ import org.springframework.context.annotation.Bean;
 public class GetUserByAccountReqVo {
     private String account;
 
-    private String id;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public String getAccount() {
         return account;
     }

src/main/java/com/pangding/web/authority/reqvo/GetUserByCompanyIdReqVo.java

+package com.pangding.web.authority.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 11:24
+ */
+public class GetUserByCompanyIdReqVo {
+    private String companyId;
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+}

src/main/java/com/pangding/web/authority/reqvo/GetUserByPhoneReqVo.java

+package com.pangding.web.authority.reqvo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 15:48
+ */
+public class GetUserByPhoneReqVo {
+    private String phone;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+}

src/main/java/com/pangding/web/authority/service/ComputerRegisterService.java

+package com.pangding.web.authority.service;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 16:30
+ */
+public interface ComputerRegisterService {
+}

src/main/java/com/pangding/web/authority/service/MobileRegisterService.java

 package com.pangding.web.authority.service;
 
 
-import com.pangding.web.authority.dto.UserDto;
+import com.pangding.web.authority.dto.RegisterIndividualDto;
+import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;
 
 /**
@@ -24,4 +25,18 @@ public interface MobileRegisterService {
      * @param userVo UserVo对象
      */
     void saveUser(UserVo userVo);
+
+    /**
+     * 保存公司信息
+     *
+     * @param companyVo CompanyVo对象
+     */
+    void saveCompany(CompanyVo companyVo);
+
+    /**
+     * 检查电话号码是否已存在
+     *
+     * @param companyDto MobileRegisterCompanyDto对象
+     */
+    void checkPhone(RegisterIndividualDto companyDto);
 }

src/main/java/com/pangding/web/authority/service/UserService.java

@@ -27,13 +27,19 @@ public interface UserService {
     void updateUser(UserDto userDto);
 
     /**
-     * 通过UserVo对象获取相同的UserVo对象
+     * 检查用户名是否存在
      *
      * @param userVo UserVo对象
-     * @return UserVo对象
      */
     void checkAccount(UserVo userVo);
 
+    /**
+     * 检查电话号码是否存在
+     *
+     * @param userVo UserVo对象
+     */
+    void checkPhone(UserVo userVo);
+
     /**
      * 对密码进行MD5盐值加密
      *
@@ -82,4 +88,36 @@ public interface UserService {
      * @return RoleVo对象
      */
     RoleVo getRoleByRoleId(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo);
+
+    /**
+     * 检查用户名是否合法
+     *
+     * @param account 用户名
+     * @return
+     */
+    Boolean isValid(String account);
+
+    /**
+     * 检查是否为纯数字，用来判断输入的是用户名还是手机号
+     *
+     * @param account 用户名
+     * @return
+     */
+    Boolean isNumeric(String account);
+
+    /**
+     * 通过电话号码获取用户信息
+     *
+     * @param phone 电话号码
+     * @return UserVo对象
+     */
+    UserVo getUserByPhone(String phone);
+
+    /**
+     * 通过用户名获取用户信息
+     *
+     * @param account 用户名
+     * @return UserVo对象
+     */
+    UserVo getUserByAccount(String account);
 }

src/main/java/com/pangding/web/authority/service/impl/ComputerRegisterServiceImpl.java

+package com.pangding.web.authority.service.impl;
+
+import com.pangding.web.authority.service.ComputerRegisterService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 16:31
+ */
+
+@Service
+public class ComputerRegisterServiceImpl implements ComputerRegisterService {
+}

src/main/java/com/pangding/web/authority/service/impl/MobileRegisterServiceImpl.java

@@ -2,12 +2,15 @@ package com.pangding.web.authority.service.impl;
 
 import com.pangding.web.authority.dao.MobileRegisterDao;
 import com.pangding.web.authority.dao.UserDao;
+import com.pangding.web.authority.dto.RegisterIndividualDto;
 import com.pangding.web.authority.reqvo.CheckMerchantIdReqVo;
+import com.pangding.web.authority.reqvo.GetUserByCompanyIdReqVo;
 import com.pangding.web.authority.service.MobileRegisterService;
 import com.pangding.web.authority.vo.CompanyVo;
 import com.pangding.web.authority.vo.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @Author zhangjinyao
@@ -34,4 +37,22 @@ public class MobileRegisterServiceImpl implements MobileRegisterService {
     public void saveUser(UserVo userVo) {
         userDaoImpl.create(userVo);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveCompany(CompanyVo companyVo) {
+        mobileRegisterDaoImpl.create(companyVo);
+        GetUserByCompanyIdReqVo companyId = new GetUserByCompanyIdReqVo();
+        companyId.setCompanyId(companyVo.getId());
+        UserVo userVo = userDaoImpl.getUserByCompanyId(companyId);
+        userVo.setPhone(companyVo.getContactPhone());
+        userDaoImpl.update(userVo);
+    }
+
+    @Override
+    public void checkPhone(RegisterIndividualDto companyDto) {
+        CompanyVo companyVo = new CompanyVo();
+        companyVo.setContactPhone(companyDto.getContactPhone());
+        mobileRegisterDaoImpl.checkPhone(companyVo);
+    }
 }

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -4,10 +4,7 @@ import com.pangding.web.authority.dao.RoleDao;
 import com.pangding.web.authority.dao.UserDao;
 import com.pangding.web.authority.dao.UserRoleDao;
 import com.pangding.web.authority.dto.UserDto;
-import com.pangding.web.authority.reqvo.GetRoleByRoleIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserByIdReqVo;
-import com.pangding.web.authority.reqvo.GetUserRoleListByUserIdReqVo;
-import com.pangding.web.authority.reqvo.UserRoleDaoRemoveReqVo;
+import com.pangding.web.authority.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.utils.Md5AndSalt;
 import com.pangding.web.authority.vo.*;
@@ -93,6 +90,11 @@ public class UserServiceImpl implements UserService {
         userDao.checkAccount(userVo);
     }
 
+    @Override
+    public void checkPhone(UserVo userVo) {
+        userDao.checkPhone(userVo);
+    }
+
     @Override
     public String passwordEncoder(String password) { return Md5AndSalt.generate(password); }
 
@@ -129,4 +131,35 @@ public class UserServiceImpl implements UserService {
     public RoleVo getRoleByRoleId(GetRoleByRoleIdReqVo getRoleByRoleIdReqVo) {
         return roleDao.getRoleById(getRoleByRoleIdReqVo);
     }
+
+    @Override
+    public Boolean isNumeric(String account) {
+        for (int i = 0;i < account.length();i++){
+            if (!Character.isDigit(account.charAt(i))){
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public Boolean isValid(String account) {
+        String regex = "^(?!\\d+$)[\\da-zA-Z]+$";
+        return account.matches(regex);
+    }
+
+    @Override
+    public UserVo getUserByPhone(String phone) {
+        GetUserByPhoneReqVo getUserByPhoneReqVo = new GetUserByPhoneReqVo();
+        getUserByPhoneReqVo.setPhone(phone);
+        return userDao.load(getUserByPhoneReqVo,UserVo.class);
+    }
+
+    @Override
+    public UserVo getUserByAccount(String account) {
+        GetUserByAccountReqVo getUserByAccountReqVo = new GetUserByAccountReqVo();
+        getUserByAccountReqVo.setAccount(account);
+        return userDao.load(getUserByAccountReqVo, UserVo.class);
+    }
 }

src/main/java/com/pangding/web/authority/vo/MobileLoginInfo.java

+package com.pangding.web.authority.vo;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/5/14 11:46
+ */
+public class MobileLoginInfo {
+
+    private String accountOrPhone;
+
+    private String password;
+
+    public String getAccountOrPhone() {
+        return accountOrPhone;
+    }
+
+    public void setAccountOrPhone(String accountOrPhone) {
+        this.accountOrPhone = accountOrPhone;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}