From 70f8041d4715907183de437c26dbb4f0beff3444 Mon Sep 17 00:00:00 2001 From: zhaoyz <11@11.com> Date: Fri, 26 Apr 2024 18:54:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rax/admin/mapper/SysRoleMapper.java | 4 +- .../service/impl/SysRoleServiceImpl.java | 7 +++- .../resources/mapper/SysHospitalMapper.xml | 2 +- .../main/resources/mapper/SysRoleMapper.xml | 36 +++++++++++----- .../service/impl/ChatServiceImpl.java | 42 ++++++++++--------- 5 files changed, 57 insertions(+), 34 deletions(-) diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMapper.java index b0f95b8..58f6162 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMapper.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysRoleMapper.java @@ -27,6 +27,8 @@ public interface SysRoleMapper extends BaseMapper { */ List listRolesByUserId(Long userId); - List getRoleTree(@Param("page") Page page, @Param("roleName") String roleName); + List getRoleTree(@Param("page") Page page, @Param("roleName") String roleName); + + Integer getTotal(@Param("roleName") String roleName); } diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleServiceImpl.java index 74ecf5a..fd1aa87 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysRoleServiceImpl.java @@ -115,8 +115,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl } public R getRoleTree(Page page, String roleName) { - baseMapper.getRoleTree(page, roleName); - return null; + List roleTree = baseMapper.getRoleTree(page, roleName); + Integer total = baseMapper.getTotal(roleName); + page.setRecords(roleTree); + page.setTotal(total); + return R.ok(page); } /** diff --git a/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml index 698e182..eeae1cd 100644 --- a/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml +++ b/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml @@ -18,7 +18,7 @@ - AND name LIKE '#{bindName}' + AND name LIKE #{bindName} diff --git a/upms/upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysRoleMapper.xml index 85e8566..d46d233 100644 --- a/upms/upms-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/upms/upms-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -28,14 +28,14 @@ and sys_user_role.user_id = #{userId} - + select r.role_id "roleId", + r.role_name "roleName", + r.role_code "roleCode", + r.role_desc "roleDesc", + r.create_time "createTime", + r.update_time "updateTime", + GROUP_CONCAT(m.`name`) "menu" from sys_role r left join sys_role_menu rm on r.role_id = rm.role_id @@ -44,9 +44,25 @@ where r.del_flag = 0 - and r.role_name like '#{bindName}' + and r.role_name like #{bindName} GROUP BY r.role_id - ORDER BY r.create_time desc limit #{page.current}, #{page.size} + ORDER BY r.create_time desc + + + diff --git a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/ChatServiceImpl.java b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/ChatServiceImpl.java index 818aaa4..8455abe 100644 --- a/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/ChatServiceImpl.java +++ b/vital-signs/src/main/java/com/rax/vital/medicine/service/impl/ChatServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.messaging.simp.SimpMessagingTemplate; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; @@ -116,27 +117,28 @@ public class ChatServiceImpl implements ChatService { R info = remoteUserService.info(userDTO, SecurityConstants.FROM_IN); UserInfo userInfo = info.getData(); - JSONObject param = new JSONObject(); + if (StringUtils.hasText(msg)) { + JSONObject param = new JSONObject(); + MongoTemplate template = mongoDBSource.getTemplate(); + Document document = new Document(); + document.put("content", msg); + param.put("content", msg); + String now = DateUtil.now(); + document.put("create_time", now); + param.put("createTime", now); + document.put("create_user", username); + String name = userInfo.getSysUser().getName(); + document.put("create_name", name); + param.put("createName", name); + document.put("deleted", 0); + document.put("revoked", 0); + template.insert(document, "t_chat"); - MongoTemplate template = mongoDBSource.getTemplate(); - Document document = new Document(); - document.put("content", msg); - param.put("content", msg); - String now = DateUtil.now(); - document.put("create_time", now); - param.put("createTime", now); - document.put("create_user", username); - String name = userInfo.getSysUser().getName(); - document.put("create_name", name); - param.put("createName", name); - document.put("deleted", 0); - document.put("revoked", 0); - template.insert(document, "t_chat"); - - Map sessionMap = databaseSessionMap.get(databaseName); - for (Map.Entry entry : sessionMap.entrySet()) { - WebSocketSession value = entry.getValue(); - value.sendMessage(new TextMessage(param.toJSONString().getBytes())); + Map sessionMap = databaseSessionMap.get(databaseName); + for (Map.Entry entry : sessionMap.entrySet()) { + WebSocketSession value = entry.getValue(); + value.sendMessage(new TextMessage(param.toJSONString().getBytes())); + } } }