From 41622b7aa1d948040b0f8ea024aece42d5a518a2 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 25 Aug 2021 09:29:05 +0800 Subject: [PATCH] screen-api SQL优化 screen-manage 日志模块更新,SQL优化 --- screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 72 +++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 17 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 d17e139..8aa5319 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 @@ -25,9 +25,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.moral.api.config.mybatis.wrapper.NullFilterWrapper; import com.moral.api.service.ManageMenuService; +import com.moral.api.util.CompareFieldUtils; import com.moral.api.util.LogUtils; import com.moral.constant.Constants; import com.moral.constant.ResponseCodeEnum; +import com.moral.pojo.CompareFieldResult; import com.moral.util.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -89,7 +91,8 @@ //������������������ QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>(); wrapper.eq("account", account); - wrapper.eq("is_delete",Constants.NOT_DELETE); + wrapper.eq("is_delete", Constants.NOT_DELETE); + wrapper.select("id", "password"); ManageAccount manageAccount = manageAccountMapper.selectOne(wrapper); if (ObjectUtils.isEmpty(manageAccount)) { loginDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode()); @@ -192,17 +195,11 @@ } ); } + //������������������ + insertLog(manageAccount); //������������������ accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); - - //������������������ - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - StringBuilder content = new StringBuilder(); - content.append("������������������").append(manageAccount.getUserName() + ";") - .append("account���" + manageAccount.getAccount() + ";"); - logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE); - return accountDTO; } @@ -337,12 +334,7 @@ accountDTO.setCode(ResponseCodeEnum.SUCCESS.getCode()); accountDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg()); //������������������ - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - StringBuilder content = new StringBuilder(); - content.append("������������������").append(existManageAccount.getUserName() + ";") - .append("������:" + existManageAccount.getAccount() + ";"); - logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE); - + deleteLog(existManageAccount); return accountDTO; } @@ -375,9 +367,8 @@ //������ManageAccount��� manageAccountMapper.updateById(manageAccount); - //������������������ - insertUpdateLog(accountUpdateForm, oldManageAccount); + updateLog(oldManageAccount,manageAccount); //������token TokenUtils.destoryToken(manageAccount.getId()); //������������������ @@ -428,4 +419,51 @@ } + /** + * @Description: ������������������������ + * @Param: [oldAccount, newAccount] + * @return: void + * @Author: ��������� + * @Date: 2021/8/25 + */ + private void updateLog(ManageAccount oldAccount,ManageAccount newAccount){ + List<CompareFieldResult> results = CompareFieldUtils.compare(ManageAccount.class, oldAccount, newAccount); + StringBuilder content = new StringBuilder("���������������������"+";"); + content.append("���������"+oldAccount.getAccount()+";"); + //������������������ + if(!ObjectUtils.isEmpty(newAccount.getPassword())) + content.append("���������������"); + String resultContent = CompareFieldUtils.resultsConvertContent(results,content.toString()); + logUtils.saveOperationForManage(resultContent, Constants.UPDATE_OPERATE_TYPE); + } + + /** + * @Description: ������������������������ + * @Param: [account] + * @return: void + * @Author: ��������� + * @Date: 2021/8/25 + */ + private void insertLog(ManageAccount manageAccount){ + StringBuilder content = new StringBuilder(); + content.append("������������������������").append(manageAccount.getUserName() + ";") + .append("account���" + manageAccount.getAccount() + ";"); + logUtils.saveOperationForManage(content.toString(), Constants.INSERT_OPERATE_TYPE); + } + + + /** + * @Description: ������������������������ + * @Param: [manageAccount] + * @return: void + * @Author: ��������� + * @Date: 2021/8/25 + */ + private void deleteLog(ManageAccount manageAccount){ + StringBuilder content = new StringBuilder(); + content.append("������������������").append(manageAccount.getUserName() + ";") + .append("������:" + manageAccount.getAccount() + ";"); + logUtils.saveOperationForManage( content.toString(), Constants.DELETE_OPERATE_TYPE); + } } + -- Gitblit v1.8.0