moral.git - Gitblit

			@@ -22,11 +22,10 @@
			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.api.config.mybatis.wrapper.NullFilterWrapper;
			import com.moral.constant.Constants;
			import com.moral.constant.ResponseCodeEnum;
			import com.moral.util.AESUtils;
			import com.moral.util.MD5Utils;
			import com.moral.util.TokenUtils;
			import com.moral.util.*;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;
			@@ -57,12 +56,12 @@


			/**
			* @Description: 登陆
			* @Param: [parameters]
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @Author: 陈凯裕
			* @Date: 2021/3/11
			*/
			* @Description: 登陆接口
			* @Param: [loginForm]
			* @return: com.moral.api.pojo.dto.login.LoginDTO
			* @Author: 陈凯裕
			* @Date: 2021/3/30
			*/
			@Override
			public LoginDTO login(LoginForm loginForm) {
			LoginDTO loginDTO = new LoginDTO();
			@@ -129,7 +128,7 @@
			/**
			* @Description: 注销
			* @Param: [parameters]
			* @return: java.util.Map<java.lang.String , java.lang.Object>
			* @return:
			* @Author: 陈凯裕
			* @Date: 2021/3/11
			*/
			@@ -150,40 +149,28 @@
			*/
			@Override
			@Transactional
			public AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm) {
			AccountInsertDTO accountInsertDTO = new AccountInsertDTO();
			public AccountDTO insertAccount(AccountInsertForm accountInsertForm) {
			AccountDTO accountDTO = new AccountDTO();
			//取参
			String account = accountInsertForm.getAccount();
			String AESPassword = accountInsertForm.getPassword();
			String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword));
			String userName = accountInsertForm.getUserName();
			String email = accountInsertForm.getEmail();
			String mobile = accountInsertForm.getMobile();
			String wechat = accountInsertForm.getWechat();
			ManageAccount manageAccount = accountInsertForm.formConvertEntity();
			List<String> roleIdsStr = accountInsertForm.getRoleIds();

			/判断账号是否存在/
			ManageAccount existAccount = new ManageAccount();
			existAccount.setAccount(account);
			existAccount.setAccount(manageAccount.getAccount());
			existAccount.setIsDelete(Constants.NOT_DELETE);
			QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
			wrapper.setEntity(existAccount);
			List<ManageAccount> exitAccounts = manageAccountMapper.selectList(wrapper);
			if (!ObjectUtils.isEmpty(exitAccounts)) {
			accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST.getCode());
			accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
			return accountInsertDTO;
			ManageAccount exitAccountResult = manageAccountMapper.selectOne(wrapper);
			if (!ObjectUtils.isEmpty(exitAccountResult)) {
			accountDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST.getCode());
			accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
			return accountDTO;
			}

			//封装account
			ManageAccount manageAccount = new ManageAccount();
			manageAccount.setAccount(account);
			manageAccount.setPassword(password);
			manageAccount.setUserName(userName);
			manageAccount.setEmail(email);
			manageAccount.setMobile(mobile);
			manageAccount.setWechat(wechat);
			//插入
			manageAccountMapper.insert(manageAccount);

			//封装account_role
			/String to Integer/
			List<ManageRole> roles = null;
			@@ -204,11 +191,11 @@
			roles = manageRoleMapper.selectBatchIds(roleIds);
			}
			//封装返回结果
			accountInsertDTO.setAccount(manageAccount);
			accountInsertDTO.setRoles(roles);
			accountInsertDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
			accountInsertDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			return accountInsertDTO;
			accountDTO.setAccount(manageAccount);
			accountDTO.setRoles(roles);
			accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
			accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			return accountDTO;
			}

			/**
			@@ -221,11 +208,10 @@
			@Override
			public AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm) {
			AccountQueryDTO accountQueryDTO = new AccountQueryDTO();

			//取参
			Integer pageCount = accountQueryForm.getPage();
			Integer size = accountQueryForm.getSize();
			Integer accountId = accountQueryForm.getAccountId();
			String account = accountQueryForm.getAccount();
			String userName = accountQueryForm.getUserName();
			String email = accountQueryForm.getEmail();
			String mobile = accountQueryForm.getMobile();
			@@ -233,49 +219,34 @@
			String isDelete = accountQueryForm.getIsDelete();
			String order = accountQueryForm.getOrder();
			String orderType = accountQueryForm.getOrderType();
			Date createStartTime = accountQueryForm.getCreateStartTime();
			Date createEndTime = DateUtils.getDateOfDay(accountQueryForm.getCreateEndTime(), 1);

			//查询用户
			//组装查询条件
			Page<ManageAccount> page = new Page<>(pageCount, size);
			QueryWrapper<ManageAccount> wrapper = new QueryWrapper();
			if (!ObjectUtils.isEmpty(accountId)) {
			wrapper.eq("id", accountId);
			NullFilterWrapper<ManageAccount> wrapper = new NullFilterWrapper<>();

			wrapper.like("user_name", userName);
			wrapper.like("email", email);
			wrapper.like("mobile", mobile);
			wrapper.like("wechat", wechat);
			wrapper.between("create_time", createStartTime, createEndTime);

			if (!ObjectUtils.isEmpty(order) && !ObjectUtils.isEmpty(orderType)) { //排序顺序条件构造
			if (orderType.equals(Constants.ORDER_ASC))
			wrapper.orderByAsc(ConvertUtils.toLine(order));
			else
			wrapper.orderByDesc(ConvertUtils.toLine(order));
			}

			if (!ObjectUtils.isEmpty(userName)) {
			wrapper.like("user_name", userName);
			}

			if (!ObjectUtils.isEmpty(account)) {
			wrapper.like("account", account);
			}

			if (!ObjectUtils.isEmpty(email)) {
			wrapper.like("email", email);
			}

			if (!ObjectUtils.isEmpty(mobile)) {
			wrapper.like("mobile", mobile);
			}

			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))
			if (!ObjectUtils.isEmpty(isDelete))//逻辑删除条件构造
			wrapper.eq("is_delete", isDelete);
			else
			wrapper.eq("is_delete", Constants.NOT_DELETE);

			//查询结果
			Page resultPage = manageAccountMapper.selectPage(page, wrapper);

			//查询用户对应的角色
			List<ManageAccount> accounts = resultPage.getRecords();
			List<AccountDTO> accountDTOS = new ArrayList<>();
			@@ -288,6 +259,7 @@
			accountDTOS.add(accountDTO);
			}
			}

			//封装返回结果
			accountQueryDTO.setAccountDTOS(accountDTOS);
			accountQueryDTO.setCurrent(resultPage.getCurrent());
			@@ -309,64 +281,58 @@
			*/
			@Override
			@Transactional
			public AccountUpdateDTO updateAccount(AccountUpdateForm accountUpdateForm) {
			AccountUpdateDTO accountUpdateDTO = new AccountUpdateDTO();
			public AccountDTO updateAccount(AccountUpdateForm accountUpdateForm) {
			AccountDTO accountDTO = new AccountDTO();
			//取参
			Integer accountId = accountUpdateForm.getAccountId();
			String password = accountUpdateForm.getPassword();
			String email = accountUpdateForm.getEmail();
			String mobile = accountUpdateForm.getMobile();
			String wechat = accountUpdateForm.getWechat();
			String userName = accountUpdateForm.getUserName();
			ManageAccount manageAccount = accountUpdateForm.formConvertEntity();
			List<Integer> roleIds = accountUpdateForm.getRoleIds();

			//判断要更新的用户是否存在
			QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
			ManageAccount exitManageAccount = new ManageAccount();
			exitManageAccount.setId(accountId);
			exitManageAccount.setId(manageAccount.getId());
			exitManageAccount.setIsDelete(Constants.NOT_DELETE);
			exitWrapper.setEntity(exitManageAccount);
			List<ManageAccount> manageAccounts = manageAccountMapper.selectList(exitWrapper);
			if (ObjectUtils.isEmpty(manageAccounts)) {
			accountUpdateDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
			accountUpdateDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
			return accountUpdateDTO;
			accountDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
			accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
			return accountDTO;
			}
			//转换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);
			manageAccount.setUserName(userName);
			QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
			wrapper.eq("id", accountId);
			manageAccountMapper.update(manageAccount, wrapper);
			manageAccountMapper.updateById(manageAccount);

			//如果角色有变动，则更新ManageAccountRole表
			/删除该用户的所有角色/
			if (!ObjectUtils.isEmpty(roleIds)) {
			QueryWrapper<ManageAccountRole> deleteWrapper = new QueryWrapper<>();
			deleteWrapper.eq("account_id", accountId);
			manageAccountRoleMapper.delete(deleteWrapper);
			/*
			* 如果roleIds为null，则是该账号角色没有发生改变
			* 如果roleIds为空，则是该账号所有的角色都被移除
			* 如果roleIds有元素，则是该账号的角色有更新
			* */
			List<ManageRole> roles = null;
			if (roleIds != null) {
			UpdateWrapper<ManageAccountRole> deleteWrapper = new UpdateWrapper<>();
			deleteWrapper.eq("account_id", manageAccount.getId()).set("is_delete", Constants.DELETE);
			manageAccountRoleMapper.update(null, deleteWrapper);
			/重新添加角色/
			for (Integer roleId : roleIds) {
			ManageAccountRole manageAccountRole = new ManageAccountRole();
			manageAccountRole.setAccountId(accountId);
			manageAccountRole.setAccountId(manageAccount.getId());
			manageAccountRole.setRoleId(roleId);
			manageAccountRoleMapper.insert(manageAccountRole);
			}
			//获取用户所有角色
			List<ManageRole> manageRoles = manageRoleMapper.selectBatchIds(roleIds);
			accountUpdateDTO.setRoles(manageRoles);
			if (roleIds.size() != 0)
			roles = manageRoleMapper.selectBatchIds(roleIds);
			} else {
			roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
			}
			accountDTO.setRoles(roles);
			//封装返回结果
			accountUpdateDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
			accountUpdateDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			accountUpdateDTO.setAccount(manageAccountMapper.selectById(accountId));
			return accountUpdateDTO;
			accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
			accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			accountDTO.setAccount(manageAccountMapper.selectById(manageAccount.getId()));
			return accountDTO;
			}


			@@ -379,8 +345,8 @@
			*/
			@Override
			@Transactional
			public AccountDeleteDTO deleteAccount(AccountDeleteForm accountDeleteForm) {
			AccountDeleteDTO accountDeleteDTO = new AccountDeleteDTO();
			public AccountDTO deleteAccount(AccountDeleteForm accountDeleteForm) {
			AccountDTO accountDTO = new AccountDTO();
			//取参
			Integer accountId = accountDeleteForm.getAccountId();
			//查询是否存在
			@@ -391,24 +357,24 @@
			queryWrapper.setEntity(manageAccount);
			ManageAccount existManageAccount = manageAccountMapper.selectOne(queryWrapper);
			if (ObjectUtils.isEmpty(existManageAccount)) {
			accountDeleteDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
			accountDeleteDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
			return accountDeleteDTO;
			accountDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
			accountDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
			return accountDTO;
			}
			//逻辑删除账号
			existManageAccount.setIsDelete(Constants.DELETE);
			UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
			deleteAccountWrapper.set("is_delete", Constants.DELETE).eq("id", manageAccount.getId());
			deleteAccountWrapper.eq("id", accountId);
			deleteAccountWrapper.set("is_delete", Constants.DELETE);
			manageAccountMapper.update(null, deleteAccountWrapper);
			//逻辑删除账号相关角色
			UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
			deleteManageAccountRoleWrapper.set("is_delete", Constants.DELETE).eq("account_id", manageAccount.getId());
			manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
			//封装返回结果
			accountDeleteDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
			accountDeleteDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			accountDeleteDTO.setAccount(existManageAccount);
			return accountDeleteDTO;
			accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
			accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
			accountDTO.setAccount(existManageAccount);
			return accountDTO;
			}