From df164fdb69fa4ff7d4b7031fa4035c8f3383517a Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 28 Mar 2025 17:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuConfigServiceCategoryController.java | 2 +- .../entity/NuConfigServiceCategory.java | 3 +- .../entity/NuConfigServiceDirective.java | 12 +-- .../entity/NuConfigServiceType.java | 3 +- .../mapper/NuConfigServiceCategoryMapper.java | 2 +- .../NuConfigServiceDirectiveMapper.java | 2 +- .../mapper/NuConfigServiceTypeMapper.java | 2 +- .../xml/NuConfigServiceDirectiveMapper.xml | 35 ++++++++ .../INuConfigServiceCategoryService.java | 2 +- .../INuConfigServiceDirectiveService.java | 2 +- .../service/INuConfigServiceTypeService.java | 2 +- .../NuConfigServiceCategoryServiceImpl.java | 84 +++++++++++++++++-- .../NuConfigServiceDirectiveServiceImpl.java | 2 +- .../impl/NuConfigServiceTypeServiceImpl.java | 2 +- 14 files changed, 129 insertions(+), 26 deletions(-) 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 cf7388c..ad846f2 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 @@ -40,7 +40,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; import org.apache.shiro.authz.annotation.RequiresPermissions; /** - * @Description: nu_config_service_category + * @Description: 服务指令 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java index 551a3e2..230a768 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java @@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: nu_config_service_category + * @Description: 服务类别 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 @@ -30,7 +30,6 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_category") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_service_category对象", description="nu_config_service_category") public class NuConfigServiceCategory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java index 44819ce..5a89eb1 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java @@ -4,10 +4,8 @@ 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 com.baomidou.mybatisplus.annotation.*; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -21,7 +19,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: nu_config_service_directive + * @Description: 服务指令 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 @@ -30,7 +28,6 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_directive") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_service_directive对象", description="nu_config_service_directive") public class NuConfigServiceDirective implements Serializable { private static final long serialVersionUID = 1L; @@ -126,4 +123,7 @@ public class NuConfigServiceDirective implements Serializable { @Excel(name = "视频文件", width = 15) @ApiModelProperty(value = "视频文件") private java.lang.String mp4File; + + @TableField(exist = false) + private String tagName; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java index c1ab555..023ae9e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java @@ -21,7 +21,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * @Description: nu_config_service_type + * @Description: 服务类型 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 @@ -30,7 +30,6 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_config_service_type对象", description="nu_config_service_type") public class NuConfigServiceType implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java index 37e0e7a..257c291 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java @@ -7,7 +7,7 @@ import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: nu_config_service_category + * @Description: 服务类别 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java index 4a6b06a..826d8cb 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java @@ -7,7 +7,7 @@ import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: nu_config_service_directive + * @Description: 服务指令 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java index 66abd9b..daa053b 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java @@ -7,7 +7,7 @@ import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * @Description: nu_config_service_type + * @Description: 服务类型 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 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 009fe7b..132b1f7 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 @@ -2,4 +2,39 @@ + + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java index f33a3ab..6ad35c2 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; /** - * @Description: nu_config_service_category + * @Description: 服务类别 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java index 04ee5d4..43e0e43 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java @@ -4,7 +4,7 @@ import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: nu_config_service_directive + * @Description: 服务指令 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java index 6b4e7db..260f763 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java @@ -4,7 +4,7 @@ import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; import com.baomidou.mybatisplus.extension.service.IService; /** - * @Description: nu_config_service_type + * @Description: 服务类型 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 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 77dfb77..20cf682 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,16 +1,25 @@ package com.nu.modules.nuApiServiceCategory.service.impl; +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.mapper.NuConfigServiceCategoryMapper; import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; +import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; +import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** - * @Description: nu_config_service_category + * @Description: 服务类别 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 @@ -18,12 +27,73 @@ import java.util.*; @Service public class NuConfigServiceCategoryServiceImpl extends ServiceImpl implements INuConfigServiceCategoryService { + @Autowired + private INuConfigServiceTypeService nuConfigServiceTypeService; + @Autowired + private INuConfigServiceDirectiveService nuConfigServiceDirectiveService; @Override public List> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory) { + + //查询服务类别数据 + QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); + categoryQueryWrapper.eq("iz_enabled","0"); + categoryQueryWrapper.eq("del_flag","0"); + List categoryList = baseMapper.selectList(categoryQueryWrapper); + //查询服务类型数据 + QueryWrapper typeQueryWrapper = new QueryWrapper<>(); + typeQueryWrapper.eq("iz_enabled","0"); + typeQueryWrapper.eq("del_flag","0"); + List typeList = nuConfigServiceTypeService.list(typeQueryWrapper); + //查询服务指令数据 + QueryWrapper directiveQueryWrapper = new QueryWrapper<>(); + directiveQueryWrapper.eq("iz_enabled","0"); + directiveQueryWrapper.eq("del_flag","0"); + List directiveList = nuConfigServiceDirectiveService.list(directiveQueryWrapper); + + //封装服务指令和服务类型tree集合 + List> typeMapList = new ArrayList<>(); + for(NuConfigServiceType par : typeList){ + Map wllxMap = new HashMap(); + List> directiceMapList = new ArrayList>(); + for(NuConfigServiceDirective directicePar:directiveList){ + if(StringUtils.equals(directicePar.getTypeId(),par.getId())){ + Map directiceMap = new HashMap(); + directiceMap.put("key",directicePar.getId()); + directiceMap.put("levle","3"); + directiceMap.put("title",directicePar.getDirectiveName()); + directiceMap.put("serviceDuration",directicePar.getServiceDuration()); + directiceMap.put("tagName",directicePar.getTagName()); + directiceMapList.add(directiceMap); + } + } + wllxMap.put("key",par.getId()); + wllxMap.put("parentId",par.getCategoryId()); + wllxMap.put("title",par.getTypeName()); + wllxMap.put("levle","2"); + wllxMap.put("children",directiceMapList); + typeMapList.add(wllxMap); + } + + //封装服务类别服务类型tree集合 List> treeList = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("key","123"); - treeList.add(map); + int index = 0; + for(NuConfigServiceCategory par : categoryList){ + index++; + Map infoMap = new HashMap(); + List> wllxMap2List = new ArrayList>(); + for(Map wllxPar : typeMapList){ + if(StringUtils.equals(par.getId(),wllxPar.get("parentId").toString())){ + wllxMap2List.add(wllxPar); + } + } + infoMap.put("key",par.getId()); + infoMap.put("title",index + " " +par.getCategoryName()); + infoMap.put("levle","1"); + infoMap.put("children",wllxMap2List); + treeList.add(infoMap); + } + + return treeList; } } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java index 4737340..4c9ef7e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: nu_config_service_directive + * @Description: 服务指令 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java index 6a1bc95..b1c28e8 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** - * @Description: nu_config_service_type + * @Description: 服务类型 * @Author: jeecg-boot * @Date: 2025-03-28 * @Version: V1.0