diff --git a/nursing-unit-common/pom.xml b/nursing-unit-common/pom.xml new file mode 100644 index 0000000..995b5fc --- /dev/null +++ b/nursing-unit-common/pom.xml @@ -0,0 +1,22 @@ + + + + com.nursingunit.boot + nursing-unit-parent + 2.0.0 + + 通用工具模块 + 4.0.0 + nursing-unit-common + + + + com.nursingunit.boot + nursing-unit-base-core + 2.0.0 + + + + diff --git a/nursing-unit-common/src/main/java/com/nu/config/RabbitMQConfig.java b/nursing-unit-common/src/main/java/com/nu/config/RabbitMQConfig.java new file mode 100644 index 0000000..2d30697 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/config/RabbitMQConfig.java @@ -0,0 +1,68 @@ +package com.nu.config; + +import org.springframework.amqp.core.*; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.support.converter.Jackson2JavaTypeMapper; +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class RabbitMQConfig { + + @Bean + public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { + return new RabbitAdmin(connectionFactory); + } + + /** + * JSON消息转换器 + */ + @Bean + public Jackson2JsonMessageConverter jsonMessageConverter() { + Jackson2JsonMessageConverter converter = new Jackson2JsonMessageConverter(); + converter.setTypePrecedence(Jackson2JavaTypeMapper.TypePrecedence.TYPE_ID); + return converter; + } + + // 交换器（以Topic为例） + @Bean + public DirectExchange fwzlExchange() { + return new DirectExchange("hldy.fwzl"); + } + + // 队列 + @Bean + public Queue nu001FwzlAsyncQueue() { + return new Queue("nu001.fwzl.async", true); + } + @Bean + public Queue nu001FwzlStatusQueue() { + return new Queue("nu001.fwzl.status", true); + } + @Bean + public Queue nu002FwzlAsyncQueue() { + return new Queue("nu002.fwzl.async", true); + } + @Bean + public Queue nu002FwzlStatusQueue() { + return new Queue("nu002.fwzl.status", true); + } + @Bean + public Binding binding1(Queue nu001FwzlAsyncQueue, DirectExchange fwzlExchange) { + return BindingBuilder.bind(nu001FwzlAsyncQueue).to(fwzlExchange).with("nu001.fwzl.async"); + } + @Bean + public Binding binding2(Queue nu001FwzlStatusQueue, DirectExchange fwzlExchange) { + return BindingBuilder.bind(nu001FwzlStatusQueue).to(fwzlExchange).with("nu001.fwzl.status"); + } + @Bean + public Binding binding3(Queue nu002FwzlAsyncQueue, DirectExchange fwzlExchange) { + return BindingBuilder.bind(nu002FwzlAsyncQueue).to(fwzlExchange).with("nu002.fwzl.async"); + } + @Bean + public Binding binding4(Queue nu002FwzlStatusQueue, DirectExchange fwzlExchange) { + return BindingBuilder.bind(nu002FwzlStatusQueue).to(fwzlExchange).with("nu002.fwzl.status"); + } +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java new file mode 100644 index 0000000..412c7a8 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java @@ -0,0 +1,10 @@ +package com.nu.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class DirectiveMQDto { + List ids; +} diff --git a/nursing-unit-common/src/main/java/com/nu/dto/StatusMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/StatusMQDto.java new file mode 100644 index 0000000..c78a7c1 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/dto/StatusMQDto.java @@ -0,0 +1,9 @@ +package com.nu.dto; + +import lombok.Data; + +@Data +public class StatusMQDto { + int status; + String message; +} diff --git a/nursing-unit-common/src/main/java/com/nu/enums/MQStatus.java b/nursing-unit-common/src/main/java/com/nu/enums/MQStatus.java new file mode 100644 index 0000000..f322784 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/enums/MQStatus.java @@ -0,0 +1,53 @@ +package com.nu.enums; + +import lombok.Getter; + +/** + * MQ消息处理状态枚举 + */ +@Getter +public enum MQStatus { + + SUCCESS(200, "消息处理成功"), + INVALID_PARAM(400, "请求参数不合法"), + PROCESS_FAILED(500, "消息处理失败"), + MAX_RETRY_EXCEEDED(1001, "已达到最大重试次数"), + MESSAGE_FORMAT_ERROR(1002, "消息格式错误"), + TIMEOUT(1003, "处理超时"), + DUPLICATE_MESSAGE(1004, "消息重复消费"), + UNKNOWN_ERROR(9999, "未知错误"); + + private final int code; + private final String message; + + MQStatus(int code, String message) { + this.code = code; + this.message = message; + } + + /** + * 根据状态码查找枚举 + */ + public static MQStatus findByCode(int code) { + for (MQStatus status : values()) { + if (status.code == code) { + return status; + } + } + return UNKNOWN_ERROR; // 默认返回未知错误 + } + + /** + * 判断是否成功状态 + */ + public boolean isSuccess() { + return this == SUCCESS; + } + + /** + * 判断是否可重试错误 + */ + public boolean isRetryable() { + return this == PROCESS_FAILED || this == TIMEOUT; + } +} diff --git a/nursing-unit-common/src/main/java/com/nu/utils/RabbitMQUtil.java b/nursing-unit-common/src/main/java/com/nu/utils/RabbitMQUtil.java new file mode 100644 index 0000000..f33497f --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/utils/RabbitMQUtil.java @@ -0,0 +1,157 @@ +package com.nu.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.amqp.core.*; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.core.RabbitAdmin; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer; +import org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener; +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; + +import javax.annotation.PostConstruct; +import java.util.HashMap; +import java.util.Map; + +@Configuration +public class RabbitMQUtil { + private static final Logger logger = LoggerFactory.getLogger(RabbitMQUtil.class); + + @Autowired + private RabbitTemplate rabbitTemplate; + + @Autowired + private ConnectionFactory connectionFactory; + + @Autowired + private RabbitAdmin rabbitAdmin; + + @Autowired + private Jackson2JsonMessageConverter jsonMessageConverter; + + // 初始化配置 + @PostConstruct + public void init() { + rabbitTemplate.setMessageConverter(jsonMessageConverter); + } + + // 基础消息操作 + + /** + * 发送消息到指定队列（使用默认直接交换机） + * + * @param queueName 目标队列名称 + * @param message 消息内容（自动JSON序列化） + */ + public void sendToQueue(String queueName, Object message) { + rabbitTemplate.convertAndSend("", queueName, message); + } + + /** + * 发送消息到指定交换机 + * + * @param exchange 交换机名称 + * @param routingKey 路由键 + * @param message 消息内容 + */ + public void sendToExchange(String exchange, String routingKey, Object message) { + rabbitTemplate.convertAndSend(exchange, routingKey, message); + } + + /** + * 从队列接收消息（自动确认） + * + * @return 返回消息对象，队列为空时返回null + */ + public Object receiveFromQueue(String queueName) { + return rabbitTemplate.receiveAndConvert(queueName); + } + + // 队列与交换机管理 + + /** + * 创建持久化队列 + * + * @param queueName 队列名称 + * @return 队列对象 + */ + public Queue createQueue(String queueName) { + try { + Queue queue = new Queue(queueName, true, false, false); + rabbitAdmin.declareQueue(queue); + return queue; + } catch (Exception e) { + logger.error("队列[{}]创建失败", queueName, e); + throw e; + } + } + + /** + * 创建带死信队列的队列 + * + * @param queueName 主队列名称 + * @param dlxExchange 死信交换机名称 + * @param dlxRoutingKey 死信路由键 + */ + public Queue createQueueWithDLX(String queueName, String dlxExchange, String dlxRoutingKey) { + try { + Map args = new HashMap<>(); + args.put("x-dead-letter-exchange", dlxExchange); + args.put("x-dead-letter-routing-key", dlxRoutingKey); + Queue queue = new Queue(queueName, true, false, false, args); + rabbitAdmin.declareQueue(queue); + return queue; + } catch (Exception e) { + logger.error("带死信的队列[{}]创建失败", queueName, e); + throw e; + } + } + + /** + * 绑定队列到主题交换机 + * + * @param queue 队列名称 + * @param exchange 交换机名称 + * @param routingKey 路由规则 + */ + public void bindToTopicExchange(String queue, String exchange, String routingKey) { + try { + Binding binding = BindingBuilder.bind(new Queue(queue)) + .to(new TopicExchange(exchange)).with(routingKey); + rabbitAdmin.declareBinding(binding); + } catch (Exception e) { + logger.error("队列[{}]绑定到交换机[{}]失败", queue, exchange, e); + throw e; + } + } + + // 监听器管理 + + /** + * 创建消息监听容器 + * + * @param queueName 监听的队列 + * @param listener 消息处理器 + * @param concurrency 并发消费者数量 + */ + public SimpleMessageListenerContainer createListener( + String queueName, + ChannelAwareMessageListener listener, + int concurrency) { + try { + SimpleMessageListenerContainer container = new SimpleMessageListenerContainer(connectionFactory); + container.addQueues(new Queue(queueName)); + container.setAcknowledgeMode(AcknowledgeMode.MANUAL); + container.setMessageListener(listener); + container.setConcurrentConsumers(concurrency); + container.start(); + return container; + } catch (Exception e) { + logger.error("监听器[{}]创建失败", queueName, e); + throw e; + } + } +} diff --git a/nursing-unit-service-directive/nu-service-directive-biz/pom.xml b/nursing-unit-service-directive/nu-service-directive-biz/pom.xml index 809337a..f8bd281 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/pom.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/pom.xml @@ -37,6 +37,12 @@ pinyin4j 2.5.0 + + + com.nursingunit.boot + nursing-unit-common + ${nursingunit.version} + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java similarity index 96% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java index 6d9540e..44b9ec3 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/controller/DirectiveTagController.java @@ -1,10 +1,11 @@ -package com.nu.modules.directiveTag.controller; +package com.nu.modules.directivetag.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directiveTag.entity.DirectiveTag; -import com.nu.modules.directiveTag.service.IDirectiveTagService; +import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.directivetag.service.IDirectiveTagService; +import com.nu.utils.RabbitMQUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java similarity index 91% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java index 0fea656..0a14365 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/entity/DirectiveTag.java @@ -1,15 +1,11 @@ -package com.nu.modules.directiveTag.entity; +package com.nu.modules.directivetag.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java similarity index 58% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java index 3355bcf..b7096a9 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/mapper/DirectiveTagMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.directiveTag.mapper; +package com.nu.modules.directivetag.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.nu.modules.directivetag.entity.DirectiveTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml similarity index 68% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml index a992d83..684ac3f 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/mapper/xml/DirectiveTagMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java similarity index 77% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java index 9cff657..3d39dc8 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/service/IDirectiveTagService.java @@ -1,6 +1,6 @@ -package com.nu.modules.directiveTag.service; +package com.nu.modules.directivetag.service; -import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.nu.modules.directivetag.entity.DirectiveTag; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java similarity index 67% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java index c681106..75d292c 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivetag/service/impl/DirectiveTagServiceImpl.java @@ -1,11 +1,9 @@ -package com.nu.modules.directiveTag.service.impl; +package com.nu.modules.directivetag.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.nu.modules.directiveTag.entity.DirectiveTag; -import com.nu.modules.directiveTag.mapper.DirectiveTagMapper; -import com.nu.modules.directiveTag.service.IDirectiveTagService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.directivetag.mapper.DirectiveTagMapper; +import com.nu.modules.directivetag.service.IDirectiveTagService; +import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,7 +11,6 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.Arrays; -import java.util.List; /** * @Description: 指令标签 diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java similarity index 96% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java index 520b32a..5e0a28b 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java @@ -1,10 +1,10 @@ -package com.nu.modules.serviceCategory.controller; +package com.nu.modules.servicecategory.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; -import com.nu.modules.serviceCategory.service.IConfigServiceCategoryService; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java similarity index 91% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java index ffc5fec..75fb8f0 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java @@ -1,15 +1,11 @@ -package com.nu.modules.serviceCategory.entity; +package com.nu.modules.servicecategory.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java similarity index 58% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java index a7b64dc..a87a5d5 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.serviceCategory.mapper; +package com.nu.modules.servicecategory.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml similarity index 69% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml index e7c0247..7b4963d 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java similarity index 77% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java index 95de7ac..53af546 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java @@ -1,6 +1,6 @@ -package com.nu.modules.serviceCategory.service; +package com.nu.modules.servicecategory.service; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java similarity index 82% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java index 1fc9f44..99538bd 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java @@ -1,13 +1,13 @@ -package com.nu.modules.serviceCategory.service.impl; +package com.nu.modules.servicecategory.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.nu.modules.ServiceType.entity.ConfigServiceType; -import com.nu.modules.ServiceType.service.IConfigServiceTypeService; -import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; -import com.nu.modules.serviceCategory.mapper.ConfigServiceCategoryMapper; -import com.nu.modules.serviceCategory.service.IConfigServiceCategoryService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.servicecategory.mapper.ConfigServiceCategoryMapper; +import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java similarity index 91% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java index 12375d2..1ad1177 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java @@ -1,14 +1,17 @@ -package com.nu.modules.serviceDirective.controller; +package com.nu.modules.servicedirective.controller; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import com.nu.dto.DirectiveMQDto; +import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; +import com.nu.utils.RabbitMQUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; @@ -22,10 +25,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -41,6 +41,8 @@ import java.util.stream.Collectors; public class ConfigServiceDirectiveController extends JeecgController { @Autowired private IConfigServiceDirectiveService configServiceDirectiveService; + @Autowired + private RabbitMQUtil rabbitMQUtil; /** * 分页列表查询 @@ -58,6 +60,14 @@ public class ConfigServiceDirectiveController extends JeecgController ids = Lists.newArrayList(); + ids.add("aaa"); + ids.add("bbb"); + ids.add("ccc"); + directiveMQDto.setIds(ids); + rabbitMQUtil.sendToExchange("hldy.fwzl","nu001.fwzl.async",directiveMQDto); Map customeRuleMap = new HashMap<>(); // 自定义多选的查询规则为：LIKE_WITH_OR customeRuleMap.put("categoryId", QueryRuleEnum.LIKE_WITH_OR); diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java similarity index 98% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java index b6d8ca5..267c48b 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java @@ -1,8 +1,8 @@ -package com.nu.modules.serviceDirective.entity; +package com.nu.modules.servicedirective.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.modules.directiveTag.entity.DirectiveTag; +import com.nu.modules.directivetag.entity.DirectiveTag; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java similarity index 85% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java index 20db783..d9131c9 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java @@ -1,11 +1,9 @@ -package com.nu.modules.serviceDirective.mapper; +package com.nu.modules.servicedirective.mapper; import java.util.List; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml similarity index 95% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index a3ed1c4..b17c6a2 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -1,10 +1,10 @@ - + + type="com.nu.modules.servicedirective.entity.ConfigServiceDirective"> @@ -31,7 +31,7 @@ - + @@ -80,7 +80,7 @@ ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc - SELECT distinct directive_id as id FROM nu_directive_tag WHERE tag_id IN #{tagId} diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java similarity index 79% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java index 2cf1760..bf7c54e 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java @@ -1,13 +1,10 @@ -package com.nu.modules.serviceDirective.service; +package com.nu.modules.servicedirective.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.common.system.query.QueryRuleEnum; -import javax.servlet.http.HttpServletRequest; import java.util.List; -import java.util.Map; /** * @Description: 服务指令 diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java similarity index 90% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index 465833f..44e7e72 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -1,22 +1,14 @@ -package com.nu.modules.serviceDirective.service.impl; +package com.nu.modules.servicedirective.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directiveTag.entity.DirectiveTag; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; -import org.apache.commons.compress.utils.Lists; -import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; +import com.nu.modules.directivetag.entity.DirectiveTag; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java similarity index 97% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java index 39ee490..28c9618 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java @@ -1,10 +1,10 @@ -package com.nu.modules.ServiceType.controller; +package com.nu.modules.servicetype.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.ServiceType.entity.ConfigServiceType; -import com.nu.modules.ServiceType.service.IConfigServiceTypeService; +import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.servicetype.service.IConfigServiceTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java similarity index 92% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java index 3178b74..a4b863f 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java @@ -1,15 +1,11 @@ -package com.nu.modules.ServiceType.entity; +package com.nu.modules.servicetype.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java similarity index 58% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java index 3b44d01..c62a8ee 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.ServiceType.mapper; +package com.nu.modules.servicetype.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.ServiceType.entity.ConfigServiceType; +import com.nu.modules.servicetype.entity.ConfigServiceType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml similarity index 68% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml index 374d143..f2dcf95 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java similarity index 77% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java index 4f4e594..43c9f61 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java @@ -1,6 +1,6 @@ -package com.nu.modules.ServiceType.service; +package com.nu.modules.servicetype.service; -import com.nu.modules.ServiceType.entity.ConfigServiceType; +import com.nu.modules.servicetype.entity.ConfigServiceType; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java similarity index 80% rename from nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java index 4d3adc7..8190345 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java @@ -1,11 +1,11 @@ -package com.nu.modules.ServiceType.service.impl; +package com.nu.modules.servicetype.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.nu.modules.ServiceType.entity.ConfigServiceType; -import com.nu.modules.ServiceType.mapper.ConfigServiceTypeMapper; -import com.nu.modules.ServiceType.service.IConfigServiceTypeService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; -import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.servicetype.mapper.ConfigServiceTypeMapper; +import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/mq/directive/exceptionhandler/DirectiveMQExceptionHandler.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/mq/directive/exceptionhandler/DirectiveMQExceptionHandler.java new file mode 100644 index 0000000..549a827 --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/mq/directive/exceptionhandler/DirectiveMQExceptionHandler.java @@ -0,0 +1,35 @@ +package com.nu.mq.directive.exceptionhandler; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.AmqpRejectAndDontRequeueException; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.listener.api.RabbitListenerErrorHandler; +import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException; +import org.springframework.stereotype.Component; + +@Slf4j +@Component("directiveMQErrorHandler") +public class DirectiveMQExceptionHandler implements RabbitListenerErrorHandler { + + @Override + public Object handleError(Message message, org.springframework.messaging.Message message1, ListenerExecutionFailedException e) { + log.error("MQ消息处理失败 | 消息体: {} | 异常原因: {}", new String(message.getBody()), e.getCause().getMessage()); + + // 根据异常类型选择处理策略 + if (isRetryable(e)) { + // 可重试异常：抛出异常触发重试 + throw e; + } else { + // 不可恢复异常：拒绝消息且不重新入队 + throw new AmqpRejectAndDontRequeueException("消息处理失败且禁止重试", e); + } + } + + /** + * 判断异常是否可重试 + */ + private boolean isRetryable(ListenerExecutionFailedException e) { + // 示例：网络异常、数据库临时锁超时可重试 + return e.getCause() instanceof RuntimeException; // 根据实际业务调整 + } +} diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java new file mode 100644 index 0000000..c2e378f --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java @@ -0,0 +1,20 @@ +package com.nu.mq.directive.listener; + +import com.nu.dto.StatusMQDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +public class DirectiveMQListener { + + @RabbitListener(queues = "nu001.fwzl.status", errorHandler = "directiveMQErrorHandler") + public void handleMessage(StatusMQDto dto) { + try { + System.out.println("接收到了消息：" + dto.getStatus() + "消息体：" + dto.getMessage()); + } catch (Exception e) { + System.out.println("异常了：" + e.getMessage()); + } + } +} diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index 458fcda..97fef06 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -12,6 +12,12 @@ nu-system-start + + + com.nursingunit.boot + nursing-unit-common + ${nursingunit.version} + com.nursingunit.boot diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml index f3ffc71..6611c0a 100644 --- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml +++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml @@ -186,6 +186,13 @@ spring: host: 127.0.0.1 port: 6379 password: + #rabbitmq 配置 + rabbitmq: + host: 192.168.2.199 + prot: 5672 + username: hldy + password: hldy + virtual-host: /hldy #mybatis plus 设置 mybatis-plus: mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,classpath*:com/nu/**/xml/*Mapper.xml diff --git a/pom.xml b/pom.xml index 6f40556..4175a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,8 @@ nursing-unit-base-core + + nursing-unit-common nursing-unit-demo @@ -161,6 +163,12 @@ + + + + org.springframework.boot + spring-boot-starter-amqp + @@ -186,7 +194,12 @@ seata-spring-boot-starter ${seata.version} - + + + com.nursingunit.boot + nursing-unit-common + ${nursingunit.version} + com.nursingunit.boot