diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java index b1afd31..a16c0b0 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java @@ -4,7 +4,7 @@ import com.nu.entity.CareDirectiveEntity; import com.nu.entity.CareDirectiveInstantEntity; import com.nu.entity.CareDirectivePackageEntity; import com.nu.entity.ElderTagEntity; -import com.nu.modules.care.api.ICareDirectiveConfigApi; +import com.nu.modules.care.api.IDirectiveConfigApi; import com.nu.modules.care.api.ICareDirectivePlanApi; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; @@ -27,19 +27,19 @@ import java.util.Map; public class CareDirectiveApi { @Autowired - private ICareDirectiveConfigApi careDirectiveConfigApi; + private IDirectiveConfigApi directiveConfigApi; @Autowired private ICareDirectivePlanApi careDirectivePlanApi; /** - * 获取护理类服务器指令树-配置数据 + * 获取护理类服务指令树-配置数据 * * @return */ @GetMapping(value = "/getServiceTree") public Result>> getServiceTree() { - List> treeList = careDirectiveConfigApi.getServiceTree(); + List> treeList = directiveConfigApi.getServiceTree("1"); return Result.OK(treeList); } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/logistics/LogisticsDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/logistics/LogisticsDirectiveApi.java new file mode 100644 index 0000000..593c828 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/logistics/LogisticsDirectiveApi.java @@ -0,0 +1,39 @@ +package com.nu.modules.pad.instruction.logistics; + +import com.nu.modules.care.api.IDirectiveConfigApi; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + + +/** +* @Description: 后勤类服务指令API +* @Author: caolei +* @Date: 2025-11-28 +* @Version: V1.0 +*/ + +@RestController +@RequestMapping("/api/pad/logistics/directive") +@Slf4j +public class LogisticsDirectiveApi { + + @Autowired + private IDirectiveConfigApi directiveConfigApi; + + /** + * 获取后勤类服务指令树-配置数据 + * + * @return + */ + @GetMapping(value = "/getServiceTree") + public Result>> getServiceTree() { + List> treeList = directiveConfigApi.getServiceTree("3"); + return Result.OK(treeList); + } + +} diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.java deleted file mode 100644 index 5cf94e2..0000000 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.nu.modules.care.api; - -import java.util.List; -import java.util.Map; - -public interface ICareDirectiveConfigApi { - List> getServiceTree(); -} diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IDirectiveConfigApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IDirectiveConfigApi.java new file mode 100644 index 0000000..ae83307 --- /dev/null +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/IDirectiveConfigApi.java @@ -0,0 +1,8 @@ +package com.nu.modules.care.api; + +import java.util.List; +import java.util.Map; + +public interface IDirectiveConfigApi { + List> getServiceTree(String instructionType); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceCategoryMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceCategoryMapper.java deleted file mode 100644 index dd66ea2..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceCategoryMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory; - -/** - * @Description: 服务类别 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface CareConfigServiceCategoryMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceDirectiveMapper.java deleted file mode 100644 index 354799a..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceDirectiveMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; - -/** - * @Description: 服务指令 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface CareConfigServiceDirectiveMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceTypeMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceTypeMapper.java deleted file mode 100644 index c61b1f8..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceTypeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.config.entity.CareConfigServiceType; - -/** - * @Description: 服务类型 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface CareConfigServiceTypeMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareInstructionTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareInstructionTagMapper.java deleted file mode 100644 index 1d19151..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareInstructionTagMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.config.entity.CareInstructionTag; - -/** - * @Description: 分类标签 - * @Author: caolei - * @Date: 2025-10-11 - * @Version: V1.0 - */ -public interface CareInstructionTagMapper extends BaseMapper { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceCategoryService.java deleted file mode 100644 index 713c26a..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceCategoryService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory; - -/** - * @Description: 服务类别 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface ICareConfigServiceCategoryService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceDirectiveService.java deleted file mode 100644 index 83e5d84..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceDirectiveService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; - -/** - * @Description: 服务指令 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface ICareConfigServiceDirectiveService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceTypeService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceTypeService.java deleted file mode 100644 index 5b93c9b..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceTypeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.config.entity.CareConfigServiceType; - -/** - * @Description: 服务类型 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface ICareConfigServiceTypeService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareInstructionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareInstructionTagService.java deleted file mode 100644 index cd6dd14..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareInstructionTagService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.biz.care.config.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.config.entity.CareInstructionTag; - -/** - * @Description: 分类标签 - * @Author: caolei - * @Date: 2025-10-11 - * @Version: V1.0 - */ -public interface ICareInstructionTagService extends IService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java deleted file mode 100644 index f8b4524..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.biz.care.config.service.impl; - -import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; -import com.nu.modules.biz.care.config.mapper.CareConfigServiceDirectiveMapper; -import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 服务指令 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -@Service -public class CareConfigServiceDirectiveServiceImpl extends ServiceImpl implements ICareConfigServiceDirectiveService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceTypeServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceTypeServiceImpl.java deleted file mode 100644 index ae2d6e3..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceTypeServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.biz.care.config.service.impl; - -import com.nu.modules.biz.care.config.entity.CareConfigServiceType; -import com.nu.modules.biz.care.config.mapper.CareConfigServiceTypeMapper; -import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -/** - * @Description: 服务类型 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -@Service -public class CareConfigServiceTypeServiceImpl extends ServiceImpl implements ICareConfigServiceTypeService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareInstructionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareInstructionTagServiceImpl.java deleted file mode 100644 index 6a57303..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareInstructionTagServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.biz.care.config.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.care.config.entity.CareInstructionTag; -import com.nu.modules.biz.care.config.mapper.CareInstructionTagMapper; -import com.nu.modules.biz.care.config.service.ICareInstructionTagService; -import org.springframework.stereotype.Service; - -/** - * @Description: 分类标签 - * @Author: caolei - * @Date: 2025-10-11 - * @Version: V1.0 - */ -@Service -public class CareInstructionTagServiceImpl extends ServiceImpl implements ICareInstructionTagService { - -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java index 4eafe89..4712ac8 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java @@ -9,12 +9,12 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.nu.entity.CareDirectiveEntity; -import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory; -import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; -import com.nu.modules.biz.care.config.entity.CareConfigServiceType; -import com.nu.modules.biz.care.config.service.ICareConfigServiceCategoryService; -import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService; -import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService; +import com.nu.modules.biz.common.entity.ConfigServiceCategory; +import com.nu.modules.biz.common.entity.ConfigServiceDirective; +import com.nu.modules.biz.common.entity.ConfigServiceType; +import com.nu.modules.biz.common.service.IConfigServiceCategoryService; +import com.nu.modules.biz.common.service.IConfigServiceDirectiveService; +import com.nu.modules.biz.common.service.IConfigServiceTypeService; import com.nu.modules.biz.care.datapool.service.impl.DataPoolServiceImpl; import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag; import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; @@ -42,11 +42,11 @@ import java.util.*; public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl implements IPlanBizNuCustomerServerService, ICareDirectivePlanApi { @Autowired - private ICareConfigServiceCategoryService careConfigServiceCategoryService; + private IConfigServiceCategoryService careConfigServiceCategoryService; @Autowired - private ICareConfigServiceTypeService careConfigServiceTypeService; + private IConfigServiceTypeService careConfigServiceTypeService; @Autowired - private ICareConfigServiceDirectiveService careConfigServiceDirectiveService; + private IConfigServiceDirectiveService careConfigServiceDirectiveService; @Autowired private IPlanBizNuCustomerServerInstantService planBizNuCustomerServerInstantService; @Autowired @@ -234,9 +234,9 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceCategoryMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceCategoryMapper.java new file mode 100644 index 0000000..71cc719 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceCategoryMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.common.entity.ConfigServiceCategory; + +/** + * @Description: 服务类别 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface ConfigServiceCategoryMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceDirectiveMapper.java new file mode 100644 index 0000000..c57a49d --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceDirectiveMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.common.entity.ConfigServiceDirective; + +/** + * @Description: 服务指令 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface ConfigServiceDirectiveMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceTypeMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceTypeMapper.java new file mode 100644 index 0000000..7e21970 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceTypeMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.common.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.common.entity.ConfigServiceType; + +/** + * @Description: 服务类型 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface ConfigServiceTypeMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareInstructionTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigInstructionTagMapper.xml similarity index 65% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareInstructionTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigInstructionTagMapper.xml index 297f0aa..d58674c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareInstructionTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigInstructionTagMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceTypeMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceCategoryMapper.xml similarity index 64% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceTypeMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceCategoryMapper.xml index 4129817..fd83496 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceTypeMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceCategoryMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceDirectiveMapper.xml similarity index 88% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceDirectiveMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceDirectiveMapper.xml index f4ba2e4..a9d0865 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -1,8 +1,8 @@ - + - select * from ( SELECT csd.id AS id, csd.directive_name, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceCategoryMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceTypeMapper.xml similarity index 63% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceCategoryMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceTypeMapper.xml index 3e7d9ca..71409ff 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceCategoryMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceTypeMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigInstructionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigInstructionTagService.java new file mode 100644 index 0000000..457f1d2 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigInstructionTagService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.common.entity.ConfigInstructionTag; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +public interface IConfigInstructionTagService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceCategoryService.java new file mode 100644 index 0000000..fff93c1 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceCategoryService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.common.entity.ConfigServiceCategory; + +/** + * @Description: 服务类别 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface IConfigServiceCategoryService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceDirectiveService.java new file mode 100644 index 0000000..2ef07db --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceDirectiveService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.common.entity.ConfigServiceDirective; + +/** + * @Description: 服务指令 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface IConfigServiceDirectiveService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceTypeService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceTypeService.java new file mode 100644 index 0000000..1b3a19b --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceTypeService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.common.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.common.entity.ConfigServiceType; + +/** + * @Description: 服务类型 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface IConfigServiceTypeService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigInstructionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigInstructionTagServiceImpl.java new file mode 100644 index 0000000..dfc4c0c --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigInstructionTagServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.biz.common.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.biz.common.entity.ConfigInstructionTag; +import com.nu.modules.biz.common.mapper.ConfigInstructionTagMapper; +import com.nu.modules.biz.common.service.IConfigInstructionTagService; +import org.springframework.stereotype.Service; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +@Service +public class ConfigInstructionTagServiceImpl extends ServiceImpl implements IConfigInstructionTagService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java similarity index 80% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceCategoryServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java index 3c42188..9d681f1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java @@ -1,18 +1,18 @@ -package com.nu.modules.biz.care.config.service.impl; +package com.nu.modules.biz.common.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.biz.care.config.entity.CareConfigServiceCategory; -import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; -import com.nu.modules.biz.care.config.entity.CareConfigServiceType; -import com.nu.modules.biz.care.config.entity.CareInstructionTag; -import com.nu.modules.biz.care.config.mapper.CareConfigServiceCategoryMapper; -import com.nu.modules.biz.care.config.service.ICareConfigServiceCategoryService; -import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService; -import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService; -import com.nu.modules.biz.care.config.service.ICareInstructionTagService; -import com.nu.modules.care.api.ICareDirectiveConfigApi; +import com.nu.modules.biz.common.entity.ConfigServiceCategory; +import com.nu.modules.biz.common.entity.ConfigServiceDirective; +import com.nu.modules.biz.common.entity.ConfigServiceType; +import com.nu.modules.biz.common.entity.ConfigInstructionTag; +import com.nu.modules.biz.common.mapper.ConfigServiceCategoryMapper; +import com.nu.modules.biz.common.service.IConfigServiceCategoryService; +import com.nu.modules.biz.common.service.IConfigServiceDirectiveService; +import com.nu.modules.biz.common.service.IConfigServiceTypeService; +import com.nu.modules.biz.common.service.IConfigInstructionTagService; +import com.nu.modules.care.api.IDirectiveConfigApi; import com.nu.modules.sysconfig.ISysConfigApi; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -30,55 +30,55 @@ import java.util.Map; * @Version: V1.0 */ @Service -public class CareConfigServiceCategoryServiceImpl extends ServiceImpl implements ICareConfigServiceCategoryService, ICareDirectiveConfigApi { +public class ConfigServiceCategoryServiceImpl extends ServiceImpl implements IConfigServiceCategoryService, IDirectiveConfigApi { @Autowired - private ICareInstructionTagService instructionTagService; + private IConfigInstructionTagService instructionTagService; @Autowired - private ICareConfigServiceTypeService configServiceTypeService; + private IConfigServiceTypeService configServiceTypeService; @Autowired - private ICareConfigServiceDirectiveService configServiceDirectiveService; + private IConfigServiceDirectiveService configServiceDirectiveService; @Autowired private ISysConfigApi sysConfigApi; @Override - public List> getServiceTree() { + public List> getServiceTree(String instructionType) { //缓存媒体地址 String mediaAddress = getOpeMediaAddress(); //查询护理类服务 - QueryWrapper instructionTagQueryWrapper = new QueryWrapper<>(); + QueryWrapper instructionTagQueryWrapper = new QueryWrapper<>(); instructionTagQueryWrapper.eq("iz_enabled", "Y"); instructionTagQueryWrapper.eq("del_flag", "0"); - instructionTagQueryWrapper.eq("instruction_type", "1"); - List instructionTagList = instructionTagService.list(instructionTagQueryWrapper); + instructionTagQueryWrapper.eq("instruction_type", instructionType); + List instructionTagList = instructionTagService.list(instructionTagQueryWrapper); Map tagMap = new HashMap(); - for (CareInstructionTag par : instructionTagList) { + for (ConfigInstructionTag par : instructionTagList) { tagMap.put(par.getId(), par.getInstructionName()); } //查询服务类别数据 - QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); + QueryWrapper categoryQueryWrapper = new QueryWrapper<>(); categoryQueryWrapper.eq("iz_enabled", "Y"); categoryQueryWrapper.eq("del_flag", "0"); - List categoryList = baseMapper.selectList(categoryQueryWrapper); + List categoryList = baseMapper.selectList(categoryQueryWrapper); //查询服务类型数据 - QueryWrapper typeQueryWrapper = new QueryWrapper<>(); + QueryWrapper typeQueryWrapper = new QueryWrapper<>(); typeQueryWrapper.eq("iz_enabled", "Y"); typeQueryWrapper.eq("del_flag", "0"); - List typeList = configServiceTypeService.list(typeQueryWrapper); + List typeList = configServiceTypeService.list(typeQueryWrapper); //查询服务指令数据 - QueryWrapper directiveQueryWrapper = new QueryWrapper<>(); + QueryWrapper directiveQueryWrapper = new QueryWrapper<>(); directiveQueryWrapper.eq("iz_enabled", "Y"); directiveQueryWrapper.eq("del_flag", "0"); - List directiveList = configServiceDirectiveService.list(directiveQueryWrapper); + List directiveList = configServiceDirectiveService.list(directiveQueryWrapper); //封装服务指令和服务类型tree集合 List> typeMapList = new ArrayList<>(); - for (CareConfigServiceType par : typeList) { + for (ConfigServiceType par : typeList) { Map wllxMap = new HashMap(); List> directiceMapList = new ArrayList>(); - for (CareConfigServiceDirective directicePar : directiveList) { + for (ConfigServiceDirective directicePar : directiveList) { if (StringUtils.equals(directicePar.getTypeId(), par.getId())) { Map directiceMap = new HashMap(); directiceMap.put("id", directicePar.getId()); @@ -161,7 +161,7 @@ public class CareConfigServiceCategoryServiceImpl extends ServiceImpl> treeList = new ArrayList<>(); int index = 0; - for (CareConfigServiceCategory par : categoryList) { + for (ConfigServiceCategory par : categoryList) { index++; Map infoMap = new HashMap(); List> wllxMap2List = new ArrayList>(); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceDirectiveServiceImpl.java new file mode 100644 index 0000000..11f63a3 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.biz.common.service.impl; + +import com.nu.modules.biz.common.entity.ConfigServiceDirective; +import com.nu.modules.biz.common.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.biz.common.service.IConfigServiceDirectiveService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 服务指令 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +@Service +public class ConfigServiceDirectiveServiceImpl extends ServiceImpl implements IConfigServiceDirectiveService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceTypeServiceImpl.java new file mode 100644 index 0000000..35e1bcb --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceTypeServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.biz.common.service.impl; + +import com.nu.modules.biz.common.entity.ConfigServiceType; +import com.nu.modules.biz.common.mapper.ConfigServiceTypeMapper; +import com.nu.modules.biz.common.service.IConfigServiceTypeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 服务类型 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +@Service +public class ConfigServiceTypeServiceImpl extends ServiceImpl implements IConfigServiceTypeService { + +}