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 { + List 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 getHospitalList(String name, long offset, long limit) { - Page page = new Page<>(); - page.setSize(limit); - page.setCurrent(offset); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - if (StringUtils.hasText(name)) { - queryWrapper.checkSqlInjection().like("name", name); - } - queryWrapper.eq("deleted", 0); - - List orderItems = new ArrayList<>(); - OrderItem createTimeOrder = new OrderItem(); - createTimeOrder.setColumn("create_time"); - createTimeOrder.setAsc(false); - orderItems.add(createTimeOrder); - page.setOrders(orderItems); - - List sysHospitals = sysHospitalMapper.selectList(page, queryWrapper); - Long count = sysHospitalMapper.selectCount(queryWrapper); + List 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 @@ + + id, + name, + code, + status, + province, + city + + + + + FROM sys_hostipal + + WHERE deleted = 0 + + + + AND name LIKE '#{bindName}' + + + + + + + + + \ 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"); }