From 3b72f1f4dd46191857583a166d5b67722c6b118e Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 25 Mar 2021 17:19:50 +0800
Subject: [PATCH] manage模块     添加组织增删改功能 查待完成

---
 screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java |   99 +++++++++++++++++++++++++++++--------------------
 1 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index 641d362..08da75a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -14,7 +14,12 @@
 import com.moral.api.pojo.dto.account.*;
 import com.moral.api.pojo.dto.login.AccountInfoDTO;
 import com.moral.api.pojo.dto.login.LoginDTO;
-import com.moral.api.pojo.form.*;
+import com.moral.api.pojo.form.account.AccountDeleteForm;
+import com.moral.api.pojo.form.account.AccountInsertForm;
+import com.moral.api.pojo.form.account.AccountQueryForm;
+import com.moral.api.pojo.form.account.AccountUpdateForm;
+import com.moral.api.pojo.form.login.LoginForm;
+import com.moral.api.pojo.form.login.LogoutForm;
 import com.moral.api.service.ManageAccountService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.moral.constant.Constants;
@@ -23,15 +28,11 @@
 import com.moral.util.MD5Utils;
 import com.moral.util.TokenUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * <p>
@@ -58,7 +59,7 @@
     /**
      * @Description: ������
      * @Param: [parameters]
-     * @return: java.util.Map<java.lang.String                                                                                                                                                                                                                                                               ,                                                                                                                                                                                                                                                               java.lang.Object>
+     * @return: java.util.Map<java.lang.String                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               java.lang.Object>
      * @Author: ���������
      * @Date: 2021/3/11
      */
@@ -128,7 +129,7 @@
     /**
      * @Description: ������
      * @Param: [parameters]
-     * @return: java.util.Map<java.lang.String                                                                                                                                                                                                                                                               ,                                                                                                                                                                                                                                                               java.lang.Object>
+     * @return: java.util.Map<java.lang.String                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               java.lang.Object>
      * @Author: ���������
      * @Date: 2021/3/11
      */
@@ -162,11 +163,11 @@
         List<String> roleIdsStr = accountInsertForm.getRoleIds();
 
         /*������������������������*/
-        ManageAccount exitAccount = new ManageAccount();
-        exitAccount.setAccount(account);
-        exitAccount.setIsDelete(Constants.NOT_DELETE);
+        ManageAccount existAccount = new ManageAccount();
+        existAccount.setAccount(account);
+        existAccount.setIsDelete(Constants.NOT_DELETE);
         QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
-        wrapper.setEntity(exitAccount);
+        wrapper.setEntity(existAccount);
         List<ManageAccount> exitAccounts = manageAccountMapper.selectList(wrapper);
         if (!ObjectUtils.isEmpty(exitAccounts)) {
             accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST.getCode());
@@ -230,32 +231,43 @@
         String mobile = accountQueryForm.getMobile();
         String wechat = accountQueryForm.getWechat();
         String isDelete = accountQueryForm.getIsDelete();
+        String order = accountQueryForm.getOrder();
+        String orderType = accountQueryForm.getOrderType();
 
         //������������
         Page<ManageAccount> page = new Page<>(pageCount, size);
         QueryWrapper<ManageAccount> wrapper = new QueryWrapper();
