From 99fd2ead8b2409017ddcd637d944c99f8e8d4a5e Mon Sep 17 00:00:00 2001
From: zhaoyz <2@2.com>
Date: Mon, 25 Mar 2024 11:01:06 +0800
Subject: [PATCH] =?UTF-8?q?stomp=E5=BF=83=E8=B7=B3=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=9F=A5=E8=AF=A2=E5=8C=BB=E9=99=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E5=BF=85=E8=A6=81=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rax/admin/mapper/SysHospitalMapper.java   |  7 ++++
 .../service/impl/SysHospitalServiceImpl.java  | 25 ++----------
 .../resources/mapper/SysHospitalMapper.xml    | 40 +++++++++++++++++++
 .../com/rax/vital/config/WebSocketConfig.java |  1 -
 4 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysHospitalMapper.java b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysHospitalMapper.java
index 66cbcb7..a616560 100644
--- a/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysHospitalMapper.java
+++ b/upms/upms-biz/src/main/java/com/rax/admin/mapper/SysHospitalMapper.java
@@ -1,9 +1,16 @@
 package com.rax.admin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rax.admin.api.dto.HospitalDTO;
 import com.rax.admin.api.entity.SysHospital;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface SysHospitalMapper extends BaseMapper<SysHospital> {
+	List<HospitalDTO> getHospitalList(@Param("limit") Long limit, @Param("offset") Long offset, @Param("name") String name);
+
+	Integer getHospitalTotal();
 }
diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java
index 7dbeda2..1dc04a0 100644
--- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java
+++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysHospitalServiceImpl.java
@@ -54,29 +54,12 @@ public class SysHospitalServiceImpl extends ServiceImpl<SysHospitalMapper, SysHo
 
 	@Override
 	public R<Map> getHospitalList(String name, long offset, long limit) {
-		Page<SysHospital> page = new Page<>();
-		page.setSize(limit);
-		page.setCurrent(offset);
-
-		QueryWrapper<SysHospital> queryWrapper = new QueryWrapper<>();
-		if (StringUtils.hasText(name)) {
-			queryWrapper.checkSqlInjection().like("name", name);
-		}
-		queryWrapper.eq("deleted", 0);
-
-		List<OrderItem> orderItems = new ArrayList<>();
-		OrderItem createTimeOrder = new OrderItem();
-		createTimeOrder.setColumn("create_time");
-		createTimeOrder.setAsc(false);
-		orderItems.add(createTimeOrder);
-		page.setOrders(orderItems);
-
-		List<SysHospital> sysHospitals = sysHospitalMapper.selectList(page, queryWrapper);
-		Long count = sysHospitalMapper.selectCount(queryWrapper);
+		List<HospitalDTO> hospitalList = sysHospitalMapper.getHospitalList(limit, offset, name);
+		Integer hospitalTotal = sysHospitalMapper.getHospitalTotal();
 
 		Map result = new HashMap();
-		result.put("count", count);
-		result.put("list", sysHospitals);
+		result.put("count", hospitalTotal);
+		result.put("list", hospitalList);
 		return R.ok(result);
 	}
 
diff --git a/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml b/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml
index 23777c2..74f9a1d 100644
--- a/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml
+++ b/upms/upms-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -1,4 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.rax.admin.mapper.SysHospitalMapper">
+	<sql id="hospitalPropertiesSQL">
+		id,
+		name,
+		code,
+		status,
+		province,
+		city
+	</sql>
+
+	<sql id="hospitalSelectSQL">
+
+		FROM sys_hostipal
+
+		WHERE deleted = 0
+
+		<if test="name != null and name != ''">
+			<bind name="bindName" value="'%' + name + '%'"/>
+			AND name LIKE '#{bindName}'
+		</if>
+
+	</sql>
+
+	<select id="getHospitalList" resultType="com.rax.admin.api.dto.HospitalDTO">
+		SELECT
+
+		<include refid="hospitalPropertiesSQL"/>
+
+		<include refid="hospitalSelectSQL"/>
+
+		order by create_time desc
+
+		limit #{offset},#{limit}
+	</select>
+
+	<select id="getHospitalTotal" resultType="java.lang.Integer">
+		SELECT COUNT(*)
+		<include refid="hospitalSelectSQL"/>
+	</select>
+
+
 </mapper>
\ No newline at end of file
diff --git a/vital-signs/src/main/java/com/rax/vital/config/WebSocketConfig.java b/vital-signs/src/main/java/com/rax/vital/config/WebSocketConfig.java
index 95287b7..2b65451 100644
--- a/vital-signs/src/main/java/com/rax/vital/config/WebSocketConfig.java
+++ b/vital-signs/src/main/java/com/rax/vital/config/WebSocketConfig.java
@@ -30,7 +30,6 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 		ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
 		threadPoolTaskScheduler.initialize();
 		registry.enableSimpleBroker("/topic").setTaskScheduler(threadPoolTaskScheduler).setHeartbeatValue(heartbeat);
-		registry.enableSimpleBroker("/topic");
 		registry.setApplicationDestinationPrefixes("/front");
 		registry.setUserDestinationPrefix("/topic/user");
 	}