From dc3e39dfbc7f99e2dd865c0f8274647c00bc5c70 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 16 Jun 2021 15:54:23 +0800
Subject: [PATCH] screen-api 增加kafka消费者以及websocket搭建
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
index 5efe435..4877afb 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java
@@ -4,16 +4,15 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.service.ManageRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -156,10 +155,10 @@
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String content = "���������������:"+manageRoleOld.getName()+";";
for (Object key:map.keySet()) {
- if (key.toString().equals("name")){
+ if (key.toString().equals("name")&&map.get(key)!=null){
content = content+"���������:"+manageRoleOld.getName()+"->"+map.get(key)+";";
}
- if (key.toString().equals("desc")){
+ if (key.toString().equals("desc")&&map.get(key)!=null){
content = content+"������:"+manageRoleOld.getDesc()+"->"+map.get(key)+";";
}
}
@@ -179,6 +178,7 @@
QueryWrapper<ManageRole> wrapper = new QueryWrapper();
wrapper.eq("is_delete",0);
wrapper.like("name",map.get("name"));
+ wrapper.orderByDesc("create_time");
com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
List<ManageRole> manageRoles = resultpage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -238,6 +238,21 @@
return resultMap;
}
+ @Override
+ public ManageRole getRoleByAccountId(Integer accountId) {
+ QueryWrapper<ManageAccountRole> queryAccountRoleWrapper = new QueryWrapper<>();
+ queryAccountRoleWrapper.eq("is_delete",Constants.NOT_DELETE);
+ queryAccountRoleWrapper.eq("account_id",accountId);
+ ManageAccountRole accountRole = manageAccountRoleMapper.selectOne(queryAccountRoleWrapper);
+ if(ObjectUtils.isEmpty(accountRole))
+ return null;
+ Integer roleId = accountRole.getRoleId();
+ QueryWrapper<ManageRole> queryRoleWrapper = new QueryWrapper();
+ queryRoleWrapper.eq("is_delete", Constants.NOT_DELETE);
+ queryRoleWrapper.eq("id", roleId);
+ return manageRoleMapper.selectOne(queryRoleWrapper);
+ }
+
/**
* @Description: ���������������
* @Param: [list, menuId]list���menuId������
--
Gitblit v1.8.0