From 5d5956f44d47758749d94eb8fca3f214f173f594 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 22 Apr 2025 15:12:19 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=202?= =?UTF-8?q?=E3=80=81=E6=9B=B4=E6=96=B0=E6=9C=AC=E5=9C=B0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/data/loader/DataSourceLoader.java | 2 +- .../main/java/com/nu/dto/DirectiveMQDto.java | 5 ++- .../nu-service-directive-biz/pom.xml | 8 +++- .../ConfigServiceDirectiveController.java | 39 +++++++++++++------ .../src/main/resources/application-dev.yml | 16 ++++---- 5 files changed, 48 insertions(+), 22 deletions(-) diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java b/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java index 7e9faec..c87af68 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/modules/data/loader/DataSourceLoader.java @@ -61,4 +61,4 @@ public class DataSourceLoader { }); } -} \ No newline at end of file +} 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 index 412c7a8..42376ba 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveMQDto.java @@ -6,5 +6,8 @@ import java.util.List; @Data public class DirectiveMQDto { - List ids; + private boolean izInc;//是否为增量 否则为全量 + private String orgCode;//机构编码 + private String idStr; + private List idList; } 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 f8bd281..a5982a8 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/pom.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/pom.xml @@ -43,6 +43,12 @@ nursing-unit-common ${nursingunit.version} - + + com.nursingunit.boot + nu-system-local-api + 2.0.0 + compile + + 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 index 5f8c07a..2eb912e 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 @@ -5,7 +5,6 @@ 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.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; @@ -17,16 +16,21 @@ import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; +import org.jeecg.common.system.vo.DictModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -44,6 +48,8 @@ public class ConfigServiceDirectiveController extends JeecgController> queryPageList(String dataSourceCode,ConfigServiceDirective configServiceDirective, + public Result> queryPageList(String dataSourceCode, ConfigServiceDirective configServiceDirective, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { @@ -67,14 +73,6 @@ 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); @@ -102,6 +100,25 @@ public class ConfigServiceDirectiveController extends JeecgController async(@RequestBody DirectiveMQDto dto) { + List dicts = sysBaseAPI.getDictItems("mq_org_queue"); + String queue = dicts.stream().filter(d -> d.getValue().equals(dto.getOrgCode())).findFirst().map(DictModel::getText).orElse(null); + if (StringUtils.isNotBlank(queue)) { + rabbitMQUtil.sendToExchange("hldy.fwzl", queue, dto); + }else{ + return Result.error("机构未配置MQ映射关系，需先在数据字典(mq_org_queue)中添加相应对应数据!"); + } + return Result.ok(""); + } + /** * 添加 * 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 6611c0a..e670220 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 @@ -169,17 +169,17 @@ spring: slow-sql-millis: 5000 datasource: master: - url: jdbc:mysql://1.92.152.160:33061/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.2.199:3306/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai # url: jdbc:mysql://localhost:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: root + username: nu_sys + password: nu_sys driver-class-name: com.mysql.cj.jdbc.Driver # 多数据源配置 - #multi-datasource1: - #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - #username: root - #password: root - #driver-class-name: com.mysql.cj.jdbc.Driver +# multi-datasource1: +# url: jdbc:mysql://1.92.152.160:33061/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# username: root +# password: root +# driver-class-name: com.mysql.cj.jdbc.Driver #redis 配置 redis: database: 0