From afe13d5bc394e7065e0941f96220ca3710034c3d Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Mon, 31 Aug 2026 09:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=B3=BB=E7=BB=9F=EF=BC=8C?= =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E5=8F=91=E8=A1=80=E9=80=80=E8=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czblood/bus/mapper/XkOutDetailMapper.java | 1 + .../bus/websocket/WebSocketConfig.java | 17 ++++++++ .../resources/mapper/XkOutDetailMapper.xml | 7 +++ ...nController.java => BackinController.java} | 8 ++-- .../busBloodbank/mapper/BackinMapper.java | 10 +++++ ...kBackinService.java => BackinService.java} | 2 +- .../service/impl/BackinServiceImpl.java | 43 +++++++++++++++++++ .../service/impl/XkBackinServiceImpl.java | 24 ----------- .../main/resources/mapper/BackinMapper.xml | 8 ++++ .../com/czblood/start/BloodApplication.java | 2 +- .../czblood/system/config/SecurityConfig.java | 1 + 11 files changed, 93 insertions(+), 30 deletions(-) create mode 100644 blood_bus/src/main/java/com/czblood/bus/websocket/WebSocketConfig.java rename blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/{XkBackinController.java => BackinController.java} (76%) create mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/BackinMapper.java rename blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/{XkBackinService.java => BackinService.java} (81%) create mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/BackinServiceImpl.java delete mode 100644 blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/XkBackinServiceImpl.java create mode 100644 blood_bus_bloodbank/src/main/resources/mapper/BackinMapper.xml diff --git a/blood_bus/src/main/java/com/czblood/bus/mapper/XkOutDetailMapper.java b/blood_bus/src/main/java/com/czblood/bus/mapper/XkOutDetailMapper.java index de6e4ba..ccaf98f 100644 --- a/blood_bus/src/main/java/com/czblood/bus/mapper/XkOutDetailMapper.java +++ b/blood_bus/src/main/java/com/czblood/bus/mapper/XkOutDetailMapper.java @@ -8,4 +8,5 @@ public interface XkOutDetailMapper { List queryListByBillNo(String billNo); void insert(XkOutDetail xkOutDetail); void deleteByBillNo(String billNo); + List queryList(XkOutDetail xkOutDetail); } diff --git a/blood_bus/src/main/java/com/czblood/bus/websocket/WebSocketConfig.java b/blood_bus/src/main/java/com/czblood/bus/websocket/WebSocketConfig.java new file mode 100644 index 0000000..2d3d32f --- /dev/null +++ b/blood_bus/src/main/java/com/czblood/bus/websocket/WebSocketConfig.java @@ -0,0 +1,17 @@ +package com.czblood.bus.websocket; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; + +/** + * WebSocket配置类（Spring Boot 原生方式） + */ +@Configuration +public class WebSocketConfig { + + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } +} diff --git a/blood_bus/src/main/resources/mapper/XkOutDetailMapper.xml b/blood_bus/src/main/resources/mapper/XkOutDetailMapper.xml index e52f628..f7ce2ad 100644 --- a/blood_bus/src/main/resources/mapper/XkOutDetailMapper.xml +++ b/blood_bus/src/main/resources/mapper/XkOutDetailMapper.xml @@ -38,4 +38,11 @@ + \ No newline at end of file diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkBackinController.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/BackinController.java similarity index 76% rename from blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkBackinController.java rename to blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/BackinController.java index 672aba4..f045ed6 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/XkBackinController.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/controller/BackinController.java @@ -1,6 +1,6 @@ package com.czblood.busBloodbank.controller; -import com.czblood.busBloodbank.service.XkBackinService; +import com.czblood.busBloodbank.service.BackinService; import com.czblood.common.core.domain.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,14 +13,14 @@ import javax.annotation.Resource; @Api(tags = "临床发血退血") @RestController @RequestMapping("/bus/bloodbank/backin") -public class XkBackinController { +public class BackinController { @Resource - private XkBackinService xkBackinService; + private BackinService backinService; @ApiOperation("获取血液信息") @GetMapping("/queryBloodInfo") public Result queryBloodInfo(String bloodNo,String productNo){ - return xkBackinService.queryBloodInfo(bloodNo,productNo); + return backinService.queryBloodInfo(bloodNo,productNo); } } diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/BackinMapper.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/BackinMapper.java new file mode 100644 index 0000000..d1fddc1 --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/mapper/BackinMapper.java @@ -0,0 +1,10 @@ +package com.czblood.busBloodbank.mapper; + +import com.czblood.bus.pojo.XkOutDetail; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface BackinMapper { + List queryXkOutDetailList(@Param("bloodNo") String bloodNo, @Param("productNo") String productNo); +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/XkBackinService.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/BackinService.java similarity index 81% rename from blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/XkBackinService.java rename to blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/BackinService.java index 141453d..468c6f9 100644 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/XkBackinService.java +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/BackinService.java @@ -2,6 +2,6 @@ package com.czblood.busBloodbank.service; import com.czblood.common.core.domain.Result; -public interface XkBackinService { +public interface BackinService { Result queryBloodInfo(String bloodNo, String productNo); } diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/BackinServiceImpl.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/BackinServiceImpl.java new file mode 100644 index 0000000..f29257e --- /dev/null +++ b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/BackinServiceImpl.java @@ -0,0 +1,43 @@ +package com.czblood.busBloodbank.service.impl; + +import com.czblood.bus.mapper.XkOutDetailMapper; +import com.czblood.bus.pojo.XkBloodInfo; +import com.czblood.bus.pojo.XkOutDetail; +import com.czblood.bus.utils.BloodBankUtil; +import com.czblood.busBloodbank.mapper.BackinMapper; +import com.czblood.busBloodbank.service.BackinService; +import com.czblood.common.core.domain.Result; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class BackinServiceImpl implements BackinService { + + @Resource + BloodBankUtil bloodBankUtil; + @Resource + BackinMapper backinMapper; + + @Override + public Result queryBloodInfo(String bloodNo, String productNo) { + XkBloodInfo xkBloodInfo = bloodBankUtil.queryBloodInfoOne(bloodNo, productNo); + if(xkBloodInfo == null) return new Result("-1","血液信息不存在！"); + String bloodStatus = xkBloodInfo.getBlood_status(); + switch (bloodStatus){ + case "2": + return new Result("-1","该血液已经报废"); + case "3": + return new Result("-1","该血液正在制备或者配血!"); + case "1": + return new Result("0","该血液状态正常"); + case "4": + List xkOutDetailList = backinMapper.queryXkOutDetailList(bloodNo, productNo); + if(xkOutDetailList.isEmpty()) return new Result("-1","没有找到该血液的发血记录！"); + break; + } + + return null; + } +} diff --git a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/XkBackinServiceImpl.java b/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/XkBackinServiceImpl.java deleted file mode 100644 index 1ecbdad..0000000 --- a/blood_bus_bloodbank/src/main/java/com/czblood/busBloodbank/service/impl/XkBackinServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.czblood.busBloodbank.service.impl; - -import com.czblood.bus.pojo.XkBloodInfo; -import com.czblood.bus.utils.BloodBankUtil; -import com.czblood.busBloodbank.service.XkBackinService; -import com.czblood.common.core.domain.Result; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -@Service -public class XkBackinServiceImpl implements XkBackinService { - - @Resource - BloodBankUtil bloodBankUtil; - - - @Override - public Result queryBloodInfo(String bloodNo, String productNo) { - XkBloodInfo xkBloodInfo = bloodBankUtil.queryBloodInfoOne(bloodNo, productNo); - if(xkBloodInfo == null) return new Result("-1","血液信息不存在！"); - return null; - } -} diff --git a/blood_bus_bloodbank/src/main/resources/mapper/BackinMapper.xml b/blood_bus_bloodbank/src/main/resources/mapper/BackinMapper.xml new file mode 100644 index 0000000..f19dba2 --- /dev/null +++ b/blood_bus_bloodbank/src/main/resources/mapper/BackinMapper.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/blood_start/src/main/java/com/czblood/start/BloodApplication.java b/blood_start/src/main/java/com/czblood/start/BloodApplication.java index be3ba4e..750ab18 100644 --- a/blood_start/src/main/java/com/czblood/start/BloodApplication.java +++ b/blood_start/src/main/java/com/czblood/start/BloodApplication.java @@ -13,5 +13,5 @@ public class BloodApplication { System.setProperty("user.timezone", "Etc/GMT-8"); SpringApplication.run(BloodApplication.class, args); System.out.println("项目启动成功！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！"); - } + } } diff --git a/blood_system/src/main/java/com/czblood/system/config/SecurityConfig.java b/blood_system/src/main/java/com/czblood/system/config/SecurityConfig.java index c6a9a75..c956c77 100644 --- a/blood_system/src/main/java/com/czblood/system/config/SecurityConfig.java +++ b/blood_system/src/main/java/com/czblood/system/config/SecurityConfig.java @@ -113,6 +113,7 @@ public class SecurityConfig { .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() .antMatchers("/doc.html").permitAll() //Knife4j 过滤 + .antMatchers("/ws/msgserver/**").permitAll() //WebSocket 过滤 // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); })