kaiyu
2021-03-18 64994bcb51726e8e26016b99e2de55278539b484
api manage:
将全部用于判断isdelete的0/1替换为constants中的常量
4 files modified
26 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/LoginController.java 3 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java 3 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java 17 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java 3 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/LoginController.java
@@ -1,5 +1,6 @@
package com.moral.api.controller;
import com.moral.constant.Constants;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -67,7 +68,7 @@
            return ResultMessage.fail(ResponseCodeEnum.PASSWORD_INVALID.getCode(), ResponseCodeEnum.PASSWORD_INVALID.getMsg());
        }
        //校验是否删除
        if ("1".equals(user.getIsDelete())) {
        if (Constants.DELETE.equals(user.getIsDelete())) {
            return ResultMessage.fail(ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode(), ResponseCodeEnum.ACCOUNT_IS_DELETE.getMsg());
        }
        //校验是否过期
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -21,6 +21,7 @@
import com.moral.api.mapper.UserMapper;
import com.moral.api.service.UserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
import com.moral.util.RegexUtils;
@@ -181,7 +182,7 @@
        } else {
            User user = new User();
            user.setId(userId);
            user.setIsDelete("1");
            user.setIsDelete(Constants.DELETE);
            userMapper.updateById(user);
        }
        return resultMap;
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -17,6 +17,7 @@
import com.moral.api.pojo.form.*;
import com.moral.api.service.ManageAccountService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
@@ -81,7 +82,7 @@
        //查询是否逻辑删除
        ManageAccount manageAccount = null;
        for (ManageAccount value : manageAccounts) {
            if ("0".equals(value.getIsDelete()))
            if (Constants.NOT_DELETE.equals(value.getIsDelete()))
                manageAccount = value;
        }
@@ -163,7 +164,7 @@
        /*判断账号是否存在*/
        ManageAccount exitAccount = new ManageAccount();
        exitAccount.setAccount(account);
        exitAccount.setIsDelete("0");
        exitAccount.setIsDelete(Constants.NOT_DELETE);
        QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
        wrapper.setEntity(exitAccount);
        List<ManageAccount> exitAccounts = manageAccountMapper.selectList(wrapper);
@@ -260,7 +261,7 @@
        if (!ObjectUtils.isEmpty(isDelete))
            wrapper.eq("is_delete", isDelete);
        else
            wrapper.eq("is_delete", "0");
            wrapper.eq("is_delete", Constants.NOT_DELETE);
        Page resultPage = manageAccountMapper.selectPage(page, wrapper);
        //查询用户对应的角色
@@ -310,7 +311,7 @@
        QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
        ManageAccount exitManageAccount = new ManageAccount();
        exitManageAccount.setId(accountId);
        exitManageAccount.setIsDelete("0");
        exitManageAccount.setIsDelete(Constants.NOT_DELETE);
        exitWrapper.setEntity(exitManageAccount);
        List<ManageAccount> manageAccounts = manageAccountMapper.selectList(exitWrapper);
        if (ObjectUtils.isEmpty(manageAccounts)) {
@@ -365,7 +366,7 @@
        Integer accountId = accountDeleteForm.getAccountId();
        //查询是否存在
        ManageAccount manageAccount = new ManageAccount();
        manageAccount.setIsDelete("0");
        manageAccount.setIsDelete(Constants.NOT_DELETE);
        manageAccount.setId(accountId);
        QueryWrapper<ManageAccount> queryWrapper = new QueryWrapper<>();
        queryWrapper.setEntity(manageAccount);
@@ -376,13 +377,13 @@
            return accountDeleteDTO;
        }
        //逻辑删除账号
        existManageAccount.setIsDelete("1");
        existManageAccount.setIsDelete(Constants.DELETE);
        UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
        deleteAccountWrapper.set("is_delete", "1").eq("id", manageAccount.getId());
        deleteAccountWrapper.set("is_delete", Constants.DELETE).eq("id", manageAccount.getId());
        manageAccountMapper.update(null, deleteAccountWrapper);
        //逻辑删除账号相关角色
        UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
        deleteManageAccountRoleWrapper.set("is_delete", "1").eq("account_id", manageAccount.getId());
        deleteManageAccountRoleWrapper.set("is_delete", Constants.DELETE).eq("account_id", manageAccount.getId());
        manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
        //封装返回结果
        accountDeleteDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -6,6 +6,7 @@
import com.moral.api.mapper.ManageRoleMenuMapper;
import com.moral.api.service.ManageRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -123,7 +124,7 @@
        }else {
            ManageRole manageRole = new ManageRole();
            manageRole.setId(Integer.parseInt(map.get("id").toString()));
            manageRole.setIsDelete("1");
            manageRole.setIsDelete(Constants.DELETE);
            Map deleteMap = new HashMap();
            deleteMap.put("id",Integer.parseInt(map.get("id").toString()));
            deleteMap.put("is_delete",1);