添加修改密码功能

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

 package com.pangding.web.authority.controller;
 
 
-import com.pangding.web.authority.vo.RoleVo;
-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;
@@ -10,7 +8,6 @@ import com.pangding.web.authority.vo.reqvo.WebRoleReqVo;
 import com.pangding.web.authority.service.RoleService;
 import com.pangding.web.authority.vo.resvo.WebRoleResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
-import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;

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

 package com.pangding.web.authority.controller;
 
 
-import com.pangding.web.authority.vo.UserVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.UserService;
 import com.pangding.web.authority.vo.resvo.WebUserResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
+import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 
 /**
  * @author zhangjinyao
@@ -52,12 +50,21 @@ public class UserController {
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseResult<String> updateUser(@RequestBody WebUserReqVo webUserReqVo){
-        CheckerHelper.newInstance()
-                .notBlankCheck("account",webUserReqVo.getAccount())
-                .notBlankCheck("password",webUserReqVo.getPassword())
-                .checkPhoneNo("phone",webUserReqVo.getPhone())
-                .notBlankCheck("companyId",webUserReqVo.getCompanyId())
-                .checkException();
+        if(!StringHelper.isEmpty(webUserReqVo.getUpdateType()) && 1 == webUserReqVo.getUpdateType()){
+            // 修改密码
+            CheckerHelper.newInstance()
+                    .notBlankCheck("id",webUserReqVo.getId())
+                    .notBlankCheck("password",webUserReqVo.getPassword())
+                    .checkPhoneNo("confirmPassword",webUserReqVo.getConfirmPassword())
+                    .checkException();
+        }else{
+            CheckerHelper.newInstance()
+                    .notBlankCheck("account",webUserReqVo.getAccount())
+                    .notBlankCheck("password",webUserReqVo.getPassword())
+                    .checkPhoneNo("phone",webUserReqVo.getPhone())
+                    .notBlankCheck("companyId",webUserReqVo.getCompanyId())
+                    .checkException();
+        }
         return ResponseResult.result(userServiceImpl.updateUser(webUserReqVo));
     }
 

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

@@ -19,12 +19,14 @@ public class RoleAuthorityDaoImpl extends BaseDaoImpl implements RoleAuthorityDa
     protected void init() {
         register(RoleAuthorityVo.class);
 
-        getSql(DaoConst.LOAD).setSql("select ra.role_id,a.* from pd_authority a " +
-                "LEFT JOIN pd_role_authority ra on ra.authority_id = a.id {INNER} " +
-                "where 1=1 {WHERE} ORDER BY a.pid,a.sort" )
+        getSql(DaoConst.LOAD).setSql("select ra.role_id,ra.authority_id,a.id,a.pid,a.name," +
+                "a.type,a.alias,a.url,a.remark,a.open_mode,a.sort,a.attribute from pd_role_authority ra  " +
+                "RIGHT JOIN pd_authority a on ra.authority_id = a.id {INNER} " +
+                "where 1=1 {WHERE} ORDER BY a.pid,a.attribute,a.sort" )
                 .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")
         ;
 
     }

src/main/java/com/pangding/web/authority/mq/CompanyConsumer.java

@@ -3,6 +3,7 @@ package com.pangding.web.authority.mq;
 import com.pangding.web.authority.service.CompanyService;
 import com.pangding.web.constant.MqConstant;
 import com.pangding.web.mq.CompanyProducer;
+import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
 import com.rabbitmq.client.Channel;
 import com.yanzuoguang.mq.service.MqService;
@@ -35,6 +36,15 @@ public class CompanyConsumer {
     public void init() {
         companyProducer.init();
     }
+
+    /**
+     * 申请提现
+     * @param capitalFlowReqVo
+     */
+    public void applyWithdrawal(CapitalFlowReqVo capitalFlowReqVo){
+        companyProducer.applyWithdrawal(capitalFlowReqVo);
+    }
+
     @RabbitListener(queues = {MqConstant.COMPANY_MONEY_UPDATE})
     public void UpdateCompanyMoney(String content, Message message, Channel channel) {
         log.info("[UpdateCompanyMoney 监听的消息] - [消费时间] - [{}] - [{}]", DateHelper.getNow(), content);
@@ -48,4 +58,18 @@ public class CompanyConsumer {
         }
     }
 