-        if(!ObjectUtils.isEmpty(accountId)){
-            wrapper.eq("id",accountId);
+        if (!ObjectUtils.isEmpty(accountId)) {
+            wrapper.eq("id", accountId);
         }
 
-        if(!ObjectUtils.isEmpty(userName)){
-            wrapper.like("user_name",userName);
+        if (!ObjectUtils.isEmpty(userName)) {
+            wrapper.like("user_name", userName);
         }
 
-        if(!ObjectUtils.isEmpty(account)){
-            wrapper.like("account",account);
+        if (!ObjectUtils.isEmpty(account)) {
+            wrapper.like("account", account);
         }
 
-        if(!ObjectUtils.isEmpty(email)){
-            wrapper.like("email",email);
+        if (!ObjectUtils.isEmpty(email)) {
+            wrapper.like("email", email);
         }
 
-        if(!ObjectUtils.isEmpty(mobile)){
-            wrapper.like("mobile",mobile);
+        if (!ObjectUtils.isEmpty(mobile)) {
+            wrapper.like("mobile", mobile);
         }
 
-        if(!ObjectUtils.isEmpty(wechat)){
-            wrapper.like("wechat",wechat);
+        if (!ObjectUtils.isEmpty(wechat)) {
+            wrapper.like("wechat", wechat);
+        }
+
+        if (!ObjectUtils.isEmpty(order)) {
+            if (!ObjectUtils.isEmpty(orderType)) {
+                if (orderType.equals(Constants.ORDER_ASC))
+                    wrapper.orderByAsc(order);
+                else
+                    wrapper.orderByDesc(order);
+            }
         }
 
         if (!ObjectUtils.isEmpty(isDelete))
@@ -301,13 +313,13 @@
         AccountUpdateDTO accountUpdateDTO = new AccountUpdateDTO();
         //������
         Integer accountId = accountUpdateForm.getAccountId();
+        String password = accountUpdateForm.getPassword();
         String email = accountUpdateForm.getEmail();
         String mobile = accountUpdateForm.getMobile();
         String wechat = accountUpdateForm.getWechat();
         String userName = accountUpdateForm.getUserName();
         List<Integer> roleIds = accountUpdateForm.getRoleIds();
-        //������������������������������
-        /*������������������������������������*/
+        //������������������������������������
         QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
         ManageAccount exitManageAccount = new ManageAccount();
         exitManageAccount.setId(accountId);
@@ -319,8 +331,13 @@
             accountUpdateDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
             return accountUpdateDTO;
         }
+        //������password
+        if(!ObjectUtils.isEmpty(password)){
+            password = MD5Utils.saltMD5(AESUtils.decrypt(password));
+        }
         //������ManageAccount���
         ManageAccount manageAccount = new ManageAccount();
+        manageAccount.setPassword(password);
         manageAccount.setEmail(email);
         manageAccount.setMobile(mobile);
         manageAccount.setWechat(wechat);
@@ -328,24 +345,26 @@
         QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
         wrapper.eq("id", accountId);
         manageAccountMapper.update(manageAccount, wrapper);
-        //������ManageAccountRole���
+        //���������������������������������ManageAccountRole���
         /*������������������������������*/
-        QueryWrapper<ManageAccountRole> deleteWrapper = new QueryWrapper<>();
-        deleteWrapper.eq("account_id", accountId);
-        manageAccountRoleMapper.delete(deleteWrapper);
-        /*������������������*/
-        for (Integer roleId : roleIds) {
-            ManageAccountRole manageAccountRole = new ManageAccountRole();
-            manageAccountRole.setAccountId(accountId);
-            manageAccountRole.setRoleId(roleId);
-            manageAccountRoleMapper.insert(manageAccountRole);
+        if (!ObjectUtils.isEmpty(roleIds)) {
+            QueryWrapper<ManageAccountRole> deleteWrapper = new QueryWrapper<>();
+            deleteWrapper.eq("account_id", accountId);
+            manageAccountRoleMapper.delete(deleteWrapper);
+            /*������������������*/
+            for (Integer roleId : roleIds) {
+                ManageAccountRole manageAccountRole = new ManageAccountRole();
+                manageAccountRole.setAccountId(accountId);
+                manageAccountRole.setRoleId(roleId);
+                manageAccountRoleMapper.insert(manageAccountRole);
+            }
+            //������������������������
+            List<ManageRole> manageRoles = manageRoleMapper.selectBatchIds(roleIds);
+            accountUpdateDTO.setRoles(manageRoles);
         }
-        //������������������������
-        List<ManageRole> manageRoles = manageRoleMapper.selectBatchIds(roleIds);
         //������������������
         accountUpdateDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
         accountUpdateDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
-        accountUpdateDTO.setRoles(manageRoles);
         accountUpdateDTO.setAccount(manageAccountMapper.selectById(accountId));
         return accountUpdateDTO;
     }
@@ -370,7 +389,7 @@
         manageAccount.setId(accountId);
         QueryWrapper<ManageAccount> queryWrapper = new QueryWrapper<>();
         queryWrapper.setEntity(manageAccount);
-        ManageAccount existManageAccount = manageAccount.selectOne(queryWrapper);
+        ManageAccount existManageAccount = manageAccountMapper.selectOne(queryWrapper);
         if (ObjectUtils.isEmpty(existManageAccount)) {
             accountDeleteDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
             accountDeleteDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
@@ -391,8 +410,6 @@
         accountDeleteDTO.setAccount(existManageAccount);
         return accountDeleteDTO;
     }
-
-
 
 
 }

--
Gitblit v1.8.0