From 2f3e41dd38eca7cce7e4d259a8c823d81026da95 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 16 Oct 2025 15:28:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=89=80=E6=9C=89=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=87=E6=8D=A2DynamicDataSourceC?= =?UTF-8?q?ontextHolder.push=20=E5=8A=A0=E4=B8=8Atry=20finally=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/nu/dto/CategoryMQDto.java | 7 +- .../java/com/nu/dto/DirectiveTypeMQDto.java | 8 +++ .../java/com/nu/dto/ElderTagAsyncMQDto.java | 72 ++++++++++++++----- .../main/java/com/nu/dto/ElderTagMQDto.java | 2 +- .../NuEmployeesAdvisoryInfoController.java | 18 +++-- 5 files changed, 78 insertions(+), 29 deletions(-) diff --git a/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java index b2bdc2ec..dddccba2 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/CategoryMQDto.java @@ -42,9 +42,12 @@ public class CategoryMQDto implements Serializable { * 是否删除 0未删除 1删除 */ private String delFlag; - + /** + * 网络标记，0为用pad本地静态图片，1为用网络图 + */ + private java.lang.String netFlag; /** * 动画图片 */ - private String animationPath; + private java.lang.String animationPath; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java index f8e4c4a4..5708a1ba 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/DirectiveTypeMQDto.java @@ -46,4 +46,12 @@ public class DirectiveTypeMQDto implements Serializable { * 是否删除 0未删除 1删除 */ private String delFlag; + /** + * 网络标记，0为用pad本地静态图片，1为用网络图 + */ + private java.lang.String netFlag; + /** + * 动画图片 + */ + private java.lang.String animationPath; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagAsyncMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagAsyncMQDto.java index 856907ac..0257901b 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagAsyncMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagAsyncMQDto.java @@ -1,8 +1,6 @@ package com.nu.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; import java.math.BigDecimal; @@ -11,43 +9,79 @@ import java.util.Date; /** * @Description: 长者标签 * @Author: zmy - * @Date: 2025-08-13 + * @Date: 2025-08-13 * @Version: V1.0 */ @Data public class ElderTagAsyncMQDto implements Serializable { - /**id*/ + /** + * id + */ private String id; - /**标签类型*/ + /** + * 标签类型 + */ private String type; - /**标签名称*/ + /** + * 标签名称 + */ private String tagName; - /**说明*/ + /** + * 说明 + */ private java.lang.String describ; - /**价格*/ + /** + * 价格 + */ private BigDecimal price; - /**图标*/ + /** + * 图标 + */ private String pic; - /**图标md5值*/ + /** + * 图标md5值 + */ private String picMd5; - /**排序*/ + /** + * 焦点图标 + */ + private java.lang.String picFocus; + /** + * 排序 + */ private Integer sort; - /**是否启用*/ + /** + * 是否启用 + */ private String izEnabled; - /**是否删除*/ + /** + * 是否删除 + */ private String delFlag; - /**创建人*/ + /** + * 创建人 + */ private String createBy; - /**创建日期*/ + /** + * 创建日期 + */ private Date createTime; - /**更新人*/ + /** + * 更新人 + */ private String updateBy; - /**更新日期*/ + /** + * 更新日期 + */ private Date updateTime; - /**所属机构*/ + /** + * 所属机构 + */ private String sysOrgCode; - /**资源请求接口域名+项目上下文路径 */ + /** + * 资源请求接口域名+项目上下文路径 + */ private String api; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagMQDto.java index 71ca09fe..16e68f94 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderTagMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderTagMQDto.java @@ -16,7 +16,7 @@ public class ElderTagMQDto { //同步子表code private String code; - //指令集合 + //标签集合 private List elderTagList; //是否同步指令资源 private boolean izSyncMedia; diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java index b1df8099..2bfb906b 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessadvisiory/controller/NuEmployeesAdvisoryInfoController.java @@ -92,13 +92,17 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(nuEmployeesAdvisoryInfo, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - if (ids1 != null && ids1.size() > 0) { - queryWrapper.notIn("id", ids1); + IPage pageList; + try { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuEmployeesAdvisoryInfo, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + if (ids1 != null && ids1.size() > 0) { + queryWrapper.notIn("id", ids1); + } + pageList = nuEmployeesAdvisoryInfoService.page(page, queryWrapper); + } finally { + DynamicDataSourceContextHolder.clear(); } - IPage pageList = nuEmployeesAdvisoryInfoService.page(page, queryWrapper); - DynamicDataSourceContextHolder.clear(); List records = pageList.getRecords(); if (records != null && records.size() > 0) { @@ -122,7 +126,7 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController list = employeesMediaService.list(qw); for (int i = 0; i < list.size(); i++) { Integer index = idToIndexMap.get(list.get(i).getEmployeesId()); - if(index!=null){ + if (index != null) { records.get(index).setHasCardZmPath(list.get(i).getCardZmPath());//是否有身份证正面 records.get(index).setHasCardFmPath(list.get(i).getCardFmPath());//是否有身份证反面 }