修改实体

pom.xml

@@ -39,6 +39,10 @@
             <groupId>com.yanzuoguang</groupId>
             <artifactId>yzg-util-mq</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.pangding.web</groupId>
+            <artifactId>pd-log-feign</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

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

@@ -60,7 +60,7 @@ public class AuthorityController {
                 .notBlankCheck("authorityName",authorityVo.getName())
                 .notBlankCheck("type",authorityVo.getType())
                 .notBlankCheck("alias",authorityVo.getAlias())
-                .notBlankCheck("openMode",authorityVo.getOpenMode())
+//                .notBlankCheck("openMode",authorityVo.getOpenMode())
                 .notBlankCheck("remark",authorityVo.getRemark())
                 .notBlankCheck("sort",authorityVo.getSort())
                 .checkException();

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

+package com.pangding.web.authority.controller;
+
+import com.pangding.web.vo.system.req.authority.SaveUserReqVo;
+import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.vo.ResponseResult;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author  tf
+ * 注册controller
+ */
+@RestController
+@RequestMapping(value = "/register")
+@Api(value = "注册类", description = "注册用户，新增用户")
+public class RegisterController {
+
+    @RequestMapping(value = "/saveUser")
+    public ResponseResult saveUser(@RequestBody SaveUserReqVo req){
+        CheckerHelper.newInstance().notBlankCheck("", req.getAccount())
+                .notBlankCheck("", req.getPassword())
+                .notBlankCheck("", req.getConfirmPassword())
+                .notBlankCheck("", req.getInvitationCode())
+                .notBlankCheck("", req.getCompanyType())
+
+                .checkException();
+
+        return ResponseResult.result("");
+    }
+
+
+}

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

 package com.pangding.web.authority.controller;
 
 
+import com.pangding.web.authority.util.RsaConstant;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
+import com.pangding.web.util.RSAUtils;
+import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.CheckerHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -50,13 +53,21 @@ public class UserController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<String> updateUser(@RequestBody WebUserReqVo webUserReqVo){
+        try{
             if(!StringHelper.isEmpty(webUserReqVo.getUpdateType()) && 1 == webUserReqVo.getUpdateType()){
                 // 修改密码
                 CheckerHelper.newInstance()
                         .notBlankCheck("id",webUserReqVo.getId())
                         .notBlankCheck("password",webUserReqVo.getPassword())
-                    .checkPhoneNo("confirmPassword",webUserReqVo.getConfirmPassword())
+                        .notBlankCheck("confirmPassword",webUserReqVo.getConfirmPassword())
                         .checkException();
+                String password = RSAUtils.decryptionByPrivateKey(webUserReqVo.getPassword(), RsaConstant.privateKey);
+                String confirmPassword = RSAUtils.decryptionByPrivateKey(webUserReqVo.getConfirmPassword(),RsaConstant.privateKey);
+                if (!StringHelper.compare(password,confirmPassword)){
+                    throw new CodeException("两次密码输入不一致");
+                }
+                webUserReqVo.setPassword(password);
+                webUserReqVo.setConfirmPassword(confirmPassword);
             }else{
                 CheckerHelper.newInstance()
                         .notBlankCheck("account",webUserReqVo.getAccount())
@@ -66,6 +77,10 @@ public class UserController {
                         .checkException();
             }
             return ResponseResult.result(userServiceImpl.updateUser(webUserReqVo));
+        }catch (Exception e){
+              return ResponseResult.error("99", e.getMessage());
+        }
+
     }
 
     /**

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

 package com.pangding.web.authority.dao;
 
-import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.yanzuoguang.dao.BaseDao;
 import com.yanzuoguang.util.vo.PageSizeData;
 
-import java.util.List;
-
 /**
  * @author zhangjinyao
  */

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

@@ -21,7 +21,7 @@ public class CompanyDaoImpl extends BaseDaoImpl implements CompanyDao {
 
         register(CompanyVo.class);
 
-        table.add(SELECT,"select * from pd_company where 1=1 ")
+        table.add(SELECT,"select * from pd_company where 1=1 {WHERE} order by create_time desc")
                 .add("companyName","and company_name = ? ")
                 .add("companyType","and company_type = ? ")
                 .add("companyAttribute","and company_attribute = ? ")

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

@@ -23,8 +23,7 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
                 .add("userId", "AND b.user_id = @userId",
                         "{INNER}", "INNER JOIN pd_user_role AS b ON ra.role_id = b.role_id")
                 .add("role", " AND ra.role_id = @role")
-                .add("authority", " AND ra.authority_id = @authority")
-        ;
+                .add("authority", " AND ra.authority_id = @authority");
 
     }
 

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.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListUserReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetReqVo;
 import com.pangding.web.authority.vo.reqvo.UserGetSuperAdminReqVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.yanzuoguang.dao.impl.BaseDaoImpl;
 import com.yanzuoguang.util.vo.PageSizeData;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @author zhangjinyao
  */

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

 package com.pangding.web.authority.service;
 
-import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.AddReqVo;
 import com.pangding.web.authority.vo.reqvo.CountByRoleReqVo;
 import com.pangding.web.authority.vo.reqvo.ListRoleReqVo;
@@ -8,6 +7,7 @@ import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.pangding.web.vo.system.pd.authority.AuthorityVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;

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

@@ -4,6 +4,7 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.yanzuoguang.util.vo.PageSizeData;
 
 import java.util.List;

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

@@ -12,6 +12,7 @@ import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.pangding.web.vo.system.pd.authority.AuthorityVo;
 import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.res.authority.RoleAuthorityLoadResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
@@ -236,7 +237,7 @@ public class AuthorityServiceImpl implements AuthorityService {
         authorityDao.remove(authorityVo);
 
         RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
-        roleAuthorityGetReqVo.setAuthorityId(reqVo.getId());
+        roleAuthorityGetReqVo.setAuthority(reqVo.getId());
         List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDao.loadList(roleAuthorityGetReqVo, RoleAuthorityVo.class);
         for (RoleAuthorityVo roleAuthority : roleAuthorityList) {
             roleAuthorityDao.remove(roleAuthority);

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

@@ -19,6 +19,7 @@ import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;

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

@@ -6,6 +6,7 @@ import com.pangding.web.authority.util.CompanyConstant;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.FindResVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;

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

@@ -9,6 +9,7 @@ import com.pangding.web.authority.util.ShareCodeUtil;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;

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

@@ -9,6 +9,7 @@ import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.pangding.web.vo.system.pd.authority.AuthorityVo;
 import com.pangding.web.vo.system.pd.authority.RoleAuthorityVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.StringHelper;

src/main/java/com/pangding/web/authority/util/RsaConstant.java

 package com.pangding.web.authority.util;
 
-import org.springframework.beans.factory.annotation.Value;
 
 /**
  * @Author zhangjinyao

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

-package com.pangding.web.authority.vo;
-
-import com.yanzuoguang.dao.TableAnnotation;
-import com.yanzuoguang.util.helper.DateHelper;
-import com.yanzuoguang.util.helper.StringHelper;
-import com.yanzuoguang.util.vo.BaseVo;
-import com.yanzuoguang.util.vo.InitDao;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Date;
-
-/**
- * @author zhangjinyao
- */
-@TableAnnotation("pd_user")
-public class UserVo extends BaseVo implements InitDao {
-
-    private String id;
-
-    private String account;
-
-    private String password;
-
-    private String phone;
-
-    private Integer status;
-
-    private String remark;
-
-    @TableAnnotation("create_time")
-    private String createTime;
-
-    @TableAnnotation("create_id")
-    private String createId;
-
-    @TableAnnotation("create_name")
-    private String createName;
-
-    @TableAnnotation("company_id")
-    private String companyId;
-
-    private String name;
-
-    private String email;
-
-    @TableAnnotation("is_first")
-    private Integer isFirst;
-
-    public Integer getIsFirst() {
-        return isFirst;
-    }
-
-    public void setIsFirst(Integer isFirst) {
-        this.isFirst = isFirst;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(String createId) {
-        this.createId = createId;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(String companyId) {
-        this.companyId = companyId;
-    }
-
-    @Override
-    public void init() {
-        this.createTime = StringHelper.getFirst(this.createTime, DateHelper.getNow());
-    }
-}

src/main/java/com/pangding/web/authority/vo/cloudvo/LoginResVo.java

@@ -4,6 +4,7 @@ import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 
 import java.util.List;
 

src/main/java/com/pangding/web/authority/vo/reqvo/BatchUpdateReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
-import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 
 import java.util.List;
 

src/main/java/com/pangding/web/authority/vo/reqvo/WebUserReqVo.java

 package com.pangding.web.authority.vo.reqvo;
 
-import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 
 import java.util.List;
 

src/main/java/com/pangding/web/authority/vo/resvo/CompanyResVo.java

@@ -3,6 +3,7 @@ package com.pangding.web.authority.vo.resvo;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;

src/main/java/com/pangding/web/authority/vo/resvo/DetailResVo.java

 package com.pangding.web.authority.vo.resvo;
 
-import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 
 import java.util.List;

src/main/java/com/pangding/web/authority/vo/resvo/ManagementResVo.java

 package com.pangding.web.authority.vo.resvo;
 
-import com.pangding.web.authority.vo.UserVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
 import com.pangding.web.vo.system.pd.company.CompanyVo;
 

src/main/java/com/pangding/web/authority/vo/resvo/WebUserResVo.java

 package com.pangding.web.authority.vo.resvo;
 
-import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
+import com.pangding.web.vo.system.pd.authority.UserVo;
 
 import java.util.List;