From 0b1d72c0ddbffd353d601767214a7c0051fee876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Sat, 11 Oct 2025 17:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4:1=E3=80=81?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E6=8C=87=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?2=E3=80=81=E7=B1=BB=E5=88=AB=E3=80=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=9B=BE=E7=89=87=E3=80=81?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=BE=E7=89=87=E7=BB=84=EF=BC=8C3?= =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=A0=91=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E3=80=81=E7=BD=91=E7=BB=9C=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuConfigServiceCategoryController.java | 2 +- .../entity/NuConfigServiceCategory.java | 13 +++ .../entity/NuConfigServiceDirective.java | 11 +- .../entity/NuConfigServiceType.java | 9 ++ .../entity/NuInstructionTag.java | 83 +++++++++++++ .../mapper/NuInstructionTagMapper.java | 15 +++ .../xml/NuConfigServiceDirectiveMapper.xml | 2 + .../mapper/xml/NuInstructionTagMapper.xml | 5 + .../service/INuInstructionTagService.java | 14 +++ .../NuConfigServiceCategoryServiceImpl.java | 110 ++++++++++++++++-- .../impl/NuInstructionTagServiceImpl.java | 18 +++ .../main/java/com/nu/dto/CategoryMQDto.java | 5 + .../java/com/nu/dto/InstructionTagMQDto.java | 4 + .../instructiontag/entity/InstructionTag.java | 4 + .../ConfigServiceCategoryController.java | 16 +++ .../entity/ConfigServiceCategory.java | 9 ++ .../IConfigServiceCategoryService.java | 1 + .../ConfigServiceCategoryServiceImpl.java | 10 ++ .../ConfigServiceTypeController.java | 16 +++ .../servicetype/entity/ConfigServiceType.java | 9 ++ .../listener/DirectiveMQListener.java | 6 + 21 files changed, 350 insertions(+), 12 deletions(-) create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuInstructionTag.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuInstructionTagMapper.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java create mode 100644 nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java index b9bb40e..bb0de0b 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java @@ -27,7 +27,7 @@ public class NuConfigServiceCategoryController extends JeecgController { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml index e982fd7..28e40ce 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml @@ -26,6 +26,8 @@ csd.sys_org_code, csd.mp3_file, csd.mp4_file, + csd.immediate_file as immediateFile, + csd.immediate_file_focus as immediateFileFocus, cdt.tag_name as bodyTagName, cet.tag_name AS emotionTagName FROM nu_config_service_directive csd diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml new file mode 100644 index 0000000..0ee7614 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java new file mode 100644 index 0000000..e58c528 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java @@ -0,0 +1,14 @@ +package com.nu.modules.nuApiServiceCategory.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +public interface INuInstructionTagService extends IService { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java index cbccb05..e766f82 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java @@ -1,14 +1,18 @@ package com.nu.modules.nuApiServiceCategory.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; +import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceCategoryMapper; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; +import com.nu.modules.nuApiServiceCategory.service.INuInstructionTagService; +import com.nu.modules.sysconfig.ISysConfigApi; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,12 +31,27 @@ import java.util.Map; @Service public class NuConfigServiceCategoryServiceImpl extends ServiceImpl implements INuConfigServiceCategoryService { + @Autowired + private INuInstructionTagService nuInstructionTagService; @Autowired private INuConfigServiceTypeService nuConfigServiceTypeService; @Autowired private INuConfigServiceDirectiveService nuConfigServiceDirectiveService; + @Autowired + private ISysConfigApi sysConfigApi; + @Override public List> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory) { + //查询护理类服务 + QueryWrapper instructionTagQueryWrapper = new QueryWrapper<>(); + instructionTagQueryWrapper.eq("iz_enabled","0"); + instructionTagQueryWrapper.eq("del_flag","0"); + instructionTagQueryWrapper.eq("instruction_type","1"); + List instructionTagList = nuInstructionTagService.list(instructionTagQueryWrapper); + Map tagMap = new HashMap(); + for(NuInstructionTag par : instructionTagList){ + tagMap.put(par.getId(),par.getInstructionName()); + } //查询服务类别数据 QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); @@ -59,19 +78,39 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl directiceMap = new HashMap(); directiceMap.put("id",directicePar.getId()); - directiceMap.put("levle","3"); directiceMap.put("title",directicePar.getDirectiveName()); directiceMap.put("serviceDuration",directicePar.getServiceDuration()); directiceMap.put("tagName",directicePar.getBodyTagName()); - directiceMap.put("bodyTagName",directicePar.getBodyTagName()); - directiceMap.put("emotionTagName",directicePar.getEmotionTagName()); directiceMap.put("cycleType",directicePar.getCycleType()); + if(directicePar.getImmediateFile()!=null){ + String immediateFile = getImageNetUrl(directicePar.getImmediateFile()); + directiceMap.put("immediateFile",immediateFile); + }else{ + directiceMap.put("immediateFile",""); + } + if(directicePar.getImmediateFileFocus()!=null){ + String immediateFileFocus = getImageNetUrl(directicePar.getImmediateFileFocus()); + directiceMap.put("immediateFileFocus",immediateFileFocus); + }else{ + directiceMap.put("immediateFileFocus",""); + } + directiceMap.put("levle","3"); directiceMapList.add(directiceMap); } } wllxMap.put("key",par.getId()); wllxMap.put("parentId",par.getCategoryId()); wllxMap.put("title",par.getTypeName()); + wllxMap.put("netFlag",par.getNetFlag()); + List imagePaths = new ArrayList<>(); + if(par.getStaticPath()!=null){ + String staticPath = getImageNetUrl(par.getStaticPath()); + imagePaths.add(staticPath); + } + if(par.getAnimationPath()!=null){ + getImageNetUrls(imagePaths,par.getAnimationPath()); + } + wllxMap.put("animationPath",imagePaths); wllxMap.put("levle","2"); wllxMap.put("children",directiceMapList); typeMapList.add(wllxMap); @@ -89,14 +128,65 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl imagePaths = new ArrayList<>(); + if(par.getStaticPath()!=null){ + String staticPath = getImageNetUrl(par.getStaticPath()); + imagePaths.add(staticPath); + } + if(par.getAnimationPath()!=null){ + getImageNetUrls(imagePaths,par.getAnimationPath()); + } + infoMap.put("animationPath",imagePaths); + infoMap.put("levle","1"); + infoMap.put("children",wllxMap2List); + treeList.add(infoMap); + } } - - return treeList; } + + /** + * 获取管理平台静态资源路径 + * @return + */ + private String getOpeMediaAddress(){ + JSONObject json = sysConfigApi.getByKey("ope_media_address"); + if(json!=null){ + String configValue = json.getString("configValue"); + if(!configValue.endsWith("/")){ + configValue += "/"; + } + return configValue; + } + return ""; + } + + private String getImageNetUrl(String imageUrl){ + String netUrl = ""; + String configValue = getOpeMediaAddress(); + if(!configValue.equals("")){ + netUrl = configValue + imageUrl; + } + return netUrl; + } + + private List getImageNetUrls(List imagePaths,String imageUrl){ + String configValue = getOpeMediaAddress(); + if(!configValue.equals("")){ + String[] urls = imageUrl.split(","); + for (String url : urls) { + if (!url.isEmpty()) { + String netUrl = configValue + url; + imagePaths.add(netUrl); + } + } + } + return imagePaths; + } + } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java new file mode 100644 index 0000000..75d1f60 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.nuApiServiceCategory.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; +import com.nu.modules.nuApiServiceCategory.mapper.NuInstructionTagMapper; +import com.nu.modules.nuApiServiceCategory.service.INuInstructionTagService; +import org.springframework.stereotype.Service; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +@Service +public class NuInstructionTagServiceImpl extends ServiceImpl implements INuInstructionTagService { + +} 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 fcccb71..b2bdc2e 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,4 +42,9 @@ public class CategoryMQDto implements Serializable { * 是否删除 0未删除 1删除 */ private String delFlag; + + /** + * 动画图片 + */ + private String animationPath; } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java index d3426b8..6444ab1 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/InstructionTagMQDto.java @@ -21,6 +21,10 @@ public class InstructionTagMQDto implements Serializable { * 分类标签名称 */ private String instructionName; + /** + * 分类标签类型 + */ + private String instructionType; /** * 排序 */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java index f061ea9..9e0e60e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java @@ -42,6 +42,10 @@ public class InstructionTag implements Serializable { @Excel(name = "分类标签名称", width = 15) @ApiModelProperty(value = "分类标签名称") private java.lang.String instructionName; + @Excel(name = "分类标签类型", width = 15) + @ApiModelProperty(value = "分类标签类型") + @Dict(dicCode = "service_instruction_tag") + private java.lang.String instructionType; /**排序*/ @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java index 14e6144..a66e98c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java @@ -68,6 +68,22 @@ public class ConfigServiceCategoryController extends JeecgController getInfo(@RequestParam(name="id",required=true) String id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("id",id); + ConfigServiceCategory entity = configServiceCategoryService.getOne(queryWrapper); + return Result.OK(entity); + } + /** * 添加 * diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java index d5dcd80..423f0f7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java @@ -81,4 +81,13 @@ public class ConfigServiceCategory implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + /**网络标记，0为用pad本地静态图片，1为用网络图*/ + @ApiModelProperty(value = "网络标记") + private java.lang.String netFlag; + /**默认图片*/ + @ApiModelProperty(value = "默认图片") + private java.lang.String staticPath; + /**动画图片*/ + @ApiModelProperty(value = "动画图片") + private java.lang.String animationPath; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java index dca38dd..ece9918 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java @@ -26,4 +26,5 @@ public interface IConfigServiceCategoryService extends IService selectAll(String dataSourceCode, List ids, List excludeSubIds); void insertAll(List categoryList); + void updateAll(List categoryList); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java index 0370866..114dee0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java @@ -76,4 +76,14 @@ public class ConfigServiceCategoryServiceImpl extends ServiceImpl categoryList) { + categoryList.forEach(c -> { + ConfigServiceCategory entity = new ConfigServiceCategory(); + entity.setId(c.getId()); + entity.setAnimationPath(c.getAnimationPath()); + baseMapper.updateById(entity); + }); + } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java index 3a1bac7..4d17a7b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java @@ -70,6 +70,22 @@ public class ConfigServiceTypeController extends JeecgController getInfo(@RequestParam(name="id",required=true) String id) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("id",id); + ConfigServiceType entity = configServiceTypeService.getOne(queryWrapper); + return Result.OK(entity); + } + /** * 添加 * diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java index da18353..0128870 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java @@ -86,4 +86,13 @@ public class ConfigServiceType implements Serializable { /**所属部门*/ @ApiModelProperty(value = "所属部门") private java.lang.String sysOrgCode; + /**网络标记，0为用pad本地静态图片，1为用网络图*/ + @ApiModelProperty(value = "网络标记") + private java.lang.String netFlag; + /**默认图片*/ + @ApiModelProperty(value = "默认图片") + private java.lang.String staticPath; + /**动画图片*/ + @ApiModelProperty(value = "动画图片") + private java.lang.String animationPath; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java index 8fa77cd..f75babd 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java @@ -734,14 +734,20 @@ public class DirectiveMQListener { //需要新增的数据 List needAddData = Lists.newArrayList(); + List needUpdateData = Lists.newArrayList(); for (ConfigServiceCategory category : allData) { if (!existedIds.contains(category.getId())) { needAddData.add(category); + }else{ + needUpdateData.add(category); } } if (needAddData != null && !needAddData.isEmpty()) { serviceCategoryService.insertAll(needAddData); } + if (needUpdateData != null && !needUpdateData.isEmpty()) { + serviceCategoryService.updateAll(needUpdateData); + } } //服务类型 if (dto.getTypeList() != null) {