+
+//    @RabbitListener(queues = {MqConstant.COMPANY_MONEY_UPDATE})
+//    public void UpdateCompanyMoney(String content, Message message, Channel channel) {
+//        log.info("[UpdateCompanyMoney 监听的消息] - [消费时间] - [{}] - [{}]", DateHelper.getNow(), content);
+//        try {
+//            CompanyMoneyUpdateReqVo companyMoneyUpdateReqVo = JsonHelper.deserialize(content, CompanyMoneyUpdateReqVo.class);
+//            companyService.updateCompanyMoney(companyMoneyUpdateReqVo);
+//        } catch (Exception e) {
+//            Log.error(CompanyConsumer.class, e);
+//        } finally {
+//            mqService.basicAck(message, channel);
+//        }
+//    }
+
 }

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

@@ -310,7 +310,7 @@ public class AuthorityServiceImpl implements AuthorityService {
 
         RoleAuthorityGetReqVo roleAuthorityGetReqVo1 = new RoleAuthorityGetReqVo();
         roleAuthorityGetReqVo1.setRole(reqVo.getRoleId());
-        List<AuthorityVo> roleAuthorityVoList1 = roleAuthorityDao.loadList(roleAuthorityGetReqVo, AuthorityVo.class);
+        List<AuthorityVo> roleAuthorityVoList1 = roleAuthorityDao.loadList(roleAuthorityGetReqVo1, AuthorityVo.class);
         authorityListResVo.setAuthorityListByRole(roleAuthorityVoList1);
 
 //        for (RoleAuthorityVo roleAuthorityVo:roleAuthorityVoList) {
@@ -384,14 +384,14 @@ public class AuthorityServiceImpl implements AuthorityService {
         List<T> root = new ArrayList<>();
         // 将所有对象进行映射
         for (T vo : list) {
-            String id = vo.getId();
+            String id = vo.getAuthorityId();
             idMap.put(id, vo);
         }
 
         // 组合成父子级关系
         for (T vo : list) {
             String pid = StringHelper.getFirst(vo.getPid());
-            String id = vo.getId();
+            String id = vo.getAuthorityId();
             //当前对象的父对象不存在则创建一个临时的父对象
             if (StringHelper.isEmpty(pid)) {
                 root.add(vo);

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

@@ -14,7 +14,11 @@ import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.*;
 import com.pangding.web.constant.OrderConstant;
+import com.pangding.web.mq.CompanyProducer;
 import com.pangding.web.util.RSAUtils;
+import com.pangding.web.vo.order.req.CapitalFlowReqVo;
+import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
+import com.pangding.web.vo.system.req.company.CompanyExtendReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
 import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
@@ -67,6 +71,8 @@ public class CompanyServiceImpl implements CompanyService {
     private RoleDao roleDaoImpl;
     @Autowired
     private CompanyMoneyDetailDao companyMoneyDetailDao;
+    @Autowired
+    private CompanyProducer companyProducer;
 
     /**
      * 修改公司信息
@@ -1039,18 +1045,32 @@ public class CompanyServiceImpl implements CompanyService {
 
 
     public void automaticCashWithdrawal(com.pangding.web.vo.system.req.company.CompanyReqVo req) {
+        PageSizeData<com.pangding.web.vo.system.pd.company.CompanyExtendVo> companyExtendVoPageSizeData = companyExtendDaoImpl.loadPage(req, com.pangding.web.vo.system.pd.company.CompanyExtendVo.class);
+        List<com.pangding.web.vo.system.pd.company.CompanyExtendVo> companyExtendVoList = companyExtendVoPageSizeData.getList();
         PageSizeData<com.pangding.web.vo.system.pd.company.CompanyVo> companyVoPageSizeData = companyDao.loadPage(req, com.pangding.web.vo.system.pd.company.CompanyVo.class);
         List<com.pangding.web.vo.system.pd.company.CompanyVo> companyVoList = companyVoPageSizeData.getList();
-        for (int i = 0; i < companyVoList.size(); i++) {
-            String companyId = companyVoList.get(i).getId();
-            com.pangding.web.vo.system.pd.company.CompanyExtendVo companyExtendVo = companyExtendDaoImpl.load(companyId,
-                    com.pangding.web.vo.system.pd.company.CompanyExtendVo.class);
+        for (int i = 0; i < companyExtendVoList.size(); i++) {
+            com.pangding.web.vo.system.pd.company.CompanyExtendVo companyExtendVo = companyExtendVoList.get(i);
+            String companyId = companyExtendVoList.get(i).getId();
+//            com.pangding.web.vo.system.pd.company.CompanyVo companyVo = companyExtendDaoImpl.load(companyId,
+//                    com.pangding.web.vo.system.pd.company.CompanyVo.class);
             if (!StringHelper.isEmpty(companyExtendVo)) {
                 int withdrawRule = companyExtendVo.getWithdrawRule();
                 double withdrawTotalCash = companyExtendVo.getWithdrawTotalCash();
                 if (0 == withdrawRule && withdrawTotalCash > 0) {
                      // 自动提现
-
+                    CompanyBankCardReqVo companyBankCardReqVo = new CompanyBankCardReqVo();
+                    companyBankCardReqVo.setCompanyId(companyId);
+                    companyBankCardReqVo.setIsDefault(1);
+                    com.pangding.web.vo.system.pd.company.CompanyBankCardVo companyBankCardVo = companyBankCardDao.load(companyBankCardReqVo, com.pangding.web.vo.system.pd.company.CompanyBankCardVo.class);
+                    if(!StringHelper.isEmpty(companyBankCardVo)){
+                        CapitalFlowReqVo capitalFlowReqVo = new CapitalFlowReqVo();
+                        capitalFlowReqVo.setCompanyId(companyId);
+                        capitalFlowReqVo.setBankId(companyBankCardVo.getId());
+                        capitalFlowReqVo.setBankCardCode(companyBankCardVo.getBankCardCode());
+                        capitalFlowReqVo.setOrderMoney(withdrawTotalCash);
+                        companyProducer.applyWithdrawal(capitalFlowReqVo);
+                    }
                 }
             }
         }

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

@@ -102,17 +102,20 @@ public class RoleServiceImpl implements RoleService {
 
         roleDao.update(roleVo);
         RoleAuthorityGetReqVo reqVo = new RoleAuthorityGetReqVo();
-        reqVo.setRoleId(webRoleReqVo.getId());
+        reqVo.setRole(webRoleReqVo.getId());
         List<RoleAuthorityVo> roleAuthorityList = roleAuthorityDaoImpl.loadList(reqVo, RoleAuthorityVo.class);
         if (roleAuthorityList != null && !roleAuthorityList.isEmpty()) {
             for (RoleAuthorityVo roleAuthorityRelation : roleAuthorityList) {
-                roleAuthorityDaoImpl.remove(roleAuthorityRelation);
+                RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
+                roleAuthorityVo.setRoleId(roleAuthorityRelation.getRoleId());
+                roleAuthorityVo.setAuthorityId(roleAuthorityRelation.getAuthorityId());
+                roleAuthorityDaoImpl.remove(roleAuthorityVo);
             }
         }
         List<String> authorityIds = webRoleReqVo.getAuthorityIds();
         if (authorityIds != null && !authorityIds.isEmpty()) {
             for (String authorityId : authorityIds) {
-                saveRoleAuthority(reqVo.getRoleId(), authorityId);
+                saveRoleAuthority(roleVo.getId(), authorityId);
             }
         }
         return roleVo.getId();
@@ -125,11 +128,14 @@ public class RoleServiceImpl implements RoleService {
         if (null != authorityVo && null != authorityVo.getPid() && !authorityVo.getPid().isEmpty()) {
             saveRoleAuthority(roleId, authorityVo.getPid());
         }
-        RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
-        roleAuthorityVo.setRoleId(roleId);
-        roleAuthorityVo.setAuthorityId(authorityId);
-        RoleAuthorityVo existVo = roleAuthorityDaoImpl.load(roleAuthorityVo, RoleAuthorityVo.class);
+        RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
+        roleAuthorityGetReqVo.setRole(roleId);
+        roleAuthorityGetReqVo.setAuthority(authorityId);
+        RoleAuthorityVo existVo = roleAuthorityDaoImpl.load(roleAuthorityGetReqVo, RoleAuthorityVo.class);
         if (null == existVo) {
+            RoleAuthorityVo roleAuthorityVo = new RoleAuthorityVo();
+            roleAuthorityVo.setRoleId(roleId);
+            roleAuthorityVo.setAuthorityId(authorityId);
             roleAuthorityVo.setId(StringHelper.getNewID());
             roleAuthorityDaoImpl.create(roleAuthorityVo);
         }

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

@@ -108,27 +108,27 @@ public class UserServiceImpl implements UserService {
         this.checkPhone(webUserReqVo);
         webUserReqVo.setRemark(webUserReqVo.getPassword());
         webUserReqVo.setPassword(this.passwordEncoder(webUserReqVo.getPassword()));
-
         UserVo userVo = webUserReqVo;
         userDao.update(userVo);
-        UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
-        reqVo.setUserId(webUserReqVo.getId());
-        List<UserRoleVo> userRoleList = userRoleDao.getUserRoleList(reqVo);
-        if(userRoleList != null && !userRoleList.isEmpty()){
-            List<String> userRoleIdList = new ArrayList(userRoleList.size());
-            for (UserRoleVo userRole:userRoleList) {
-                userRoleIdList.add(userRole.getId());
-            }
-            if (userRoleIdList != null && !userRoleIdList.isEmpty()){
-                for (String userRoleId:userRoleIdList){
-                    UserRoleRemoveReqVo userRole = new UserRoleRemoveReqVo();
-                    userRole.setId(userRoleId);
-                    userRoleDao.remove(userRole);
+        if(StringHelper.isEmpty(webUserReqVo.getUpdateType())){
+            UserRoleGetReqVo reqVo = new UserRoleGetReqVo();
+            reqVo.setUserId(webUserReqVo.getId());
+            List<UserRoleVo> userRoleList = userRoleDao.getUserRoleList(reqVo);
+            if(userRoleList != null && !userRoleList.isEmpty()){
+                List<String> userRoleIdList = new ArrayList(userRoleList.size());
+                for (UserRoleVo userRole:userRoleList) {
+                    userRoleIdList.add(userRole.getId());
+                }
+                if (userRoleIdList != null && !userRoleIdList.isEmpty()){
+                    for (String userRoleId:userRoleIdList){
+                        UserRoleRemoveReqVo userRole = new UserRoleRemoveReqVo();
+                        userRole.setId(userRoleId);
+                        userRoleDao.remove(userRole);
+                    }
                 }
             }
+            saveUserRole(webUserReqVo);
         }
-        saveUserRole(webUserReqVo);
-
         return userVo.getId();
     }
 

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

@@ -13,6 +13,8 @@ public class RoleAuthorityGetReqVo {
 
     private String role;
 
+    private String authority;
+
     private String userId;
 
     public String getUserId() {
@@ -54,4 +56,12 @@ public class RoleAuthorityGetReqVo {
     public void setRole(String role) {
         this.role = role;
     }
+
+    public String getAuthority() {
+        return authority;
+    }
+
+    public void setAuthority(String authority) {
+        this.authority = authority;
+    }
 }

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

@@ -8,10 +8,13 @@ import java.util.List;
  * @author zhangjinyao
  */
 public class WebUserReqVo extends UserVo {
+
     private String reqId;
 
     private String confirmPassword;
 
+    private Integer updateType;
+
     private List<String> roleIds;
 
     public String getConfirmPassword() {
@@ -38,4 +41,11 @@ public class WebUserReqVo extends UserVo {
         this.roleIds = roleIds;
     }
 
+    public Integer getUpdateType() {
+        return updateType;
+    }
+
+    public void setUpdateType(Integer updateType) {
+        this.updateType = updateType;
+    }
 }

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

@@ -12,6 +12,8 @@ import java.util.List;
  */
 public class AuthorityListByLevelResVo extends AuthorityVo {
 
+    private String authorityId;
+
     List<AuthorityListByLevelResVo> childList = new ArrayList<>();
 
     public List<AuthorityListByLevelResVo> getChildList() {
@@ -21,4 +23,12 @@ public class AuthorityListByLevelResVo extends AuthorityVo {
     public void setChildList(List<AuthorityListByLevelResVo> childList) {
         this.childList = childList;
     }
+
+    public String getAuthorityId() {
+        return authorityId;
+    }
+
+    public void setAuthorityId(String authorityId) {
+        this.authorityId = authorityId;
+    }
 }