From 5a5236feacd9574f1a7bef7b9039bc8af85e0bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 5 Nov 2025 16:45:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8C=85?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=92=8C=E8=AE=A1=E5=88=92=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E5=8C=85=E7=9A=84=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuBizNuCustomerServerController.java | 9 ++- .../entity/DirectivePackageDto.java | 2 +- .../entity/NuBizNuCustomerServer.java | 6 ++ .../mapper/NuBizNuCustomerServerMapper.java | 2 +- .../xml/NuBizNuCustomerServerMapper.xml | 8 +- .../NuBizNuCustomerServerServiceImpl.java | 76 ++++++++++++------- 6 files changed, 68 insertions(+), 35 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java index 3c9f17d1..f04c45d9 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java @@ -30,7 +30,7 @@ public class NuBizNuCustomerServerController extends JeecgController directivesList; + private List directivesList; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java index 41632274..6d639f30 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java @@ -158,6 +158,9 @@ public class NuBizNuCustomerServer implements Serializable { @ApiModelProperty(value = "是否是服务指令包") private java.lang.String izPackage; + @ApiModelProperty(value = "指令包ID") + private java.lang.String packageId; + /**服务指令列表**/ @TableField(exist = false) private List serverList; @@ -167,4 +170,7 @@ public class NuBizNuCustomerServer implements Serializable { /**长者标签列表**/ @TableField(exist = false) private List tagList; + /**服务包中的服务列表**/ + @TableField(exist = false) + private List directivesList; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java index 0baa3c89..04285777 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java @@ -20,5 +20,5 @@ public interface NuBizNuCustomerServerMapper extends BaseMapper getNcPackagelist(@Param("params") DirectivePackageDto directivePackageDto); - List getNcDirectiveList(@Param("params") ConfigServiceDirectiveDto configServiceDirectiveDto); + List getNcDirectiveList(@Param("params") NuBizNuCustomerServer nuBizNuCustomerServer); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml index 31a43498..a8dddfc6 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml @@ -11,7 +11,7 @@ select * from nu_directive_package where del_flag = '0' and iz_enabled = '0' - select a.package_id,b.*, c.category_name AS category_name, d.type_name AS type_name, @@ -23,6 +23,10 @@ left join nu_config_service_type d on b.type_id = d.id left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type - + + + AND a.package_id = #{params.packageId} + + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java index c566b8e1..a3744082 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java @@ -121,33 +121,19 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl pdList = baseMapper.getNcDirectiveList(packageDirective); + for(NuBizNuCustomerServer pd : pdList){ + getNetImages(pd); + } + par.setDirectivesList(pdList); + } }else{ - par.setImmediateFile(""); - par.setNetImmediateFile(""); - } - if(par.getImmediateFileFocus()!=null&&!par.getImmediateFileFocus().equals("")){ - String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); - par.setNetImmediateFileFocus(immediateFileFocus); - }else{ - par.setImmediateFileFocus(""); - par.setNetImmediateFileFocus(""); - } - if(par.getPreviewFile()!=null&&!par.getPreviewFile().equals("")){ - String previewFile = getImageNetUrl(par.getPreviewFile()); - par.setNetPreviewFile(previewFile); - }else{ - par.setPreviewFile(""); - par.setNetPreviewFile(""); - } - if(par.getPreviewFileSmall()!=null&&!par.getPreviewFileSmall().equals("")){ - String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); - par.setNetPreviewFileSmall(previewFileSmall); - }else{ - par.setPreviewFileSmall(""); - par.setNetPreviewFileSmall(""); + getNetImages(par); } } @@ -235,6 +221,37 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl list = baseMapper.getNcPackagelist(directivePackageDto); - List directiveList = baseMapper.getNcDirectiveList(new ConfigServiceDirectiveDto()); + List directiveList = baseMapper.getNcDirectiveList(new NuBizNuCustomerServer()); for(DirectivePackageDto et : list){ - List directivesList = new ArrayList<>(); - for(ConfigServiceDirectiveDto etd : directiveList){ + List directivesList = new ArrayList<>(); + for(NuBizNuCustomerServer etd : directiveList){ if(etd.getPackageId().equals(et.getId())){ + getNetImages(etd); directivesList.add(etd); } }