From a3a77dbc2bf3340f8cb102df9c39cf6cdd4fe269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 28 Nov 2025 16:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=9B=B4=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{DataPool.java => CareDataPool.java} | 2 +- ...{DataPoolSub.java => CareDataPoolSub.java} | 2 +- ...{DataPoolJob.java => CareDataPoolJob.java} | 6 +- .../datapool/mapper/CareDataPoolMapper.java | 38 ++++++++ .../mapper/CareDataPoolSubMapper.java | 16 ++++ .../care/datapool/mapper/DataPoolMapper.java | 38 -------- .../datapool/mapper/DataPoolSubMapper.java | 16 ---- ...aPoolMapper.xml => CareDataPoolMapper.xml} | 12 +-- ...ubMapper.xml => CareDataPoolSubMapper.xml} | 6 +- ...Service.java => ICareDataPoolService.java} | 14 +-- .../service/ICareDataPoolSubService.java | 16 ++++ .../datapool/service/IDataPoolSubService.java | 16 ---- ...Impl.java => CareDataPoolServiceImpl.java} | 86 +++++++++--------- ...l.java => CareDataPoolSubServiceImpl.java} | 12 +-- .../entity/{Orders.java => CareOrders.java} | 2 +- .../{OrdersSub.java => CareOrdersSub.java} | 2 +- .../{OrdersJob.java => CareOrdersJob.java} | 6 +- .../care/order/mapper/CareOrdersMapper.java | 20 +++++ .../order/mapper/CareOrdersSubMapper.java | 16 ++++ .../biz/care/order/mapper/OrdersMapper.java | 20 ----- .../care/order/mapper/OrdersSubMapper.java | 16 ---- ...{OrdersMapper.xml => CareOrdersMapper.xml} | 10 +-- ...sSubMapper.xml => CareOrdersSubMapper.xml} | 4 +- ...rsService.java => ICareOrdersService.java} | 4 +- .../order/service/ICareOrdersSubService.java | 16 ++++ .../care/order/service/IOrdersSubService.java | 16 ---- ...ceImpl.java => CareOrdersServiceImpl.java} | 86 +++++++++--------- .../impl/CareOrdersSubServiceImpl.java | 26 ++++++ .../service/impl/OrdersSubServiceImpl.java | 26 ------ ....java => PlanBizNuCustomerCareServer.java} | 8 +- ...> PlanBizNuCustomerCareServerInstant.java} | 4 +- .../plan/entity/PlanDirectivePackage.java | 2 +- ...BizNuCustomerCareServerInstantMapper.java} | 4 +- ...=> PlanBizNuCustomerCareServerMapper.java} | 8 +- ...nBizNuCustomerCareServerInstantMapper.xml} | 2 +- ... => PlanBizNuCustomerCareServerMapper.xml} | 6 +- ...izNuCustomerCareServerInstantService.java} | 4 +- ... IPlanBizNuCustomerCareServerService.java} | 4 +- ...uCustomerCareServerInstantServiceImpl.java | 22 +++++ ...anBizNuCustomerCareServerServiceImpl.java} | 90 +++++++++---------- ...BizNuCustomerServerInstantServiceImpl.java | 22 ----- ...nTag.java => BizConfigInstructionTag.java} | 2 +- ...ory.java => BizConfigServiceCategory.java} | 2 +- ...ve.java => BizConfigServiceDirective.java} | 2 +- ...iceType.java => BizConfigServiceType.java} | 2 +- ...ava => BizConfigInstructionTagMapper.java} | 4 +- ...va => BizConfigServiceCategoryMapper.java} | 4 +- ...a => BizConfigServiceDirectiveMapper.java} | 4 +- ...r.java => BizConfigServiceTypeMapper.java} | 4 +- ....xml => BizConfigInstructionTagMapper.xml} | 2 +- ...xml => BizConfigServiceCategoryMapper.xml} | 2 +- ...ml => BizConfigServiceDirectiveMapper.xml} | 4 +- ...per.xml => BizConfigServiceTypeMapper.xml} | 2 +- ...a => IBizConfigInstructionTagService.java} | 4 +- ... => IBizConfigServiceCategoryService.java} | 4 +- ...=> IBizConfigServiceDirectiveService.java} | 4 +- ...java => IBizConfigServiceTypeService.java} | 4 +- .../BizConfigInstructionTagServiceImpl.java | 18 ++++ ... BizConfigServiceCategoryServiceImpl.java} | 50 +++++------ .../BizConfigServiceDirectiveServiceImpl.java | 18 ++++ .../impl/BizConfigServiceTypeServiceImpl.java | 19 ++++ .../impl/ConfigInstructionTagServiceImpl.java | 18 ---- .../ConfigServiceDirectiveServiceImpl.java | 18 ---- .../impl/ConfigServiceTypeServiceImpl.java | 19 ---- 64 files changed, 468 insertions(+), 468 deletions(-) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/{DataPool.java => CareDataPool.java} (98%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/{DataPoolSub.java => CareDataPoolSub.java} (98%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/{DataPoolJob.java => CareDataPoolJob.java} (83%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolMapper.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolSubMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/{DataPoolMapper.xml => CareDataPoolMapper.xml} (99%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/{DataPoolSubMapper.xml => CareDataPoolSubMapper.xml} (94%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/{IDataPoolService.java => ICareDataPoolService.java} (56%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolSubService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/{DataPoolServiceImpl.java => CareDataPoolServiceImpl.java} (87%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/{DataPoolSubServiceImpl.java => CareDataPoolSubServiceImpl.java} (50%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/{Orders.java => CareOrders.java} (99%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/{OrdersSub.java => CareOrdersSub.java} (98%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/{OrdersJob.java => CareOrdersJob.java} (83%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersMapper.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersSubMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/{OrdersMapper.xml => CareOrdersMapper.xml} (95%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/{OrdersSubMapper.xml => CareOrdersSubMapper.xml} (93%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/{IOrdersService.java => ICareOrdersService.java} (70%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersSubService.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/{OrdersServiceImpl.java => CareOrdersServiceImpl.java} (77%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersSubServiceImpl.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersSubServiceImpl.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/{PlanBizNuCustomerServer.java => PlanBizNuCustomerCareServer.java} (93%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/{PlanBizNuCustomerServerInstant.java => PlanBizNuCustomerCareServerInstant.java} (96%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/{PlanBizNuCustomerServerInstantMapper.java => PlanBizNuCustomerCareServerInstantMapper.java} (63%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/{PlanBizNuCustomerServerMapper.java => PlanBizNuCustomerCareServerMapper.java} (55%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/{PlanBizNuCustomerServerInstantMapper.xml => PlanBizNuCustomerCareServerInstantMapper.xml} (91%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/{PlanBizNuCustomerServerMapper.xml => PlanBizNuCustomerCareServerMapper.xml} (92%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/{IPlanBizNuCustomerServerInstantService.java => IPlanBizNuCustomerCareServerInstantService.java} (59%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/{IPlanBizNuCustomerServerService.java => IPlanBizNuCustomerCareServerService.java} (57%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerCareServerInstantServiceImpl.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/{PlanBizNuCustomerServerServiceImpl.java => PlanBizNuCustomerCareServerServiceImpl.java} (79%) delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerInstantServiceImpl.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/{ConfigInstructionTag.java => BizConfigInstructionTag.java} (97%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/{ConfigServiceCategory.java => BizConfigServiceCategory.java} (97%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/{ConfigServiceDirective.java => BizConfigServiceDirective.java} (98%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/{ConfigServiceType.java => BizConfigServiceType.java} (97%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/{ConfigInstructionTagMapper.java => BizConfigInstructionTagMapper.java} (55%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/{ConfigServiceCategoryMapper.java => BizConfigServiceCategoryMapper.java} (55%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/{ConfigServiceDirectiveMapper.java => BizConfigServiceDirectiveMapper.java} (55%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/{ConfigServiceTypeMapper.java => BizConfigServiceTypeMapper.java} (57%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/{ConfigInstructionTagMapper.xml => BizConfigInstructionTagMapper.xml} (65%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/{ConfigServiceCategoryMapper.xml => BizConfigServiceCategoryMapper.xml} (64%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/{ConfigServiceDirectiveMapper.xml => BizConfigServiceDirectiveMapper.xml} (93%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/{ConfigServiceTypeMapper.xml => BizConfigServiceTypeMapper.xml} (65%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/{IConfigInstructionTagService.java => IBizConfigInstructionTagService.java} (56%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/{IConfigServiceCategoryService.java => IBizConfigServiceCategoryService.java} (56%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/{IConfigServiceDirectiveService.java => IBizConfigServiceDirectiveService.java} (55%) rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/{IConfigServiceTypeService.java => IBizConfigServiceTypeService.java} (58%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigInstructionTagServiceImpl.java rename nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/{ConfigServiceCategoryServiceImpl.java => BizConfigServiceCategoryServiceImpl.java} (82%) create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceDirectiveServiceImpl.java create mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceTypeServiceImpl.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigInstructionTagServiceImpl.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceDirectiveServiceImpl.java delete mode 100644 nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceTypeServiceImpl.java diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPool.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/CareDataPool.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPool.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/CareDataPool.java index 9682062..34f7ee0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPool.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/CareDataPool.java @@ -26,7 +26,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池主表") -public class DataPool implements Serializable { +public class CareDataPool implements Serializable { private static final long serialVersionUID = 1L; @TableId(type = IdType.ASSIGN_ID) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPoolSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/CareDataPoolSub.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPoolSub.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/CareDataPoolSub.java index bae7b08..69bfc25 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPoolSub.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/CareDataPoolSub.java @@ -23,7 +23,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池子表") -public class DataPoolSub implements Serializable { +public class CareDataPoolSub implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/DataPoolJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/CareDataPoolJob.java similarity index 83% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/DataPoolJob.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/CareDataPoolJob.java index cb8a11b..6588a4b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/DataPoolJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/CareDataPoolJob.java @@ -1,6 +1,6 @@ package com.nu.modules.biz.care.datapool.job; -import com.nu.modules.biz.care.datapool.service.IDataPoolService; +import com.nu.modules.biz.care.datapool.service.ICareDataPoolService; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; @@ -13,10 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired; * 指令计划批量生成到指令池 */ @Slf4j -public class DataPoolJob implements Job { +public class CareDataPoolJob implements Job { @Autowired - IDataPoolService service; + ICareDataPoolService service; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolMapper.java new file mode 100644 index 0000000..108c973 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolMapper.java @@ -0,0 +1,38 @@ +package com.nu.modules.biz.care.datapool.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.datapool.entity.CareDataPool; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 服务指令数据池管理 + * @Author: caolei + * @Date: 2025-11-07 + * @Version: V1.0 + */ +public interface CareDataPoolMapper extends BaseMapper { + List queryPlanList(CareDataPool dataPool); + CareDataPool queryPlanById(@Param("id") String id); + CareDataPool queryPoolOne(CareDataPool dataPool); + + void createDataPoolLog(CareDataPool dataPool); + void createDataPoolLogSub(CareDataPool dataPool); + + void addDataPoolLog(CareDataPool dataPool); + void addDataPoolSubLog(CareDataPool dataPool); + + void deleteDataPool(CareDataPool dataPool); + void deleteDataPoolSub(CareDataPool dataPool); + + void createOrdersLog(CareDataPool dataPool); + void createOrdersLogSub(CareDataPool dataPool); + + void addOrdersLog(CareDataPool dataPool); + void addOrdersSubLog(CareDataPool dataPool); + + CareDataPool queryOrdersOne(CareDataPool dataPool); + void deleteOrders(CareDataPool dataPool); + void deleteOrdersSub(CareDataPool dataPool); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolSubMapper.java new file mode 100644 index 0000000..4bb43ea --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/CareDataPoolSubMapper.java @@ -0,0 +1,16 @@ +package com.nu.modules.biz.care.datapool.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub; +import java.util.List; + +/** + * @Description: 服务指令数据池管理子表 + * @Author: caolei + * @Date: 2025-11-11 + * @Version: V1.0 + */ +public interface CareDataPoolSubMapper extends BaseMapper { + CareDataPoolSub queryDirectiveOne(CareDataPoolSub dataPoolSub); + List queryDirectiveList(CareDataPoolSub dataPoolSub); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java deleted file mode 100644 index 66d51ac..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.nu.modules.biz.care.datapool.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.datapool.entity.DataPool; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 服务指令数据池管理 - * @Author: caolei - * @Date: 2025-11-07 - * @Version: V1.0 - */ -public interface DataPoolMapper extends BaseMapper { - List queryPlanList(DataPool dataPool); - DataPool queryPlanById(@Param("id") String id); - DataPool queryPoolOne(DataPool dataPool); - - void createDataPoolLog(DataPool dataPool); - void createDataPoolLogSub(DataPool dataPool); - - void addDataPoolLog(DataPool dataPool); - void addDataPoolSubLog(DataPool dataPool); - - void deleteDataPool(DataPool dataPool); - void deleteDataPoolSub(DataPool dataPool); - - void createOrdersLog(DataPool dataPool); - void createOrdersLogSub(DataPool dataPool); - - void addOrdersLog(DataPool dataPool); - void addOrdersSubLog(DataPool dataPool); - - DataPool queryOrdersOne(DataPool dataPool); - void deleteOrders(DataPool dataPool); - void deleteOrdersSub(DataPool dataPool); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java deleted file mode 100644 index 2c79fac..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nu.modules.biz.care.datapool.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.datapool.entity.DataPoolSub; -import java.util.List; - -/** - * @Description: 服务指令数据池管理子表 - * @Author: caolei - * @Date: 2025-11-11 - * @Version: V1.0 - */ -public interface DataPoolSubMapper extends BaseMapper { - DataPoolSub queryDirectiveOne(DataPoolSub dataPoolSub); - List queryDirectiveList(DataPoolSub dataPoolSub); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/CareDataPoolMapper.xml similarity index 99% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/CareDataPoolMapper.xml index 169d664..5effaa6 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/CareDataPoolMapper.xml @@ -1,8 +1,8 @@ - + - select id as bizId, nu_id as nuId, @@ -52,7 +52,7 @@ - select id as bizId, nu_id as nuId, @@ -83,7 +83,7 @@ where id = #{id} - select id, biz_id, @@ -139,7 +139,7 @@ - select id, biz_id, @@ -433,7 +433,7 @@ ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志子表' ROW_FORMAT = Dynamic; - select id, nu_id, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/CareDataPoolSubMapper.xml similarity index 94% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolSubMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/CareDataPoolSubMapper.xml index d07a3b0..c7f761b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolSubMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/CareDataPoolSubMapper.xml @@ -1,8 +1,8 @@ - + - select a.instruction_tag_id as instructionTagId, b.instruction_name as instructionTagName, @@ -28,7 +28,7 @@ where a.id = #{directiveId} - select b.instruction_tag_id as instructionTagId, e.instruction_name as instructionTagName, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolService.java similarity index 56% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolService.java index ffe6407..a34b55c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolService.java @@ -1,8 +1,8 @@ package com.nu.modules.biz.care.datapool.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.datapool.entity.DataPool; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; +import com.nu.modules.biz.care.datapool.entity.CareDataPool; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer; import org.jeecg.common.api.vo.Result; /** @@ -11,7 +11,7 @@ import org.jeecg.common.api.vo.Result; * @Date: 2025-11-06 * @Version: V1.0 */ -public interface IDataPoolService extends IService { +public interface ICareDataPoolService extends IService { /** * 批量生成 @@ -22,19 +22,19 @@ public interface IDataPoolService extends IService { * 单一生成 * @param planBizNuCustomerServer */ - void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer); + void generateDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer); /** * 删除 * @param planBizNuCustomerServer */ - void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer); + void deleteDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer); /** * 修改 * @param planBizNuCustomerServer */ - void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer); + void editDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer); /** @@ -42,7 +42,7 @@ public interface IDataPoolService extends IService { */ void cleanDataPool(); - Result addInstant(DataPool dataPool); + Result addInstant(CareDataPool dataPool); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolSubService.java new file mode 100644 index 0000000..506ae46 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/ICareDataPoolSubService.java @@ -0,0 +1,16 @@ +package com.nu.modules.biz.care.datapool.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub; +import java.util.List; + +/** + * @Description: 服务指令数据池管理子表 + * @Author: caolei + * @Date: 2025-11-11 + * @Version: V1.0 + */ +public interface ICareDataPoolSubService extends IService { + CareDataPoolSub queryDirectiveOne(CareDataPoolSub dataPoolSub); + List queryDirectiveList(CareDataPoolSub dataPoolSub); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java deleted file mode 100644 index 34f3b88..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nu.modules.biz.care.datapool.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.datapool.entity.DataPoolSub; -import java.util.List; - -/** - * @Description: 服务指令数据池管理子表 - * @Author: caolei - * @Date: 2025-11-11 - * @Version: V1.0 - */ -public interface IDataPoolSubService extends IService { - DataPoolSub queryDirectiveOne(DataPoolSub dataPoolSub); - List queryDirectiveList(DataPoolSub dataPoolSub); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/CareDataPoolServiceImpl.java similarity index 87% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/CareDataPoolServiceImpl.java index f32e379..60e87cd 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/CareDataPoolServiceImpl.java @@ -2,12 +2,12 @@ package com.nu.modules.biz.care.datapool.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.care.datapool.entity.DataPool; -import com.nu.modules.biz.care.datapool.entity.DataPoolSub; -import com.nu.modules.biz.care.datapool.mapper.DataPoolMapper; -import com.nu.modules.biz.care.datapool.service.IDataPoolService; -import com.nu.modules.biz.care.datapool.service.IDataPoolSubService; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; +import com.nu.modules.biz.care.datapool.entity.CareDataPool; +import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub; +import com.nu.modules.biz.care.datapool.mapper.CareDataPoolMapper; +import com.nu.modules.biz.care.datapool.service.ICareDataPoolService; +import com.nu.modules.biz.care.datapool.service.ICareDataPoolSubService; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer; import com.nu.modules.sysconfig.ISysConfigApi; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; @@ -29,10 +29,10 @@ import java.util.List; */ @Service @Slf4j -public class DataPoolServiceImpl extends ServiceImpl implements IDataPoolService { +public class CareDataPoolServiceImpl extends ServiceImpl implements ICareDataPoolService { @Autowired - IDataPoolSubService dataPoolSubService; + ICareDataPoolSubService dataPoolSubService; @Autowired private ISysConfigApi sysConfigApi; @@ -43,7 +43,7 @@ public class DataPoolServiceImpl extends ServiceImpl i */ @Override public Result generateDataPoolBatch() { - DataPool entity = new DataPool(); + CareDataPool entity = new CareDataPool(); Calendar c = Calendar.getInstance(); c.set(Calendar.SECOND,0); c.set(Calendar.MILLISECOND,0); @@ -51,10 +51,10 @@ public class DataPoolServiceImpl extends ServiceImpl i c.add(Calendar.MINUTE,10); entity.setEndTime(c.getTime()); try{ - List planList = baseMapper.queryPlanList(entity);//获取计划 + List planList = baseMapper.queryPlanList(entity);//获取计划 if(planList.size()>0){ - for(DataPool plan : planList){ - DataPool pool = baseMapper.queryPoolOne(plan); + for(CareDataPool plan : planList){ + CareDataPool pool = baseMapper.queryPoolOne(plan); if(pool!=null){ continue; } @@ -71,7 +71,7 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 指令生成数据池 */ - private void addDataPool(DataPool dataPool){ + private void addDataPool(CareDataPool dataPool){ Date dataTime = dataPool.getStartTime(); Calendar c = Calendar.getInstance(); c.set(Calendar.SECOND,0); @@ -113,7 +113,7 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 日常指令生成数据池子表（非包） */ - private void addDaily(DataPool dataPool){ + private void addDaily(CareDataPool dataPool){ //入指令池主表 this.save(dataPool); //入指令池子表 @@ -123,7 +123,7 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 星期周期指令生成数据池子表（非包） */ - private void addWeekDay(DataPool dataPool){ + private void addWeekDay(CareDataPool dataPool){ String cycleValue = dataPool.getCycleValue(); Calendar calendar = Calendar.getInstance(); int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK); //1周日 2周一 3周二 4周三 5周四 6周五 7周六 @@ -146,7 +146,7 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 月周期指令生成数据池子表（非包） */ - private void addMonthDay(DataPool dataPool){ + private void addMonthDay(CareDataPool dataPool){ String cycleValue = dataPool.getCycleValue(); Calendar calendar = Calendar.getInstance(); int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); @@ -163,10 +163,10 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 指令生成数据池子表（非包） */ - private void addSub(DataPool dataPool){ - DataPoolSub entity = new DataPoolSub(); + private void addSub(CareDataPool dataPool){ + CareDataPoolSub entity = new CareDataPoolSub(); entity.setDirectiveId(dataPool.getDirectiveId()); - DataPoolSub dataPoolSub = dataPoolSubService.queryDirectiveOne(entity); + CareDataPoolSub dataPoolSub = dataPoolSubService.queryDirectiveOne(entity); getNetImagesSub(dataPoolSub);//获取网络地址 dataPoolSub.setCycleValue(dataPool.getCycleValue()); dataPoolSub.setNuId(dataPool.getNuId()); @@ -184,7 +184,7 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 指令包生成数据池 */ - private void addPackage(DataPool dataPool){ + private void addPackage(CareDataPool dataPool){ //入指令池主表 this.save(dataPool); //入指令池子表 @@ -194,12 +194,12 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 指令包中指令进行规则判断，并生成到数据池子表 */ - private void addPackageSubs(DataPool dataPool){ - DataPoolSub entity = new DataPoolSub(); + private void addPackageSubs(CareDataPool dataPool){ + CareDataPoolSub entity = new CareDataPoolSub(); entity.setPackageId(dataPool.getPackageId()); - List subList = dataPoolSubService.queryDirectiveList(entity); + List subList = dataPoolSubService.queryDirectiveList(entity); for(int i=0;i i /** * 指令生成到数据池子表 */ - private void addPackageSub(DataPool dataPool,DataPoolSub dataPoolSub){ + private void addPackageSub(CareDataPool dataPool, CareDataPoolSub dataPoolSub){ dataPoolSub.setNuId(dataPool.getNuId()); dataPoolSub.setNuName(dataPool.getNuName()); dataPoolSub.setCustomerId(dataPool.getCustomerId()); @@ -258,8 +258,8 @@ public class DataPoolServiceImpl extends ServiceImpl i * @param planBizNuCustomerServer */ @Override - public void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer){ - DataPool dataPool = new DataPool(); + public void generateDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer){ + CareDataPool dataPool = new CareDataPool(); dataPool.setBizId(planBizNuCustomerServer.getId()); dataPool.setNuId(planBizNuCustomerServer.getNuId()); dataPool.setNuName(planBizNuCustomerServer.getNuName()); @@ -313,7 +313,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * @param planBizNuCustomerServer */ @Override - public void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) { + public void deleteDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer) { String startTime = planBizNuCustomerServer.getStartTime(); String[] starts = startTime.split(":"); String hour = starts[0]; @@ -323,7 +323,7 @@ public class DataPoolServiceImpl extends ServiceImpl i c.set(Calendar.MINUTE,Integer.valueOf(minute)); c.set(Calendar.SECOND,0); c.set(Calendar.MILLISECOND,0); - DataPool dataPool = new DataPool(); + CareDataPool dataPool = new CareDataPool(); dataPool.setBizId(planBizNuCustomerServer.getId()); dataPool.setNuId(planBizNuCustomerServer.getNuId()); dataPool.setCustomerId(planBizNuCustomerServer.getCustomerId()); @@ -336,7 +336,7 @@ public class DataPoolServiceImpl extends ServiceImpl i }else{ dataPool.setDirectiveId(planBizNuCustomerServer.getDirectiveId()); } - DataPool pool = baseMapper.queryPoolOne(dataPool); + CareDataPool pool = baseMapper.queryPoolOne(dataPool); if(pool!=null){ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String dateStr = sdf.format(c.getTime()); @@ -350,10 +350,10 @@ public class DataPoolServiceImpl extends ServiceImpl i } //删除派单 - private void deleteOrders(String dateStr,DataPool dataPool){ + private void deleteOrders(String dateStr, CareDataPool dataPool){ dataPool.setIzStart("N"); //获取未开始的工单 - DataPool pool = baseMapper.queryOrdersOne(dataPool); + CareDataPool pool = baseMapper.queryOrdersOne(dataPool); if(pool!=null){ //删除工单 addOrdersLog(dateStr,pool); @@ -365,7 +365,7 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 创建工单日志表 */ - private void addOrdersLog(String dateStr,DataPool dataPool){ + private void addOrdersLog(String dateStr, CareDataPool dataPool){ String tableName = "nu_biz_nu_care_directive_order_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); dataPool.setTableName(tableName); baseMapper.createOrdersLog(dataPool);//创建日志主表 @@ -377,7 +377,7 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 创建工单日志表 */ - private void addOrdersSubLog(String dateStr,DataPool dataPool){ + private void addOrdersSubLog(String dateStr, CareDataPool dataPool){ String tableName = "nu_biz_nu_care_directive_order_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); dataPool.setTableName(tableName); baseMapper.createOrdersLogSub(dataPool);//创建日志子表 @@ -391,10 +391,10 @@ public class DataPoolServiceImpl extends ServiceImpl i * @param planBizNuCustomerServer */ @Override - public void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) { + public void editDataPool(PlanBizNuCustomerCareServer planBizNuCustomerServer) { deleteDataPool(planBizNuCustomerServer); - DataPool dataPool = baseMapper.queryPlanById(planBizNuCustomerServer.getId()); - DataPool pool = baseMapper.queryPoolOne(dataPool); + CareDataPool dataPool = baseMapper.queryPlanById(planBizNuCustomerServer.getId()); + CareDataPool pool = baseMapper.queryPoolOne(dataPool); if(pool==null){ addDataPool(dataPool); } @@ -405,7 +405,7 @@ public class DataPoolServiceImpl extends ServiceImpl i */ private void addDataPoolLog(String dateStr,String id){ String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); - DataPool dataPool = new DataPool(); + CareDataPool dataPool = new CareDataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLog(dataPool);//创建日志主表 dataPool.setId(id); @@ -419,7 +419,7 @@ public class DataPoolServiceImpl extends ServiceImpl i */ private void addDataPoolSubLog(String dateStr,String id){ String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); - DataPool dataPool = new DataPool(); + CareDataPool dataPool = new CareDataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLogSub(dataPool);//创建日志子表 dataPool.setId(id); @@ -448,7 +448,7 @@ public class DataPoolServiceImpl extends ServiceImpl i */ private void addDataPoolLogByClean(String dateStr){ String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); - DataPool dataPool = new DataPool(); + CareDataPool dataPool = new CareDataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLog(dataPool);//创建日志主表 Calendar c = Calendar.getInstance(); @@ -467,7 +467,7 @@ public class DataPoolServiceImpl extends ServiceImpl i */ private void addDataPoolSubLogByClean(String dateStr){ String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); - DataPool dataPool = new DataPool(); + CareDataPool dataPool = new CareDataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLogSub(dataPool);//创建日志子表 Calendar c = Calendar.getInstance(); @@ -487,7 +487,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * @return */ @Override - public Result addInstant(DataPool dataPool){ + public Result addInstant(CareDataPool dataPool){ Calendar c = Calendar.getInstance(); c.set(Calendar.MILLISECOND,0); c.set(Calendar.SECOND,0); @@ -528,7 +528,7 @@ public class DataPoolServiceImpl extends ServiceImpl i return serverNetUrl + imageUrl; } - private DataPoolSub getNetImagesSub(DataPoolSub par) { + private CareDataPoolSub getNetImagesSub(CareDataPoolSub par) { if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) { String netPreviewFile = getImageNetUrl(par.getPreviewFile()); par.setNetPreviewFile(netPreviewFile); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolSubServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/CareDataPoolSubServiceImpl.java similarity index 50% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolSubServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/CareDataPoolSubServiceImpl.java index ddeead4..4265aab 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolSubServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/CareDataPoolSubServiceImpl.java @@ -1,9 +1,9 @@ package com.nu.modules.biz.care.datapool.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.care.datapool.entity.DataPoolSub; -import com.nu.modules.biz.care.datapool.mapper.DataPoolSubMapper; -import com.nu.modules.biz.care.datapool.service.IDataPoolSubService; +import com.nu.modules.biz.care.datapool.entity.CareDataPoolSub; +import com.nu.modules.biz.care.datapool.mapper.CareDataPoolSubMapper; +import com.nu.modules.biz.care.datapool.service.ICareDataPoolSubService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; @@ -16,15 +16,15 @@ import java.util.List; */ @Service @Slf4j -public class DataPoolSubServiceImpl extends ServiceImpl implements IDataPoolSubService { +public class CareDataPoolSubServiceImpl extends ServiceImpl implements ICareDataPoolSubService { @Override - public DataPoolSub queryDirectiveOne(DataPoolSub dataPoolSub){ + public CareDataPoolSub queryDirectiveOne(CareDataPoolSub dataPoolSub){ return baseMapper.queryDirectiveOne(dataPoolSub); } @Override - public List queryDirectiveList(DataPoolSub dataPoolSub){ + public List queryDirectiveList(CareDataPoolSub dataPoolSub){ return baseMapper.queryDirectiveList(dataPoolSub); } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/Orders.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java similarity index 99% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/Orders.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java index 45f345c..259c575 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/Orders.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java @@ -27,7 +27,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_care_directive_order对象", description="服务指令工单主表") -public class Orders implements Serializable { +public class CareOrders implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/OrdersSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrdersSub.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/OrdersSub.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrdersSub.java index d20c923..bd4f06c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/OrdersSub.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrdersSub.java @@ -25,7 +25,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_care_directive_order_sub对象", description="服务指令工单子表") -public class OrdersSub implements Serializable { +public class CareOrdersSub implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/OrdersJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/CareOrdersJob.java similarity index 83% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/OrdersJob.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/CareOrdersJob.java index b661afc..d44e808 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/OrdersJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/CareOrdersJob.java @@ -1,6 +1,6 @@ package com.nu.modules.biz.care.order.job; -import com.nu.modules.biz.care.order.service.IOrdersService; +import com.nu.modules.biz.care.order.service.ICareOrdersService; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; @@ -13,10 +13,10 @@ import org.springframework.beans.factory.annotation.Autowired; * 指令池批量生成工单 */ @Slf4j -public class OrdersJob implements Job { +public class CareOrdersJob implements Job { @Autowired - IOrdersService service; + ICareOrdersService service; @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersMapper.java new file mode 100644 index 0000000..13c3331 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersMapper.java @@ -0,0 +1,20 @@ +package com.nu.modules.biz.care.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.order.entity.CareOrders; +import org.apache.ibatis.annotations.Param; +import java.util.Date; +import java.util.List; + +/** + * @Description: 服务指令工单主表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +public interface CareOrdersMapper extends BaseMapper { + List queryDataPoolList(CareOrders orders); + List getEmpPermissionAndOnline(@Param("directiveIds") String directiveIds, @Param("employeeIds") String employeeIds, @Param("startTime") Date startTime); + CareOrders getEmpOrderly(@Param("customerId") String customerId); + List getPermissionEmps(@Param("directiveIds") String directiveIds); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersSubMapper.java new file mode 100644 index 0000000..faa040e --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/CareOrdersSubMapper.java @@ -0,0 +1,16 @@ +package com.nu.modules.biz.care.order.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.order.entity.CareOrders; +import com.nu.modules.biz.care.order.entity.CareOrdersSub; +import java.util.List; + +/** + * @Description: 服务指令工单子表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +public interface CareOrdersSubMapper extends BaseMapper { + List queryDataPoolSubList(CareOrders orders); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java deleted file mode 100644 index 45be84c..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.nu.modules.biz.care.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.order.entity.Orders; -import org.apache.ibatis.annotations.Param; -import java.util.Date; -import java.util.List; - -/** - * @Description: 服务指令工单主表 - * @Author: caolei - * @Date: 2025-11-18 - * @Version: V1.0 - */ -public interface OrdersMapper extends BaseMapper { - List queryDataPoolList(Orders orders); - List getEmpPermissionAndOnline(@Param("directiveIds") String directiveIds,@Param("employeeIds") String employeeIds,@Param("startTime") Date startTime); - Orders getEmpOrderly(@Param("customerId") String customerId); - List getPermissionEmps(@Param("directiveIds") String directiveIds); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java deleted file mode 100644 index d8051cf..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nu.modules.biz.care.order.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.order.entity.Orders; -import com.nu.modules.biz.care.order.entity.OrdersSub; -import java.util.List; - -/** - * @Description: 服务指令工单子表 - * @Author: caolei - * @Date: 2025-11-18 - * @Version: V1.0 - */ -public interface OrdersSubMapper extends BaseMapper { - List queryDataPoolSubList(Orders orders); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml index 5d86511..c576867 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml @@ -1,8 +1,8 @@ - + - select a.id as poolId, a.biz_id as bizId, @@ -37,7 +37,7 @@ order by a.start_time,orderEmp,a.nu_id - select distinct a.id as employeeId, @@ -93,13 +93,13 @@ - select orderly as employeeIds from nu_biz_elder_info where id = #{customerId} - select a.id as employeeId,count(*) as ownCn from nu_biz_employees_info a inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersSubMapper.xml similarity index 93% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersSubMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersSubMapper.xml index 9cd03e6..e144403 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersSubMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersSubMapper.xml @@ -1,8 +1,8 @@ - + - select id as poolSubId, nu_id as nuId, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersService.java similarity index 70% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersService.java index df1277d..eee9f01 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersService.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.care.order.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.order.entity.Orders; +import com.nu.modules.biz.care.order.entity.CareOrders; import org.jeecg.common.api.vo.Result; /** @@ -10,6 +10,6 @@ import org.jeecg.common.api.vo.Result; * @Date: 2025-11-18 * @Version: V1.0 */ -public interface IOrdersService extends IService { +public interface ICareOrdersService extends IService { Result generateOrdersBatch(); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersSubService.java new file mode 100644 index 0000000..9ba2d09 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/ICareOrdersSubService.java @@ -0,0 +1,16 @@ +package com.nu.modules.biz.care.order.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.order.entity.CareOrders; +import com.nu.modules.biz.care.order.entity.CareOrdersSub; +import java.util.List; + +/** + * @Description: 服务指令工单子表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +public interface ICareOrdersSubService extends IService { + List queryDataPoolSubList(CareOrders orders); +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java deleted file mode 100644 index 24103ed..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.nu.modules.biz.care.order.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.order.entity.Orders; -import com.nu.modules.biz.care.order.entity.OrdersSub; -import java.util.List; - -/** - * @Description: 服务指令工单子表 - * @Author: caolei - * @Date: 2025-11-18 - * @Version: V1.0 - */ -public interface IOrdersSubService extends IService { - List queryDataPoolSubList(Orders orders); -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java similarity index 77% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java index a9c9aa1..21cc63c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java @@ -1,11 +1,11 @@ package com.nu.modules.biz.care.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.care.order.entity.Orders; -import com.nu.modules.biz.care.order.entity.OrdersSub; -import com.nu.modules.biz.care.order.mapper.OrdersMapper; -import com.nu.modules.biz.care.order.service.IOrdersService; -import com.nu.modules.biz.care.order.service.IOrdersSubService; +import com.nu.modules.biz.care.order.entity.CareOrders; +import com.nu.modules.biz.care.order.entity.CareOrdersSub; +import com.nu.modules.biz.care.order.mapper.CareOrdersMapper; +import com.nu.modules.biz.care.order.service.ICareOrdersService; +import com.nu.modules.biz.care.order.service.ICareOrdersSubService; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; @@ -21,17 +21,17 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class OrdersServiceImpl extends ServiceImpl implements IOrdersService { +public class CareOrdersServiceImpl extends ServiceImpl implements ICareOrdersService { @Autowired - IOrdersSubService ordersSubService; + ICareOrdersSubService ordersSubService; /** * 获取在线，有指令权限的员工，并获取员工的接单上限、收益、服务时长、单次 * @param directiveId * @return */ - private List getEmpPermissionAndOnline(String directiveId, String employeeIds, Date startTime){ + private List getEmpPermissionAndOnline(String directiveId, String employeeIds, Date startTime){ return baseMapper.getEmpPermissionAndOnline(directiveId,employeeIds,startTime); } @@ -42,7 +42,7 @@ public class OrdersServiceImpl extends ServiceImpl impleme */ private Map getEmpOrderly(String customerId){ Map map = null; - Orders orders = baseMapper.getEmpOrderly(customerId); + CareOrders orders = baseMapper.getEmpOrderly(customerId); if(orders!=null){ String empIds = orders.getEmployeeIds(); if(empIds!=null&&!empIds.equals("")){ @@ -64,9 +64,9 @@ public class OrdersServiceImpl extends ServiceImpl impleme */ @Override public Result generateOrdersBatch(){ - List ordersList = baseMapper.queryDataPoolList(null); + List ordersList = baseMapper.queryDataPoolList(null); for(int i=0;i impleme * 获取工单子表数据，并进行处理 * @param orders */ - private void generateOrdersSub(Orders orders){ + private void generateOrdersSub(CareOrders orders){ System.out.println("护理单元:"+orders.getNuId()+",服务时间"+orders.getStartTime()); - List ordersSubList = ordersSubService.queryDataPoolSubList(orders); + List ordersSubList = ordersSubService.queryDataPoolSubList(orders); if(orders.getIzPackage().equals("N")){ - OrdersSub ordersSub = ordersSubList.get(0); + CareOrdersSub ordersSub = ordersSubList.get(0); //获取满足条件的员工 - Orders employee = employeeScreening(ordersSub.getDirectiveId(),orders.getCustomerId(),null,orders.getStartTime()); + CareOrders employee = employeeScreening(ordersSub.getDirectiveId(),orders.getCustomerId(),null,orders.getStartTime()); if(employee!=null){ orders.setEmployeeId(employee.getEmployeeId()); orders.setEmployeeName(employee.getEmployeeName()); @@ -102,11 +102,11 @@ public class OrdersServiceImpl extends ServiceImpl impleme System.out.println(""); } }else{ - String directiveIds = ordersSubList.stream().map(OrdersSub::getDirectiveId).collect(Collectors.joining(",")); - List emps = baseMapper.getPermissionEmps(directiveIds);//获取服务标签中的员工和数量 + String directiveIds = ordersSubList.stream().map(CareOrdersSub::getDirectiveId).collect(Collectors.joining(",")); + List emps = baseMapper.getPermissionEmps(directiveIds);//获取服务标签中的员工和数量 emps.removeIf(data -> data.getOwnCn() < ordersSubList.size());//删除没有权限的数据 - String employeeIds = emps.stream().map(Orders::getEmployeeId).collect(Collectors.joining(",")); - Orders employee = employeeScreening(directiveIds,orders.getCustomerId(),employeeIds,orders.getStartTime()); + String employeeIds = emps.stream().map(CareOrders::getEmployeeId).collect(Collectors.joining(",")); + CareOrders employee = employeeScreening(directiveIds,orders.getCustomerId(),employeeIds,orders.getStartTime()); if(employee!=null){ orders.setEmployeeId(employee.getEmployeeId()); orders.setEmployeeName(employee.getEmployeeName()); @@ -115,7 +115,7 @@ public class OrdersServiceImpl extends ServiceImpl impleme this.save(orders);//生成工单主表 for(int i=0;i impleme * 获取满足条件的员工 * @return */ - private Orders employeeScreening(String directiveIds,String customerId,String employeeIds,Date startTime){ + private CareOrders employeeScreening(String directiveIds, String customerId, String employeeIds, Date startTime){ - List empList = getEmpPermissionAndOnline(directiveIds,employeeIds,startTime); + List empList = getEmpPermissionAndOnline(directiveIds,employeeIds,startTime); Map orderlyMap = getEmpOrderly(customerId); if(empList.size()>0){ for(int i=0;i impleme //通过工单次数排序数据来设置优先级 sortByNumAndSetLevel(empList); for(int i=0;i impleme * 通过工单次数排序数据来设置优先级 * @param empList */ - public void sortByNumAndSetLevel(List empList) { + public void sortByNumAndSetLevel(List empList) { // 根据orderNum倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(Orders::getOrderNum).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(CareOrders::getOrderNum).reversed()) .collect(Collectors.toList()); // 为level字段顺序赋值1,2,3... @@ -224,10 +224,10 @@ public class OrdersServiceImpl extends ServiceImpl impleme * 通过总收益排序数据来设置优先级 * @param empList */ - public void sortByPriceAndSetLevel(List empList) { + public void sortByPriceAndSetLevel(List empList) { // 根据totalComPrice倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(Orders::getTotalComPrice).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(CareOrders::getTotalComPrice).reversed()) .collect(Collectors.toList()); // 为level字段顺序赋值1,2,3... @@ -246,10 +246,10 @@ public class OrdersServiceImpl extends ServiceImpl impleme * 通过服务时长排序数据来设置优先级 * @param empList */ - public void sortByDurationAndSetLevel(List empList) { + public void sortByDurationAndSetLevel(List empList) { // 根据totalDuration倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(Orders::getTotalDuration).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(CareOrders::getTotalDuration).reversed()) .collect(Collectors.toList()); // 为level字段顺序赋值1,2,3... @@ -268,11 +268,11 @@ public class OrdersServiceImpl extends ServiceImpl impleme * 通过最后一次接收派单时间排序数据来设置优先级 * @param empList */ - public void sortByMaxTimeAndSetLevel(List empList) { + public void sortByMaxTimeAndSetLevel(List empList) { // 根据maxTime倒序排序，并为level顺序赋值 - List sortedEmployees = empList.stream() + List sortedEmployees = empList.stream() .sorted(Comparator.comparing( - Orders::getMaxTime, + CareOrders::getMaxTime, Comparator.nullsLast(Comparator.reverseOrder()) )) .collect(Collectors.toList()); @@ -293,7 +293,7 @@ public class OrdersServiceImpl extends ServiceImpl impleme * 按优先级排序数据 * @param empList */ - public void sortByLevel(List empList) { + public void sortByLevel(List empList) { for (int i = 0; i < empList.size(); i++) { //工单超出接单上限，降4N级 if(empList.get(i).getOwnCn()>=empList.get(i).getOrderCap()){ @@ -302,8 +302,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme } } //为level顺序 - List sortedEmployees = empList.stream() - .sorted(Comparator.comparing(Orders::getLevel).reversed()) + List sortedEmployees = empList.stream() + .sorted(Comparator.comparing(CareOrders::getLevel).reversed()) .collect(Collectors.toList()); // 如果需要返回新列表，可以返回sortedEmployees diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersSubServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersSubServiceImpl.java new file mode 100644 index 0000000..57d363e --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersSubServiceImpl.java @@ -0,0 +1,26 @@ +package com.nu.modules.biz.care.order.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.biz.care.order.entity.CareOrders; +import com.nu.modules.biz.care.order.entity.CareOrdersSub; +import com.nu.modules.biz.care.order.mapper.CareOrdersSubMapper; +import com.nu.modules.biz.care.order.service.ICareOrdersSubService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import java.util.List; + +/** + * @Description: 服务指令工单子表 + * @Author: caolei + * @Date: 2025-11-18 + * @Version: V1.0 + */ +@Service +@Slf4j +public class CareOrdersSubServiceImpl extends ServiceImpl implements ICareOrdersSubService { + + @Override + public List queryDataPoolSubList(CareOrders orders){ + return baseMapper.queryDataPoolSubList(orders); + } +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersSubServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersSubServiceImpl.java deleted file mode 100644 index 1731fa0..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersSubServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.nu.modules.biz.care.order.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.care.order.entity.Orders; -import com.nu.modules.biz.care.order.entity.OrdersSub; -import com.nu.modules.biz.care.order.mapper.OrdersSubMapper; -import com.nu.modules.biz.care.order.service.IOrdersSubService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import java.util.List; - -/** - * @Description: 服务指令工单子表 - * @Author: caolei - * @Date: 2025-11-18 - * @Version: V1.0 - */ -@Service -@Slf4j -public class OrdersSubServiceImpl extends ServiceImpl implements IOrdersSubService { - - @Override - public List queryDataPoolSubList(Orders orders){ - return baseMapper.queryDataPoolSubList(orders); - } -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServer.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerCareServer.java similarity index 93% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServer.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerCareServer.java index 769b5df..fb4a535 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServer.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerCareServer.java @@ -23,7 +23,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令") -public class PlanBizNuCustomerServer implements Serializable { +public class PlanBizNuCustomerCareServer implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @@ -114,15 +114,15 @@ public class PlanBizNuCustomerServer implements Serializable { /**服务指令列表**/ @TableField(exist = false) - private List serverList; + private List serverList; /**即时服务指令列表**/ @TableField(exist = false) - private List instantList; + private List instantList; /**长者标签列表**/ @TableField(exist = false) private List tagList; /**服务包中的服务列表**/ @TableField(exist = false) - private List directivesList; + private List directivesList; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerCareServerInstant.java similarity index 96% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerCareServerInstant.java index 3996433..f00d8ec 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerCareServerInstant.java @@ -25,8 +25,8 @@ import java.util.Date; @TableName("nu_biz_nu_customer_care_server_instant") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令") -public class PlanBizNuCustomerServerInstant implements Serializable { +@ApiModel(value="nu_biz_nu_customer_care_server_instant对象", description="护理单元客户配置服务指令即时指令") +public class PlanBizNuCustomerCareServerInstant implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java index b322982..e93cdb6 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java @@ -54,6 +54,6 @@ public class PlanDirectivePackage implements Serializable { // 结束时间 private String endTimeStr; // 服务指令集合 - private List directivesList; + private List directivesList; } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerCareServerInstantMapper.java similarity index 63% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerCareServerInstantMapper.java index 710686a..0556147 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerCareServerInstantMapper.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.care.plan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServerInstant; import org.apache.ibatis.annotations.Param; /** @@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Param; * @Date: 2025-10-13 * @Version: V1.0 */ -public interface PlanBizNuCustomerServerInstantMapper extends BaseMapper { +public interface PlanBizNuCustomerCareServerInstantMapper extends BaseMapper { int deleteByIdPhysic(@Param("id") String id); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerCareServerMapper.java similarity index 55% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerCareServerMapper.java index e263dbf..1ef604c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerCareServerMapper.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.care.plan.mapper; import java.util.List; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer; import com.nu.modules.biz.care.plan.entity.PlanDirectivePackage; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -12,13 +12,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2025-03-31 * @Version: V1.0 */ -public interface PlanBizNuCustomerServerMapper extends BaseMapper { +public interface PlanBizNuCustomerCareServerMapper extends BaseMapper { - List getGroupPositioning(PlanBizNuCustomerServer planBizNuCustomerServer); + List getGroupPositioning(PlanBizNuCustomerCareServer planBizNuCustomerServer); List getNcPackagelist(@Param("params") PlanDirectivePackage directivePackageDto); - List getNcDirectiveList(@Param("params") PlanBizNuCustomerServer planBizNuCustomerServer); + List getNcDirectiveList(@Param("params") PlanBizNuCustomerCareServer planBizNuCustomerServer); int deleteByIdPhysic(@Param("id") String id); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerInstantMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerCareServerInstantMapper.xml similarity index 91% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerInstantMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerCareServerInstantMapper.xml index f8a3562..2c91a22 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerInstantMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerCareServerInstantMapper.xml @@ -1,6 +1,6 @@ - + delete from nu_biz_nu_customer_care_server_instant where id = #{id} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerCareServerMapper.xml similarity index 92% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerCareServerMapper.xml index fbe7827..0eec69c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerCareServerMapper.xml @@ -1,11 +1,11 @@ - + delete from nu_biz_nu_customer_care_server where id = #{id} - @@ -20,7 +20,7 @@ and iz_enabled = 'Y' - select a.package_id,a.cycle_type,a.cycle_value,b.*, c.category_name AS category_name, d.type_name AS type_name, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerInstantService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerInstantService.java similarity index 59% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerInstantService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerInstantService.java index c087eab..84659e1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerInstantService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerInstantService.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.care.plan.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServerInstant; /** * @Description: 护理单元客户配置服务指令即时指令 @@ -9,7 +9,7 @@ import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant; * @Date: 2025-10-13 * @Version: V1.0 */ -public interface IPlanBizNuCustomerServerInstantService extends IService { +public interface IPlanBizNuCustomerCareServerInstantService extends IService { int deleteByIdPhysic(String id); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerService.java similarity index 57% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerService.java index 656e595..ad8ece3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerCareServerService.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.care.plan.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer; /** * @Description: 护理单元客户配置服务指令 @@ -9,6 +9,6 @@ import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; * @Date: 2025-03-31 * @Version: V1.0 */ -public interface IPlanBizNuCustomerServerService extends IService { +public interface IPlanBizNuCustomerCareServerService extends IService { } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerCareServerInstantServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerCareServerInstantServiceImpl.java new file mode 100644 index 0000000..13094ef --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerCareServerInstantServiceImpl.java @@ -0,0 +1,22 @@ +package com.nu.modules.biz.care.plan.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServerInstant; +import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerCareServerInstantMapper; +import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerCareServerInstantService; +import org.springframework.stereotype.Service; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +@Service +public class PlanBizNuCustomerCareServerInstantServiceImpl extends ServiceImpl implements IPlanBizNuCustomerCareServerInstantService { + + @Override + public int deleteByIdPhysic(String id) { + return baseMapper.deleteByIdPhysic(id); + } +} 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/PlanBizNuCustomerCareServerServiceImpl.java similarity index 79% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerCareServerServiceImpl.java index 4712ac8..14e1cf8 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/PlanBizNuCustomerCareServerServiceImpl.java @@ -9,21 +9,21 @@ 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.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.common.entity.BizConfigServiceCategory; +import com.nu.modules.biz.common.entity.BizConfigServiceDirective; +import com.nu.modules.biz.common.entity.BizConfigServiceType; +import com.nu.modules.biz.common.service.IBizConfigServiceCategoryService; +import com.nu.modules.biz.common.service.IBizConfigServiceDirectiveService; +import com.nu.modules.biz.common.service.IBizConfigServiceTypeService; +import com.nu.modules.biz.care.datapool.service.impl.CareDataPoolServiceImpl; import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServer; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerCareServerInstant; import com.nu.modules.biz.care.plan.entity.PlanDirectivePackage; -import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerMapper; +import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerCareServerMapper; import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerElderTagService; -import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerServerInstantService; -import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerServerService; +import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerCareServerInstantService; +import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerCareServerService; import com.nu.modules.care.api.ICareDirectivePlanApi; import com.nu.modules.sysconfig.ISysConfigApi; import org.springframework.beans.factory.annotation.Autowired; @@ -39,22 +39,22 @@ import java.util.*; * @Version: V1.0 */ @Service -public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl implements IPlanBizNuCustomerServerService, ICareDirectivePlanApi { +public class PlanBizNuCustomerCareServerServiceImpl extends ServiceImpl implements IPlanBizNuCustomerCareServerService, ICareDirectivePlanApi { @Autowired - private IConfigServiceCategoryService careConfigServiceCategoryService; + private IBizConfigServiceCategoryService careConfigServiceCategoryService; @Autowired - private IConfigServiceTypeService careConfigServiceTypeService; + private IBizConfigServiceTypeService careConfigServiceTypeService; @Autowired - private IConfigServiceDirectiveService careConfigServiceDirectiveService; + private IBizConfigServiceDirectiveService careConfigServiceDirectiveService; @Autowired - private IPlanBizNuCustomerServerInstantService planBizNuCustomerServerInstantService; + private IPlanBizNuCustomerCareServerInstantService planBizNuCustomerServerInstantService; @Autowired private IPlanBizNuCustomerElderTagService planBizNuCustomerElderTagService; @Autowired private ISysConfigApi sysConfigApi; @Autowired - private DataPoolServiceImpl dataPoolServiceImpl; + private CareDataPoolServiceImpl dataPoolServiceImpl; private String serverNetUrl; @@ -62,18 +62,18 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl getPlanList(CareDirectiveEntity careDirectiveEntity) { Map resMap = new HashMap<>(); //服务指令计划 - QueryWrapper PlanBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); + QueryWrapper PlanBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getNuId()), "nu_id", careDirectiveEntity.getNuId()); PlanBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getCustomerId()), "customer_id", careDirectiveEntity.getCustomerId()); - List groupList = baseMapper.selectList(PlanBizNuCustomerServerQueryWrapper); - for (PlanBizNuCustomerServer par : groupList) { + List groupList = baseMapper.selectList(PlanBizNuCustomerServerQueryWrapper); + for (PlanBizNuCustomerCareServer par : groupList) { if (par.getIzPackage().equals("Y")) { String directiveId = par.getDirectiveId(); if (directiveId != null && !directiveId.equals("")) { - PlanBizNuCustomerServer packageDirective = new PlanBizNuCustomerServer(); + PlanBizNuCustomerCareServer packageDirective = new PlanBizNuCustomerCareServer(); packageDirective.setPackageId(directiveId); - List pdList = baseMapper.getNcDirectiveList(packageDirective); - for (PlanBizNuCustomerServer pd : pdList) { + List pdList = baseMapper.getNcDirectiveList(packageDirective); + for (PlanBizNuCustomerCareServer pd : pdList) { getNetImages(pd); } par.setDirectivesList(pdList); @@ -83,11 +83,11 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl instantQueryWrapper = new QueryWrapper<>(); + QueryWrapper instantQueryWrapper = new QueryWrapper<>(); instantQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getNuId()), "nu_id", careDirectiveEntity.getNuId()); instantQueryWrapper.eq(StringUtils.isNotEmpty(careDirectiveEntity.getCustomerId()), "customer_id", careDirectiveEntity.getCustomerId()); instantQueryWrapper.orderByDesc("create_time"); - List instantList = planBizNuCustomerServerInstantService.list(instantQueryWrapper); + List instantList = planBizNuCustomerServerInstantService.list(instantQueryWrapper); // for (PlanBizNuCustomerServerInstant pari : instantList) { // getInstantNetImages(pari); // } @@ -138,7 +138,7 @@ public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl list = baseMapper.getNcPackagelist(directivePackage); List mainList = BeanUtil.copyToList(list,CareDirectivePackageEntity.class); - List directiveList = baseMapper.getNcDirectiveList(new PlanBizNuCustomerServer()); + List directiveList = baseMapper.getNcDirectiveList(new PlanBizNuCustomerCareServer()); for (CareDirectivePackageEntity et : mainList) { List directivesList = new ArrayList<>(); - for (PlanBizNuCustomerServer etd : directiveList) { + for (PlanBizNuCustomerCareServer etd : directiveList) { if (etd.getPackageId().equals(et.getId())) { getNetImages(etd); CareDirectiveEntity careDirectiveEntity = new CareDirectiveEntity(); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerInstantServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerInstantServiceImpl.java deleted file mode 100644 index 31995b4..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerInstantServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.nu.modules.biz.care.plan.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant; -import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerInstantMapper; -import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerServerInstantService; -import org.springframework.stereotype.Service; - -/** - * @Description: 护理单元客户配置服务指令即时指令 - * @Author: caolei - * @Date: 2025-10-13 - * @Version: V1.0 - */ -@Service -public class PlanBizNuCustomerServerInstantServiceImpl extends ServiceImpl implements IPlanBizNuCustomerServerInstantService { - - @Override - public int deleteByIdPhysic(String id) { - return baseMapper.deleteByIdPhysic(id); - } -} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigInstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigInstructionTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java index fd8a400..a01e2dc 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigInstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigInstructionTag.java @@ -26,7 +26,7 @@ import java.util.Date; @TableName("nu_config_service_instruction_tag") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class ConfigInstructionTag implements Serializable { +public class BizConfigInstructionTag implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceCategory.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceCategory.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceCategory.java index 37183e1..f110134 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceCategory.java @@ -25,7 +25,7 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_category") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class ConfigServiceCategory implements Serializable { +public class BizConfigServiceCategory implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceDirective.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java index c2058e1..9c79d7e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java @@ -23,7 +23,7 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_directive") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class ConfigServiceDirective implements Serializable { +public class BizConfigServiceDirective implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceType.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceType.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceType.java index f548d09..91c7997 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/ConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceType.java @@ -25,7 +25,7 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class ConfigServiceType implements Serializable { +public class BizConfigServiceType implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigInstructionTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigInstructionTagMapper.java similarity index 55% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigInstructionTagMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigInstructionTagMapper.java index 7f65148..ed23146 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigInstructionTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigInstructionTagMapper.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.common.entity.ConfigInstructionTag; +import com.nu.modules.biz.common.entity.BizConfigInstructionTag; /** * @Description: 分类标签 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigInstructionTag; * @Date: 2025-10-11 * @Version: V1.0 */ -public interface ConfigInstructionTagMapper extends BaseMapper { +public interface BizConfigInstructionTagMapper extends BaseMapper { } 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/BizConfigServiceCategoryMapper.java similarity index 55% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceCategoryMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigServiceCategoryMapper.java index 71cc719..b49ccd1 100644 --- 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/BizConfigServiceCategoryMapper.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.common.entity.ConfigServiceCategory; +import com.nu.modules.biz.common.entity.BizConfigServiceCategory; /** * @Description: 服务类别 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigServiceCategory; * @Date: 2025-03-28 * @Version: V1.0 */ -public interface ConfigServiceCategoryMapper extends BaseMapper { +public interface BizConfigServiceCategoryMapper 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/BizConfigServiceDirectiveMapper.java similarity index 55% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceDirectiveMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigServiceDirectiveMapper.java index c57a49d..fc731ba 100644 --- 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/BizConfigServiceDirectiveMapper.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.common.entity.ConfigServiceDirective; +import com.nu.modules.biz.common.entity.BizConfigServiceDirective; /** * @Description: 服务指令 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigServiceDirective; * @Date: 2025-03-28 * @Version: V1.0 */ -public interface ConfigServiceDirectiveMapper extends BaseMapper { +public interface BizConfigServiceDirectiveMapper 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/BizConfigServiceTypeMapper.java similarity index 57% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/ConfigServiceTypeMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/BizConfigServiceTypeMapper.java index 7e21970..320cfd0 100644 --- 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/BizConfigServiceTypeMapper.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.biz.common.entity.ConfigServiceType; +import com.nu.modules.biz.common.entity.BizConfigServiceType; /** * @Description: 服务类型 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigServiceType; * @Date: 2025-03-28 * @Version: V1.0 */ -public interface ConfigServiceTypeMapper extends BaseMapper { +public interface BizConfigServiceTypeMapper extends BaseMapper { } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigInstructionTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigInstructionTagMapper.xml similarity index 65% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigInstructionTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigInstructionTagMapper.xml index d58674c..a758b5e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigInstructionTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigInstructionTagMapper.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/mapper/xml/ConfigServiceCategoryMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceCategoryMapper.xml similarity index 64% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceCategoryMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceCategoryMapper.xml index fd83496..c9df94c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceCategoryMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceCategoryMapper.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/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml similarity index 93% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceDirectiveMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.xml index a9d0865..2f1b20b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceDirectiveMapper.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/common/mapper/xml/ConfigServiceTypeMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceTypeMapper.xml similarity index 65% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceTypeMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceTypeMapper.xml index 71409ff..10e0dfb 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/ConfigServiceTypeMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/mapper/xml/BizConfigServiceTypeMapper.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/IBizConfigInstructionTagService.java similarity index 56% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigInstructionTagService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigInstructionTagService.java index 457f1d2..63ca8d0 100644 --- 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/IBizConfigInstructionTagService.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.common.entity.ConfigInstructionTag; +import com.nu.modules.biz.common.entity.BizConfigInstructionTag; /** * @Description: 分类标签 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigInstructionTag; * @Date: 2025-10-11 * @Version: V1.0 */ -public interface IConfigInstructionTagService extends IService { +public interface IBizConfigInstructionTagService 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/IBizConfigServiceCategoryService.java similarity index 56% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceCategoryService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigServiceCategoryService.java index fff93c1..7df303b 100644 --- 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/IBizConfigServiceCategoryService.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.common.entity.ConfigServiceCategory; +import com.nu.modules.biz.common.entity.BizConfigServiceCategory; /** * @Description: 服务类别 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigServiceCategory; * @Date: 2025-03-28 * @Version: V1.0 */ -public interface IConfigServiceCategoryService extends IService { +public interface IBizConfigServiceCategoryService 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/IBizConfigServiceDirectiveService.java similarity index 55% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceDirectiveService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigServiceDirectiveService.java index 2ef07db..79b2fdb 100644 --- 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/IBizConfigServiceDirectiveService.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.common.entity.ConfigServiceDirective; +import com.nu.modules.biz.common.entity.BizConfigServiceDirective; /** * @Description: 服务指令 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigServiceDirective; * @Date: 2025-03-28 * @Version: V1.0 */ -public interface IConfigServiceDirectiveService extends IService { +public interface IBizConfigServiceDirectiveService 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/IBizConfigServiceTypeService.java similarity index 58% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IConfigServiceTypeService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/IBizConfigServiceTypeService.java index 1b3a19b..3c41260 100644 --- 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/IBizConfigServiceTypeService.java @@ -1,7 +1,7 @@ package com.nu.modules.biz.common.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.biz.common.entity.ConfigServiceType; +import com.nu.modules.biz.common.entity.BizConfigServiceType; /** * @Description: 服务类型 @@ -9,6 +9,6 @@ import com.nu.modules.biz.common.entity.ConfigServiceType; * @Date: 2025-03-28 * @Version: V1.0 */ -public interface IConfigServiceTypeService extends IService { +public interface IBizConfigServiceTypeService extends IService { } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigInstructionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigInstructionTagServiceImpl.java new file mode 100644 index 0000000..d8df17d --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigInstructionTagServiceImpl.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.BizConfigInstructionTag; +import com.nu.modules.biz.common.mapper.BizConfigInstructionTagMapper; +import com.nu.modules.biz.common.service.IBizConfigInstructionTagService; +import org.springframework.stereotype.Service; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +@Service +public class BizConfigInstructionTagServiceImpl extends ServiceImpl implements IBizConfigInstructionTagService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceCategoryServiceImpl.java similarity index 82% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceCategoryServiceImpl.java index 9d681f1..c27034c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceCategoryServiceImpl.java @@ -3,15 +3,15 @@ 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.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.biz.common.entity.BizConfigServiceCategory; +import com.nu.modules.biz.common.entity.BizConfigServiceDirective; +import com.nu.modules.biz.common.entity.BizConfigServiceType; +import com.nu.modules.biz.common.entity.BizConfigInstructionTag; +import com.nu.modules.biz.common.mapper.BizConfigServiceCategoryMapper; +import com.nu.modules.biz.common.service.IBizConfigServiceCategoryService; +import com.nu.modules.biz.common.service.IBizConfigServiceDirectiveService; +import com.nu.modules.biz.common.service.IBizConfigServiceTypeService; +import com.nu.modules.biz.common.service.IBizConfigInstructionTagService; import com.nu.modules.care.api.IDirectiveConfigApi; import com.nu.modules.sysconfig.ISysConfigApi; import org.apache.commons.lang3.StringUtils; @@ -30,14 +30,14 @@ import java.util.Map; * @Version: V1.0 */ @Service -public class ConfigServiceCategoryServiceImpl extends ServiceImpl implements IConfigServiceCategoryService, IDirectiveConfigApi { +public class BizConfigServiceCategoryServiceImpl extends ServiceImpl implements IBizConfigServiceCategoryService, IDirectiveConfigApi { @Autowired - private IConfigInstructionTagService instructionTagService; + private IBizConfigInstructionTagService instructionTagService; @Autowired - private IConfigServiceTypeService configServiceTypeService; + private IBizConfigServiceTypeService configServiceTypeService; @Autowired - private IConfigServiceDirectiveService configServiceDirectiveService; + private IBizConfigServiceDirectiveService configServiceDirectiveService; @Autowired private ISysConfigApi sysConfigApi; @@ -47,38 +47,38 @@ public class ConfigServiceCategoryServiceImpl extends ServiceImpl instructionTagQueryWrapper = new QueryWrapper<>(); + QueryWrapper instructionTagQueryWrapper = new QueryWrapper<>(); instructionTagQueryWrapper.eq("iz_enabled", "Y"); instructionTagQueryWrapper.eq("del_flag", "0"); instructionTagQueryWrapper.eq("instruction_type", instructionType); - List instructionTagList = instructionTagService.list(instructionTagQueryWrapper); + List instructionTagList = instructionTagService.list(instructionTagQueryWrapper); Map tagMap = new HashMap(); - for (ConfigInstructionTag par : instructionTagList) { + for (BizConfigInstructionTag 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 (ConfigServiceType par : typeList) { + for (BizConfigServiceType par : typeList) { Map wllxMap = new HashMap(); List> directiceMapList = new ArrayList>(); - for (ConfigServiceDirective directicePar : directiveList) { + for (BizConfigServiceDirective directicePar : directiveList) { if (StringUtils.equals(directicePar.getTypeId(), par.getId())) { Map directiceMap = new HashMap(); directiceMap.put("id", directicePar.getId()); @@ -161,7 +161,7 @@ public class ConfigServiceCategoryServiceImpl extends ServiceImpl> treeList = new ArrayList<>(); int index = 0; - for (ConfigServiceCategory par : categoryList) { + for (BizConfigServiceCategory 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/BizConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceDirectiveServiceImpl.java new file mode 100644 index 0000000..9bc0ce6 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceDirectiveServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.biz.common.service.impl; + +import com.nu.modules.biz.common.entity.BizConfigServiceDirective; +import com.nu.modules.biz.common.mapper.BizConfigServiceDirectiveMapper; +import com.nu.modules.biz.common.service.IBizConfigServiceDirectiveService; +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 BizConfigServiceDirectiveServiceImpl extends ServiceImpl implements IBizConfigServiceDirectiveService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceTypeServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceTypeServiceImpl.java new file mode 100644 index 0000000..2a111b6 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/BizConfigServiceTypeServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.biz.common.service.impl; + +import com.nu.modules.biz.common.entity.BizConfigServiceType; +import com.nu.modules.biz.common.mapper.BizConfigServiceTypeMapper; +import com.nu.modules.biz.common.service.IBizConfigServiceTypeService; +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 BizConfigServiceTypeServiceImpl extends ServiceImpl implements IBizConfigServiceTypeService { + +} 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 deleted file mode 100644 index dfc4c0c..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigInstructionTagServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -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/common/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceDirectiveServiceImpl.java deleted file mode 100644 index 11f63a3..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceDirectiveServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 35e1bcb..0000000 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/service/impl/ConfigServiceTypeServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -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 { - -}