diff --git a/nursing-unit-api/pom.xml b/nursing-unit-api/pom.xml index b7944179..4d76aca5 100644 --- a/nursing-unit-api/pom.xml +++ b/nursing-unit-api/pom.xml @@ -63,5 +63,11 @@ 2.0.0 compile + + com.nursingunit.boot + nu-services-local-api + 2.0.0 + compile + diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java deleted file mode 100644 index 78cdd83f..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/controller/NuBizNuCustomerServerController.java +++ /dev/null @@ -1,263 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.controller; - -import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; -import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - - /** - * @Description: 护理单元客户配置服务指令 - * @Author: yangjun - * @Date: 2025-03-31 - * @Version: V1.0 - */ -@Api(tags="护理单元客户配置服务指令") -@RestController -@RequestMapping("/nuIpadApi/nuBizNuCustomerServer") -@Slf4j -public class NuBizNuCustomerServerController extends JeecgController { - @Autowired - private INuBizNuCustomerServerService nuBizNuCustomerServerService; - - /** - * PAD端获取服务指令计划表格数据 - * - * @param nuBizNuCustomerServer - * @return - */ - //@AutoLog(value = "护理单元客户配置服务指令-分页列表查询") - @ApiOperation(value="护理单元客户配置服务指令-分页列表查询", notes="护理单元客户配置服务指令-分页列表查询") - @GetMapping(value = "/getNclist") - public Result> getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) { - Map pageList = nuBizNuCustomerServerService.getNclist(nuBizNuCustomerServer); - return Result.OK(pageList); - } - - /** - * 添加 - * - * @param nuBizNuCustomerServer - * @return - */ - @AutoLog(value = "护理单元客户配置服务指令-添加") - @ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加") -// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add") - @PostMapping(value = "/addNuCustomerServer") - public Result addNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) { - NuBizNuCustomerServer retText = nuBizNuCustomerServerService.addNuCustomerServer(nuBizNuCustomerServer); - return Result.OK(retText); - } - - /** - * 编辑 - * - * @param nuBizNuCustomerServer - * @return - */ - @AutoLog(value = "护理单元客户配置服务指令-编辑") - @ApiOperation(value="护理单元客户配置服务指令-编辑", notes="护理单元客户配置服务指令-编辑") -// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:edit") - @RequestMapping(value = "/editNuCustomerServer", method = {RequestMethod.PUT,RequestMethod.POST}) - public Result editNuCustomerServer(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) { - NuBizNuCustomerServer retJson = nuBizNuCustomerServerService.editNuCustomerServer(nuBizNuCustomerServer); - return Result.OK(retJson); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "护理单元客户配置服务指令-通过id删除") - @ApiOperation(value="护理单元客户配置服务指令-通过id删除", notes="护理单元客户配置服务指令-通过id删除") -// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:delete") - @DeleteMapping(value = "/deleteNuCustomerServer") - public Result delete(@RequestParam(name="id",required=true) String id) { - nuBizNuCustomerServerService.removeById(id); - return Result.OK("删除成功!"); - } - - - /** - * 通过id查询 - * - * @param id - * @return - */ - //@AutoLog(value = "护理单元客户配置服务指令-通过id查询") - @ApiOperation(value="护理单元客户配置服务指令-通过id查询", notes="护理单元客户配置服务指令-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - NuBizNuCustomerServer nuBizNuCustomerServer = nuBizNuCustomerServerService.getById(id); - if(nuBizNuCustomerServer==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(nuBizNuCustomerServer); - } - - /** - * PAD端保存服务指令计划表格数据 - * - * @param nuBizNuCustomerServer - * @return - */ - @AutoLog(value = "护理单元客户配置服务指令-添加") - @ApiOperation(value="护理单元客户配置服务指令-添加", notes="护理单元客户配置服务指令-添加") -// @RequiresPermissions("NuBizNuCustomerServer:nu_biz_nu_customer_server:add") - @PostMapping(value = "/addBatch") - public Result addBatch(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) { - nuBizNuCustomerServerService.addBatch(nuBizNuCustomerServer); - return Result.OK("操作成功"); - } - - - - /** - * 获取指令包集合数据 - * - * @param DirectivePackageDto - * @return - */ - @ApiOperation(value="获取指令包集合数据", notes="获取指令包集合数据") - @GetMapping(value = "/getNcPackagelist") - public Result> getNcPackagelist(DirectivePackageDto DirectivePackageDto) { - List pageList = nuBizNuCustomerServerService.getNcPackagelist(DirectivePackageDto); - return Result.OK(pageList); - } - - /** - * PAD端编排护理流程-新增服务指令 - * - * @param nuBizNuCustomerServer - * @return - */ - @AutoLog(value = "编排护理流程-新增服务指令") - @ApiOperation(value="编排护理流程-新增服务指令", notes="编排护理流程-新增服务指令") - @PostMapping(value = "/addDirective") - public Result addDirective(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) { - return Result.OK(nuBizNuCustomerServerService.addDirective(nuBizNuCustomerServer)); - } - - /** - * PAD端编排护理流程-新增即时服务指令 - * - * @param customerServerInstant - * @return - */ - @AutoLog(value = "编排护理流程-新增即时服务指令") - @ApiOperation(value="编排护理流程-新增即时服务指令", notes="编排护理流程-新增即时服务指令") - @PostMapping(value = "/addInstant") - public Result addDirective(@RequestBody NuBizNuCustomerServerInstant customerServerInstant) { - return Result.OK(nuBizNuCustomerServerService.addInstant(customerServerInstant)); - } - - /** - * PAD端编排护理流程-新增情绪/体型标签 - * - * @param customerElderTag - * @return - */ - @AutoLog(value = "编排护理流程-新增情绪/体型标签") - @ApiOperation(value="编排护理流程-新增情绪/体型标签", notes="编排护理流程-新增情绪/体型标签") - @PostMapping(value = "/addElderTag") - public Result addElderTag(@RequestBody NuBizNuCustomerElderTag customerElderTag) { - return Result.OK(nuBizNuCustomerServerService.addElderTag(customerElderTag)); - } - - /** - * PAD端编排护理流程-删除服务指令 - * - * @param nuBizNuCustomerServer - * @return - */ - @AutoLog(value = "编排护理流程-删除服务指令") - @ApiOperation(value="编排护理流程-删除服务指令", notes="编排护理流程-删除服务指令") - @PostMapping(value = "/deleteDirective") - public Result deleteDirective(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) { - nuBizNuCustomerServerService.deleteDirective(nuBizNuCustomerServer); - return Result.OK("操作成功"); - } - - /** - * PAD端编排护理流程-删除即时服务指令 - * - * @param customerServerInstant - * @return - */ - @AutoLog(value = "编排护理流程-删除即时服务指令") - @ApiOperation(value="编排护理流程-删除即时服务指令", notes="编排护理流程-删除即时服务指令") - @PostMapping(value = "/deleteInstant") - public Result deleteInstant(@RequestBody NuBizNuCustomerServerInstant customerServerInstant) { - nuBizNuCustomerServerService.deleteInstant(customerServerInstant); - return Result.OK("操作成功"); - } - - /** - * PAD端编排护理流程-删除情绪/体型标签 - * - * @param customerElderTag - * @return - */ - @AutoLog(value = "编排护理流程-删除情绪/体型标签") - @ApiOperation(value="编排护理流程-删除情绪/体型标签", notes="编排护理流程-删除情绪/体型标签") - @PostMapping(value = "/deleteElderTag") - public Result deleteElderTag(@RequestBody NuBizNuCustomerElderTag customerElderTag) { - nuBizNuCustomerServerService.deleteElderTag(customerElderTag); - return Result.OK("操作成功"); - } - - /** - * PAD端编排护理流程-修改服务指令 - * - * @param nuBizNuCustomerServer - * @return - */ - @AutoLog(value = "编排护理流程-修改服务指令") - @ApiOperation(value="编排护理流程-修改服务指令", notes="编排护理流程-修改服务指令") - @PostMapping(value = "/editDirective") - public Result editDirective(@RequestBody NuBizNuCustomerServer nuBizNuCustomerServer) { - nuBizNuCustomerServerService.editDirective(nuBizNuCustomerServer); - return Result.OK("操作成功"); - } - - /** - * PAD端编排护理流程-修改即时服务指令 - * - * @param customerServerInstant - * @return - */ - @AutoLog(value = "编排护理流程-修改即时服务指令") - @ApiOperation(value="编排护理流程修改除即时服务指令", notes="编排护理流程-修改即时服务指令") - @PostMapping(value = "/editInstant") - public Result editInstant(@RequestBody NuBizNuCustomerServerInstant customerServerInstant) { - nuBizNuCustomerServerService.editInstant(customerServerInstant); - return Result.OK("操作成功"); - } - - /** - * PAD端编排护理流程-修改情绪/体型标签 - * - * @param customerElderTag - * @return - */ - @AutoLog(value = "编排护理流程-修改情绪/体型标签") - @ApiOperation(value="编排护理流程-修改情绪/体型标签", notes="编排护理流程-修改情绪/体型标签") - @PostMapping(value = "/editElderTag") - public Result editElderTag(@RequestBody NuBizNuCustomerElderTag customerElderTag) { - nuBizNuCustomerServerService.editElderTag(customerElderTag); - return Result.OK("操作成功"); - } -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java deleted file mode 100644 index 2bb29c1a..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerElderTagMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 护理单元客户配置长者标签 - * @Author: caolei - * @Date: 2025-10-13 - * @Version: V1.0 - */ -public interface NuBizNuCustomerElderTagMapper extends BaseMapper { - List getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag); - - int deleteByIdPhysic(@Param("id") String id); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java deleted file mode 100644 index c9ce7710..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.mapper; - -import java.util.List; - -import com.nu.modules.NuBizNuCustomerServer.entity.ConfigServiceDirectiveDto; -import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto; -import org.apache.ibatis.annotations.Param; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 护理单元客户配置服务指令 - * @Author: yangjun - * @Date: 2025-03-31 - * @Version: V1.0 - */ -public interface NuBizNuCustomerServerMapper extends BaseMapper { - - List getGroupPositioning(NuBizNuCustomerServer nuBizNuCustomerServer); - - List getNcPackagelist(@Param("params") DirectivePackageDto directivePackageDto); - - List getNcDirectiveList(@Param("params") NuBizNuCustomerServer nuBizNuCustomerServer); - - int deleteByIdPhysic(@Param("id") String id); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java deleted file mode 100644 index 493a126b..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerElderTagService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Description: 护理单元客户配置长者标签 - * @Author: caolei - * @Date: 2025-10-13 - * @Version: V1.0 - */ -public interface INuBizNuCustomerElderTagService extends IService { - List getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag); - - int deleteByIdPhysic(String id); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java deleted file mode 100644 index 7c2818f7..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerInstantService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; - -/** - * @Description: 护理单元客户配置服务指令即时指令 - * @Author: caolei - * @Date: 2025-10-13 - * @Version: V1.0 - */ -public interface INuBizNuCustomerServerInstantService extends IService { - - int deleteByIdPhysic(String id); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java deleted file mode 100644 index e44855bf..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/INuBizNuCustomerServerService.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.service; - -import com.nu.modules.NuBizNuCustomerServer.entity.DirectivePackageDto; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; - -import java.util.List; -import java.util.Map; - -/** - * @Description: 护理单元客户配置服务指令 - * @Author: yangjun - * @Date: 2025-03-31 - * @Version: V1.0 - */ -public interface INuBizNuCustomerServerService extends IService { - - Map getNclist(NuBizNuCustomerServer nuBizNuCustomerServer); - - NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer); - - NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer); - - void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer); - - List getNcPackagelist(DirectivePackageDto directivePackageDto); - - NuBizNuCustomerServer addDirective(NuBizNuCustomerServer nuBizNuCustomerServer); - - NuBizNuCustomerServerInstant addInstant(NuBizNuCustomerServerInstant customerServerInstant); - - NuBizNuCustomerElderTag addElderTag(NuBizNuCustomerElderTag customerElderTag); - - void deleteDirective(NuBizNuCustomerServer nuBizNuCustomerServer); - - void deleteInstant(NuBizNuCustomerServerInstant customerServerInstant); - - void deleteElderTag(NuBizNuCustomerElderTag customerElderTag); - - void editDirective(NuBizNuCustomerServer nuBizNuCustomerServer); - - void editInstant(NuBizNuCustomerServerInstant customerServerInstant); - - void editElderTag(NuBizNuCustomerElderTag customerElderTag); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java deleted file mode 100644 index 14143623..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerElderTagServiceImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerElderTag; -import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerElderTagMapper; -import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService; -import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @Description: 护理单元客户配置服务指令即时指令 - * @Author: caolei - * @Date: 2025-10-13 - * @Version: V1.0 - */ -@Service -public class NuBizNuCustomerElderTagServiceImpl extends ServiceImpl implements INuBizNuCustomerElderTagService { - public List getElderTags(NuBizNuCustomerElderTag nuBizNuCustomerElderTag){ - return baseMapper.getElderTags(nuBizNuCustomerElderTag); - } - - @Override - public int deleteByIdPhysic(String id) { - return baseMapper.deleteByIdPhysic(id); - } -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java deleted file mode 100644 index e1926e02..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerInstantServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; -import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerInstantMapper; -import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService; -import org.springframework.stereotype.Service; - -/** - * @Description: 护理单元客户配置服务指令即时指令 - * @Author: caolei - * @Date: 2025-10-13 - * @Version: V1.0 - */ -@Service -public class NuBizNuCustomerServerInstantServiceImpl extends ServiceImpl implements INuBizNuCustomerServerInstantService { - - @Override - public int deleteByIdPhysic(String id) { - return baseMapper.deleteByIdPhysic(id); - } -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java deleted file mode 100644 index ad34a7a7..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java +++ /dev/null @@ -1,497 +0,0 @@ -package com.nu.modules.NuBizNuCustomerServer.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.nu.modules.NuBizNuCustomerServer.entity.*; -import com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerMapper; -import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerElderTagService; -import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerInstantService; -import com.nu.modules.NuBizNuCustomerServer.service.INuBizNuCustomerServerService; -import com.nu.modules.directive.datapool.entity.DataPool; -import com.nu.modules.directive.datapool.service.impl.DataPoolServiceImpl; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; -import com.nu.modules.sysconfig.ISysConfigApi; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import java.util.*; - -/** - * @Description: 护理单元客户配置服务指令 - * @Author: yangjun - * @Date: 2025-03-31 - * @Version: V1.0 - */ -@Service -public class NuBizNuCustomerServerServiceImpl extends ServiceImpl implements INuBizNuCustomerServerService { - - @Autowired - private INuConfigServiceCategoryService nuConfigServiceCategoryService; - @Autowired - private INuConfigServiceTypeService nuConfigServiceTypeService; - @Autowired - private INuConfigServiceDirectiveService nuConfigServiceDirectiveService; - @Autowired - private INuBizNuCustomerServerInstantService nuBizNuCustomerServerInstantService; - @Autowired - private INuBizNuCustomerElderTagService nuBizNuCustomerElderTagService; - @Autowired - private ISysConfigApi sysConfigApi; - @Autowired - private DataPoolServiceImpl dataPoolServiceImpl; - - private String serverNetUrl; - - @Override - public Map getNclist(NuBizNuCustomerServer nuBizNuCustomerServer) { - Map resMap = new HashMap<>(); - //服务指令计划 - QueryWrapper nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); - nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()), "nu_id", nuBizNuCustomerServer.getNuId()); - nuBizNuCustomerServerQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()), "customer_id", nuBizNuCustomerServer.getCustomerId()); - List groupList = baseMapper.selectList(nuBizNuCustomerServerQueryWrapper); -// String groupPositioning[] = {"0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23"}; -// List> allList = new ArrayList<>(); -// for(String groupPositioning1 : groupPositioning){ -// Map posMap = new HashMap<>(); -// posMap.put("positioning",groupPositioning1); -// List> childrenList = new ArrayList<>(); -// for(NuBizNuCustomerServer par : groupList){ -// if(StringUtils.equals(groupPositioning1,par.getPositioning())){ -// Map map = new HashMap<>(); -// map.put("nuId",nuBizNuCustomerServer.getNuId()); -// map.put("customerId",nuBizNuCustomerServer.getCustomerId()); -// map.put("directiveId",par.getId()); -// map.put("directiveName",par.getDirectiveName()); -// map.put("typeId",par.getTypeId()); -// map.put("typeName",par.getTypeName()); -// map.put("categoryId",par.getCategoryId()); -// map.put("categoryName",par.getCategoryName()); -// map.put("tagName",par.getTagName()); -// map.put("startTime",par.getStartTime()); -// map.put("endTime",par.getEndTime()); -// map.put("cycleTypeId",par.getCycleType()); -// map.put("cycleType",par.getCycleType()); -// map.put("cycleValue",par.getCycleValue()); -// map.put("positioningLong",par.getPositioningLong()); -// map.put("positioning",par.getPositioning()); -// map.put("izPackage",par.getIzPackage()); -// if(par.getImmediateFile()!=null&&!par.getImmediateFile().equals("")){ -// String immediateFile = getImageNetUrl(par.getImmediateFile()); -// map.put("immediateFile",par.getImmediateFile()); -// map.put("netImmediateFile",immediateFile); -// }else{ -// map.put("immediateFile",""); -// map.put("netImmediateFile",""); -// } -// if(par.getImmediateFileFocus()!=null&&!par.getImmediateFile().equals("")){ -// String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); -// map.put("immediateFileFocus",par.getImmediateFileFocus()); -// map.put("netImmediateFileFocus",immediateFileFocus); -// }else{ -// map.put("immediateFileFocus",""); -// map.put("netImmediateFileFocus",""); -// } -// if(par.getPreviewFile()!=null&&!par.getImmediateFile().equals("")){ -// String previewFile = getImageNetUrl(par.getPreviewFile()); -// map.put("previewFile",par.getPreviewFile()); -// map.put("netPreviewFile",previewFile); -// }else{ -// map.put("previewFile",""); -// map.put("netPreviewFile",""); -// } -// if(par.getPreviewFileSmall()!=null&&!par.getImmediateFile().equals("")){ -// String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); -// map.put("previewFileSmall",par.getPreviewFileSmall()); -// map.put("netPreviewFileSmall",previewFileSmall); -// }else{ -// map.put("previewFileSmall",""); -// map.put("netPreviewFileSmall",""); -// } -// childrenList.add(map); -// } -// } -// posMap.put("children",childrenList); -// allList.add(posMap); -// } -// resMap.put("serviceList",allList);//服务指令计划 - - for (NuBizNuCustomerServer par : groupList) { - if (par.getIzPackage().equals("Y")) { - String directiveId = par.getDirectiveId(); - if (directiveId != null && !directiveId.equals("")) { - NuBizNuCustomerServer packageDirective = new NuBizNuCustomerServer(); - packageDirective.setPackageId(directiveId); - List pdList = baseMapper.getNcDirectiveList(packageDirective); - for (NuBizNuCustomerServer pd : pdList) { - getNetImages(pd); - } - par.setDirectivesList(pdList); - } - } -// else { -// getNetImages(par); -// } - } - - resMap.put("serviceList", groupList);//服务指令计划 - //即时指令 - QueryWrapper instantQueryWrapper = new QueryWrapper<>(); - instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getNuId()), "nu_id", nuBizNuCustomerServer.getNuId()); - instantQueryWrapper.eq(StringUtils.isNotEmpty(nuBizNuCustomerServer.getCustomerId()), "customer_id", nuBizNuCustomerServer.getCustomerId()); - instantQueryWrapper.orderByDesc("create_time"); - List instantList = nuBizNuCustomerServerInstantService.list(instantQueryWrapper); -// for (NuBizNuCustomerServerInstant pari : instantList) { -// getInstantNetImages(pari); -// } - resMap.put("instantList", instantList); - NuBizNuCustomerElderTag elderTag = new NuBizNuCustomerElderTag(); - //体型标签 - elderTag.setNuId(nuBizNuCustomerServer.getNuId()); - elderTag.setCustomerId(nuBizNuCustomerServer.getCustomerId()); - elderTag.setTagType("tx"); - List bodyTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag); - for (NuBizNuCustomerElderTag bt : bodyTagList) { - if (bt.getPic() != null) { - String pic = getImageNetUrl(bt.getPic()); - bt.setNetPic(pic); - } else { - bt.setPic(""); - bt.setNetPic(""); - } - if (bt.getPicFocus() != null) { - String picFocus = getImageNetUrl(bt.getPicFocus()); - bt.setNetPicFocus(picFocus); - } else { - bt.setPicFocus(""); - bt.setNetPicFocus(""); - } - } - resMap.put("bodyTagList", bodyTagList); - //情绪标签 - elderTag.setTagType("qx"); - List emotionTagList = nuBizNuCustomerElderTagService.getElderTags(elderTag); - for (NuBizNuCustomerElderTag et : emotionTagList) { - if (et.getPic() != null) { - String pic = getImageNetUrl(et.getPic()); - et.setNetPic(pic); - } else { - et.setPic(""); - et.setNetPic(""); - } - if (et.getPicFocus() != null) { - String picFocus = getImageNetUrl(et.getPicFocus()); - et.setNetPicFocus(picFocus); - } else { - et.setPicFocus(""); - et.setNetPicFocus(""); - } - } - resMap.put("emotionTagList", emotionTagList); - return resMap; - } - - private NuBizNuCustomerServer getNetImages(NuBizNuCustomerServer par) { - if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) { - String immediateFile = getImageNetUrl(par.getImmediateFile()); - par.setNetImmediateFile(immediateFile); - } else { - par.setImmediateFile(""); - par.setNetImmediateFile(""); - } - if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) { - String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); - par.setNetImmediateFileFocus(immediateFileFocus); - } else { - par.setImmediateFileFocus(""); - par.setNetImmediateFileFocus(""); - } - if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) { - String previewFile = getImageNetUrl(par.getPreviewFile()); - par.setNetPreviewFile(previewFile); - } else { - par.setPreviewFile(""); - par.setNetPreviewFile(""); - } - if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) { - String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); - par.setNetPreviewFileSmall(previewFileSmall); - } else { - par.setPreviewFileSmall(""); - par.setNetPreviewFileSmall(""); - } - if (par.getMp3File() != null && !par.getMp3File().equals("")) { - String netMp3File = getImageNetUrl(par.getMp3File()); - par.setNetMp3File(netMp3File); - } else { - par.setMp3File(""); - par.setNetMp3File(""); - } - if (par.getMp4File() != null && !par.getMp4File().equals("")) { - String netMp4File = getImageNetUrl(par.getMp4File()); - par.setNetMp4File(netMp4File); - } else { - par.setMp4File(""); - par.setNetMp4File(""); - } - return par; - } - - private NuBizNuCustomerServerInstant getInstantNetImages(NuBizNuCustomerServerInstant par) { - if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) { - String immediateFile = getImageNetUrl(par.getImmediateFile()); - par.setNetImmediateFile(immediateFile); - } else { - par.setImmediateFile(""); - par.setNetImmediateFile(""); - } - if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) { - String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); - par.setNetImmediateFileFocus(immediateFileFocus); - } else { - par.setImmediateFileFocus(""); - par.setNetImmediateFileFocus(""); - } - if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) { - String previewFile = getImageNetUrl(par.getPreviewFile()); - par.setNetPreviewFile(previewFile); - } else { - par.setPreviewFile(""); - par.setNetPreviewFile(""); - } - if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) { - String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); - par.setNetPreviewFileSmall(previewFileSmall); - } else { - par.setPreviewFileSmall(""); - par.setNetPreviewFileSmall(""); - } - if (par.getMp3File() != null && !par.getMp3File().equals("")) { - String netMp3File = getImageNetUrl(par.getMp3File()); - par.setNetMp3File(netMp3File); - } else { - par.setMp3File(""); - par.setNetMp3File(""); - } - if (par.getMp4File() != null && !par.getMp4File().equals("")) { - String netMp4File = getImageNetUrl(par.getMp4File()); - par.setNetMp4File(netMp4File); - } else { - par.setMp4File(""); - par.setNetMp4File(""); - } - return par; - } - - @Override - public NuBizNuCustomerServer addNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer) { - NuConfigServiceDirective nuConfigServiceDirective = nuConfigServiceDirectiveService.getById(nuBizNuCustomerServer.getDirectiveId()); - NuConfigServiceCategory nuConfigServiceCategory = nuConfigServiceCategoryService.getById(nuConfigServiceDirective.getCategoryId()); - NuConfigServiceType nuConfigServiceType = nuConfigServiceTypeService.getById(nuConfigServiceDirective.getTypeId()); - nuBizNuCustomerServer.setCategoryId(nuConfigServiceCategory.getId()); - nuBizNuCustomerServer.setCategoryName(nuConfigServiceCategory.getCategoryName()); - nuBizNuCustomerServer.setTypeId(nuConfigServiceType.getId()); - nuBizNuCustomerServer.setTypeName(nuConfigServiceType.getTypeName()); - baseMapper.insert(nuBizNuCustomerServer); - return nuBizNuCustomerServer; - } - - - @Override - public NuBizNuCustomerServer editNuCustomerServer(NuBizNuCustomerServer nuBizNuCustomerServer) { - NuConfigServiceDirective nuConfigServiceDirective = nuConfigServiceDirectiveService.getById(nuBizNuCustomerServer.getDirectiveId()); - NuConfigServiceCategory nuConfigServiceCategory = nuConfigServiceCategoryService.getById(nuConfigServiceDirective.getCategoryId()); - NuConfigServiceType nuConfigServiceType = nuConfigServiceTypeService.getById(nuConfigServiceDirective.getTypeId()); - nuBizNuCustomerServer.setCategoryId(nuConfigServiceCategory.getId()); - nuBizNuCustomerServer.setCategoryName(nuConfigServiceCategory.getCategoryName()); - nuBizNuCustomerServer.setTypeId(nuConfigServiceType.getId()); - nuBizNuCustomerServer.setTypeName(nuConfigServiceType.getTypeName()); - baseMapper.updateById(nuBizNuCustomerServer); - return nuBizNuCustomerServer; - } - - @Override - public void addBatch(NuBizNuCustomerServer nuBizNuCustomerServer) { - //保存服务指令计划 - String nuId = nuBizNuCustomerServer.getNuId(); - String customerId = nuBizNuCustomerServer.getCustomerId(); -// QueryWrapper nuBizNuCustomerServerQueryWrapper = new QueryWrapper<>(); -// nuBizNuCustomerServerQueryWrapper.eq("nu_id", nuId); -// nuBizNuCustomerServerQueryWrapper.eq("customer_id", customerId); -// baseMapper.delete(nuBizNuCustomerServerQueryWrapper); -// List serverList = nuBizNuCustomerServer.getServerList(); -// if (serverList.size() > 0) { -// for (NuBizNuCustomerServer par : serverList) { -// par.setNuId(nuId); -// par.setNuName(nuBizNuCustomerServer.getNuName()); -// par.setCustomerId(customerId); -// par.setCustomerName(nuBizNuCustomerServer.getCustomerName()); -// } -// -// this.saveBatch(serverList); -// } -// QueryWrapper instantQueryWrapper = new QueryWrapper<>(); -// instantQueryWrapper.eq("nu_id", nuId); -// instantQueryWrapper.eq("customer_id", customerId); -// nuBizNuCustomerServerInstantService.remove(instantQueryWrapper); -// List instantList = nuBizNuCustomerServer.getInstantList(); -// if (instantList.size() > 0) { -// for (NuBizNuCustomerServerInstant pari : instantList) { -// pari.setNuId(nuId); -// pari.setNuName(nuBizNuCustomerServer.getNuName()); -// pari.setCustomerId(customerId); -// pari.setCustomerName(nuBizNuCustomerServer.getCustomerName()); -// } -// nuBizNuCustomerServerInstantService.saveBatch(instantList); -// } - - QueryWrapper tagQueryWrapper = new QueryWrapper<>(); - tagQueryWrapper.eq("nu_id", nuId); - tagQueryWrapper.eq("customer_id", customerId); - nuBizNuCustomerElderTagService.remove(tagQueryWrapper); - List tagList = nuBizNuCustomerServer.getTagList(); - if (tagList.size() > 0) { - for (NuBizNuCustomerElderTag tg : tagList) { - tg.setNuId(nuId); - tg.setNuName(nuBizNuCustomerServer.getNuName()); - tg.setCustomerId(customerId); - tg.setCustomerName(nuBizNuCustomerServer.getCustomerName()); - } - nuBizNuCustomerElderTagService.saveBatch(tagList); - } - - } - - @Override - public List getNcPackagelist(DirectivePackageDto directivePackageDto) { - - List list = baseMapper.getNcPackagelist(directivePackageDto); - - List directiveList = baseMapper.getNcDirectiveList(new NuBizNuCustomerServer()); - - for (DirectivePackageDto et : list) { - List directivesList = new ArrayList<>(); - for (NuBizNuCustomerServer etd : directiveList) { - if (etd.getPackageId().equals(et.getId())) { - getNetImages(etd); - directivesList.add(etd); - } - } - et.setDirectivesList(directivesList); - } - return list; - } - - @Override - public NuBizNuCustomerServer addDirective(NuBizNuCustomerServer nuBizNuCustomerServer) { - baseMapper.insert(nuBizNuCustomerServer); - //TODO 增加日志 - - //单一指令生成到数据池 - dataPoolServiceImpl.generateDataPool(nuBizNuCustomerServer); - - return nuBizNuCustomerServer; - } - - @Override - public NuBizNuCustomerServerInstant addInstant(NuBizNuCustomerServerInstant customerServerInstant) { - nuBizNuCustomerServerInstantService.save(customerServerInstant); - //TODO 增加日志 - - //生成即时指令到数据池，测试 -// DataPool dataPool = new DataPool(); -// dataPool.setBizId(customerServerInstant.getId()); -// dataPool.setNuId(customerServerInstant.getNuId()); -// dataPool.setNuName(customerServerInstant.getNuName()); -// dataPool.setCustomerId(customerServerInstant.getCustomerId()); -// dataPool.setCustomerName(customerServerInstant.getCustomerName()); -// dataPool.setDirectiveId(customerServerInstant.getDirectiveId()); -// dataPool.setDirectiveName(customerServerInstant.getDirectiveName()); -// dataPool.setServiceDuration(customerServerInstant.getServiceDuration()); -// dataPoolServiceImpl.addInstant(dataPool); - return customerServerInstant; - } - - @Override - public NuBizNuCustomerElderTag addElderTag(NuBizNuCustomerElderTag customerElderTag) { - nuBizNuCustomerElderTagService.save(customerElderTag); - //TODO 增加日志 - return customerElderTag; - } - - @Override - public void deleteDirective(NuBizNuCustomerServer nuBizNuCustomerServer) { - String id = nuBizNuCustomerServer.getId(); - //调用方法删除数据池中的数据 - dataPoolServiceImpl.deleteDataPool(nuBizNuCustomerServer); - - baseMapper.deleteByIdPhysic(id); - //TODO 增加日志 - } - - @Override - public void deleteInstant(NuBizNuCustomerServerInstant customerServerInstant) { - nuBizNuCustomerServerInstantService.deleteByIdPhysic(customerServerInstant.getId()); - //TODO 增加日志 - } - - @Override - public void deleteElderTag(NuBizNuCustomerElderTag customerElderTag) { - nuBizNuCustomerElderTagService.deleteByIdPhysic(customerElderTag.getId()); - //TODO 增加日志 - } - - @Override - public void editDirective(NuBizNuCustomerServer nuBizNuCustomerServer) { - - NuBizNuCustomerServer entity = baseMapper.selectById(nuBizNuCustomerServer.getId()); - baseMapper.updateById(nuBizNuCustomerServer); - //TODO 增加日志 - - //调用方法先删除数据池中的数据，再生成数据池中的数据 - dataPoolServiceImpl.editDataPool(entity); - } - - @Override - public void editInstant(NuBizNuCustomerServerInstant customerServerInstant) { - nuBizNuCustomerServerInstantService.updateById(customerServerInstant); - //TODO 增加日志 - } - - @Override - public void editElderTag(NuBizNuCustomerElderTag customerElderTag) { - nuBizNuCustomerElderTagService.updateById(customerElderTag); - //TODO 增加日志 - } - - /** - * 获取管理平台静态资源路径 - * - * @return - */ - private void getOpeMediaAddress() { - if (serverNetUrl == null || serverNetUrl.equals("")) { - JSONObject json = sysConfigApi.getByKey("ope_media_address"); - if (json != null) { - String configValue = json.getString("configValue"); - if (!configValue.endsWith("/")) { - configValue += "/"; - } - serverNetUrl = configValue; - } - } - } - - private String getImageNetUrl(String imageUrl) { - getOpeMediaAddress(); - return serverNetUrl + imageUrl; - } -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/controller/DataPoolController.java b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/controller/DataPoolController.java deleted file mode 100644 index 2a20f623..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/controller/DataPoolController.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.nu.modules.directive.datapool.controller; - -import com.nu.modules.directive.datapool.entity.DataPool; -import com.nu.modules.directive.datapool.service.IDataPoolService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @Description: 服务指令数据池管理 - * @Author: caolei - * @Date: 2025-11-07 - * @Version: V1.0 - */ -@Api(tags = "服务指令数据池管理") -@RestController -@RequestMapping("/nuIpadApi/directive/dataPool") -@Slf4j -public class DataPoolController extends JeecgController { - - @Autowired - private IDataPoolService service; - - /** - * 批量 - * @return - */ - @GetMapping(value = "/generateDataPoolBatch") - public Result generateDataPoolBatch() { - return service.generateDataPoolBatch(); - } - - /** - * 新增即时指令 - * @return - */ - @ApiOperation(value="即时服务指令添加", notes="即时服务指令添加") - @PostMapping(value = "/addInstant") - public Result addInstant(DataPool dataPool) { - return service.addInstant(dataPool); - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java deleted file mode 100644 index bb0de0bc..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/controller/NuConfigServiceCategoryController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.controller; - -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; -import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; -import org.jeecg.common.system.base.controller.JeecgController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; -import java.util.Map; - - /** - * @Description: 服务指令 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -@RestController -@RequestMapping("/nuIpadApi/nuConfigServiceCategory") -@Slf4j -public class NuConfigServiceCategoryController extends JeecgController { - @Autowired - private INuConfigServiceCategoryService nuConfigServiceCategoryService; - - /** - * 获取护理类服务器指令树 - * - * @param nuConfigServiceCategory - * @return - */ - //@AutoLog(value = "nu_config_service_category-分页列表查询") - @GetMapping(value = "/getServiceTree") - public Result>> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory) { - List> treeList = nuConfigServiceCategoryService.getServiceTree(nuConfigServiceCategory); - return Result.OK(treeList); - } - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java deleted file mode 100644 index ef4b45e1..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceCategoryMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; - -/** - * @Description: 服务类别 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface NuConfigServiceCategoryMapper extends BaseMapper { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java deleted file mode 100644 index 85bb603f..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceDirectiveMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.mapper; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * @Description: 服务指令 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface NuConfigServiceDirectiveMapper extends BaseMapper { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java deleted file mode 100644 index 7408069d..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuConfigServiceTypeMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; - -/** - * @Description: 服务类型 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface NuConfigServiceTypeMapper extends BaseMapper { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuInstructionTagMapper.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuInstructionTagMapper.java deleted file mode 100644 index 40bd24e6..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/NuInstructionTagMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; -import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; - -/** - * @Description: 分类标签 - * @Author: caolei - * @Date: 2025-10-11 - * @Version: V1.0 - */ -public interface NuInstructionTagMapper extends BaseMapper { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java deleted file mode 100644 index 5bce0e98..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceCategoryService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.service; - -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; -import java.util.Map; - -/** - * @Description: 服务类别 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface INuConfigServiceCategoryService extends IService { - - List> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory); -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java deleted file mode 100644 index 2546bb1a..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceDirectiveService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.service; - -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 服务指令 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface INuConfigServiceDirectiveService extends IService { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java deleted file mode 100644 index 5c454fac..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuConfigServiceTypeService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.service; - -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * @Description: 服务类型 - * @Author: yangjun - * @Date: 2025-03-28 - * @Version: V1.0 - */ -public interface INuConfigServiceTypeService extends IService { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java deleted file mode 100644 index e58c5287..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/INuInstructionTagService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; - -/** - * @Description: 分类标签 - * @Author: caolei - * @Date: 2025-10-11 - * @Version: V1.0 - */ -public interface INuInstructionTagService extends IService { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java deleted file mode 100644 index 73ab7d8c..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceDirectiveServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.service.impl; - -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; -import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceDirectiveMapper; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; -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 NuConfigServiceDirectiveServiceImpl extends ServiceImpl implements INuConfigServiceDirectiveService { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java deleted file mode 100644 index 277a3b9f..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceTypeServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.service.impl; - -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; -import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceTypeMapper; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; -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 NuConfigServiceTypeServiceImpl extends ServiceImpl implements INuConfigServiceTypeService { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java b/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java deleted file mode 100644 index 75d1f604..00000000 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuInstructionTagServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.nu.modules.nuApiServiceCategory.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; -import com.nu.modules.nuApiServiceCategory.mapper.NuInstructionTagMapper; -import com.nu.modules.nuApiServiceCategory.service.INuInstructionTagService; -import org.springframework.stereotype.Service; - -/** - * @Description: 分类标签 - * @Author: caolei - * @Date: 2025-10-11 - * @Version: V1.0 - */ -@Service -public class NuInstructionTagServiceImpl extends ServiceImpl implements INuInstructionTagService { - -} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java new file mode 100644 index 00000000..b1afd317 --- /dev/null +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/instruction/care/CareDirectiveApi.java @@ -0,0 +1,238 @@ +package com.nu.modules.pad.instruction.care; + +import com.nu.entity.CareDirectiveEntity; +import com.nu.entity.CareDirectiveInstantEntity; +import com.nu.entity.CareDirectivePackageEntity; +import com.nu.entity.ElderTagEntity; +import com.nu.modules.care.api.ICareDirectiveConfigApi; +import com.nu.modules.care.api.ICareDirectivePlanApi; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** +* @Description: 护理单元客户配置服务指令计划API +* @Author: caolei +* @Date: 2025-11-26 +* @Version: V1.0 +*/ + +@RestController +@RequestMapping("/api/pad/care/directive") +@Slf4j +public class CareDirectiveApi { + + @Autowired + private ICareDirectiveConfigApi careDirectiveConfigApi; + + @Autowired + private ICareDirectivePlanApi careDirectivePlanApi; + + /** + * 获取护理类服务器指令树-配置数据 + * + * @return + */ + @GetMapping(value = "/getServiceTree") + public Result>> getServiceTree() { + List> treeList = careDirectiveConfigApi.getServiceTree(); + return Result.OK(treeList); + } + + /** + * PAD端获取服务指令计划表格数据 + * + * @param careDirectiveEntity + * @return + */ + @GetMapping(value = "/getNclist") + public Result> getPlanList(CareDirectiveEntity careDirectiveEntity) { + Map pageList = careDirectivePlanApi.getPlanList(careDirectiveEntity); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param careDirectiveEntity + * @return + */ + @PostMapping(value = "/addNuCustomerServer") + public Result addNuCustomerServer(@RequestBody CareDirectiveEntity careDirectiveEntity) { + CareDirectiveEntity retText = careDirectivePlanApi.addNuCustomerServer(careDirectiveEntity); + return Result.OK(retText); + } + + /** + * 编辑 + * + * @param careDirectiveEntity + * @return + */ + @RequestMapping(value = "/editNuCustomerServer", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result editNuCustomerServer(@RequestBody CareDirectiveEntity careDirectiveEntity) { + CareDirectiveEntity retJson = careDirectivePlanApi.editNuCustomerServer(careDirectiveEntity); + return Result.OK(retJson); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @DeleteMapping(value = "/deleteNuCustomerServer") + public Result deleteNuCustomerServer(@RequestParam(name="id",required=true) String id) { + careDirectivePlanApi.deleteNuCustomerServer(id); + return Result.OK("删除成功!"); + } + + + /** + * 通过id查询 + * + * @param id + * @return + */ + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + CareDirectiveEntity careDirectiveEntity = careDirectivePlanApi.getNuCustomerServerById(id); + if(careDirectiveEntity==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(careDirectiveEntity); + } + + /** + * PAD端保存长者标签 + * + * @param careDirectiveEntity + * @return + */ + @PostMapping(value = "/addBatch") + public Result addBatch(@RequestBody CareDirectiveEntity careDirectiveEntity) { + careDirectivePlanApi.addBatch(careDirectiveEntity); + return Result.OK("操作成功"); + } + + /** + * PAD端编排护理流程-新增服务指令 + * + * @param careDirectiveEntity + * @return + */ + @PostMapping(value = "/addDirective") + public Result addDirective(@RequestBody CareDirectiveEntity careDirectiveEntity) { + return Result.OK(careDirectivePlanApi.addDirective(careDirectiveEntity)); + } + + /** + * PAD端编排护理流程-修改服务指令 + * + * @param careDirectiveEntity + * @return + */ + @PostMapping(value = "/editDirective") + public Result editDirective(@RequestBody CareDirectiveEntity careDirectiveEntity) { + careDirectivePlanApi.editDirective(careDirectiveEntity); + return Result.OK("操作成功"); + } + + /** + * PAD端编排护理流程-删除服务指令 + * + * @param careDirectiveEntity + * @return + */ + @PostMapping(value = "/deleteDirective") + public Result deleteDirective(@RequestBody CareDirectiveEntity careDirectiveEntity) { + careDirectivePlanApi.deleteDirective(careDirectiveEntity); + return Result.OK("操作成功"); + } + + /** + * PAD端编排护理流程-新增即时服务指令 + * + * @param careDirectiveInstantEntity + * @return + */ + @PostMapping(value = "/addInstant") + public Result addDirective(@RequestBody CareDirectiveInstantEntity careDirectiveInstantEntity) { + return Result.OK(careDirectivePlanApi.addInstant(careDirectiveInstantEntity)); + } + + /** + * PAD端编排护理流程-修改即时服务指令 + * + * @param careDirectiveInstantEntity + * @return + */ + @PostMapping(value = "/editInstant") + public Result editInstant(@RequestBody CareDirectiveInstantEntity careDirectiveInstantEntity) { + careDirectivePlanApi.editInstant(careDirectiveInstantEntity); + return Result.OK("操作成功"); + } + + /** + * PAD端编排护理流程-删除即时服务指令 + * + * @param careDirectiveInstantEntity + * @return + */ + @PostMapping(value = "/deleteInstant") + public Result deleteInstant(@RequestBody CareDirectiveInstantEntity careDirectiveInstantEntity) { + careDirectivePlanApi.deleteInstant(careDirectiveInstantEntity); + return Result.OK("操作成功"); + } + + /** + * PAD端编排护理流程-新增情绪/体型标签 + * + * @param elderTagEntity + * @return + */ + @PostMapping(value = "/addElderTag") + public Result addElderTag(@RequestBody ElderTagEntity elderTagEntity) { + return Result.OK(careDirectivePlanApi.addElderTag(elderTagEntity)); + } + + /** + * PAD端编排护理流程-修改情绪/体型标签 + * + * @param elderTagEntity + * @return + */ + @PostMapping(value = "/editElderTag") + public Result editElderTag(@RequestBody ElderTagEntity elderTagEntity) { + careDirectivePlanApi.editElderTag(elderTagEntity); + return Result.OK("操作成功"); + } + + /** + * PAD端编排护理流程-删除情绪/体型标签 + * + * @param elderTagEntity + * @return + */ + @PostMapping(value = "/deleteElderTag") + public Result deleteElderTag(@RequestBody ElderTagEntity elderTagEntity) { + careDirectivePlanApi.deleteElderTag(elderTagEntity); + return Result.OK("操作成功"); + } + + /** + * 获取指令包集合数据 + * + * @param careDirectivePackageEntity + * @return + */ + @GetMapping(value = "/getNcPackagelist") + public Result> getNcPackagelist(CareDirectivePackageEntity careDirectivePackageEntity) { + List pageList = careDirectivePlanApi.getNcPackagelist(careDirectivePackageEntity); + return Result.OK(pageList); + } +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java new file mode 100644 index 00000000..b22b7422 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveEntity.java @@ -0,0 +1,111 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Description: 护理单元客户配置服务指令 + * @Author: yangjun + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Data +public class CareDirectiveEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**护理单元id*/ + private String nuId; + /**护理单元名称*/ + private String nuName; + /**客户id*/ + private String customerId; + /**客户姓名*/ + private String customerName; + /**服务类别id*/ + private String categoryId; + /**服务类别名称*/ + private String categoryName; + /**服务类型id*/ + private String typeId; + /**服务类型名称*/ + private String typeName; + /**服务指令id*/ + private String directiveId; + /**服务指令名称*/ + private String directiveName; + /**周期类型ID*/ + private String cycleTypeId; + /**周期类型*/ + private String cycleType; + /**周期值*/ + private String cycleValue; + /**即时指令图标*/ + private String immediateFile; + /**即时指令图标*/ + private String netImmediateFile; + /**即时指令焦点图标*/ + private String immediateFileFocus; + /**即时指令焦点图标*/ + private String netImmediateFileFocus; + /**服务指令图片大图*/ + private String previewFile; + /**服务指令图片大图*/ + private String netPreviewFile; + /**服务指令图片小图*/ + private String previewFileSmall; + /**服务指令图片小图*/ + private String netPreviewFileSmall; + /**指令音频文件*/ + private String mp3File; + /**指令音频文件-网络地址*/ + private String netMp3File; + /**指令视频文件*/ + private String mp4File; + /**指令视频文件-网络地址*/ + private String netMp4File; + /**服务指令时长*/ + private String serviceDuration; + /**服务描述*/ + private String serviceContent; + /**定位*/ + private String positioning; + /**纵向定位*/ + private String positioningLong; + /**PAD端无线循环使用*/ + private String tagName; + /**开始时间*/ + private String startTime; + /**结束时间*/ + private String endTime; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + /**是否是服务指令包 N否 Y是*/ + private String izPackage; + + private String packageId; + + /**即时服务指令列表**/ + private List instantList; + /**长者标签列表**/ + private List tagList; + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java new file mode 100644 index 00000000..76edb709 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectiveInstantEntity.java @@ -0,0 +1,88 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: yangjun + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Data +public class CareDirectiveInstantEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**护理单元id*/ + private String nuId; + /**护理单元名称*/ + private String nuName; + /**客户id*/ + private String customerId; + /**客户姓名*/ + private String customerName; + /**服务类别id*/ + private String categoryId; + /**服务类别名称*/ + private String categoryName; + /**服务类型id*/ + private String typeId; + /**服务类型名称*/ + private String typeName; + /**服务指令id*/ + private String directiveId; + /**服务指令名称*/ + private String directiveName; + /**即时指令图标*/ + private String immediateFile; + /**即时指令图标*/ + private String netImmediateFile; + /**即时指令焦点图标*/ + private String immediateFileFocus; + /**即时指令焦点图标*/ + private String netImmediateFileFocus; + /**服务指令图片大图*/ + private String previewFile; + /**服务指令图片大图*/ + private String netPreviewFile; + /**服务指令图片小图*/ + private String previewFileSmall; + /**服务指令图片小图*/ + private String netPreviewFileSmall; + /**指令音频文件*/ + private String mp3File; + /**指令音频文件-网络地址*/ + private String netMp3File; + /**指令视频文件*/ + private String mp4File; + /**指令视频文件-网络地址*/ + private String netMp4File; + /**服务时长（分钟）*/ + private String serviceDuration; + /**服务描述*/ + private String serviceContent; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + /**是否是服务指令包 N否 Y是*/ + private String izPackage; + /**排序*/ + private Long sort; + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/CareDirectivePackageEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectivePackageEntity.java new file mode 100644 index 00000000..3e236906 --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/CareDirectivePackageEntity.java @@ -0,0 +1,56 @@ +package com.nu.entity; + +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description: 服务指令包 + * @Author: 张明远 + * @Date: 2025-03-24 + * @Version: V1.0 + */ +@Data +public class CareDirectivePackageEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**服务指令包名称*/ + private String packageName; + /**服务指令包总时长*/ + private Long serviceDuration; + /**备注*/ + private String description; + /**排序*/ + private Integer sort; + /**是否启用 Y启用 N未启用*/ + private String izEnabled; + /**是否删除 0未删除 1删除*/ + private String delFlag; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date updateTime; + +// 开始时间 + private String startTimeStr; +// 结束时间 + private String endTimeStr; +// 服务指令集合 + private List directivesList; + +} diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java new file mode 100644 index 00000000..bd28a90f --- /dev/null +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderTagEntity.java @@ -0,0 +1,59 @@ +package com.nu.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 护理单元客户配置长者标签 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +@Data +public class ElderTagEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + private String id; + /**护理单元id*/ + private String nuId; + /**护理单元名称*/ + private String nuName; + /**客户id*/ + private String customerId; + /**客户姓名*/ + private String customerName; + /**长者标签ID*/ + private String tagId; + /**长者标签名称*/ + private String tagName; + /**长者标签类型*/ + private String tagType; + /**图标*/ + private String pic; + /**图标*/ + private String netPic; + /**焦点图标*/ + private String picFocus; + /**图标*/ + private String netPicFocus; + /**创建人*/ + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + /**更新人*/ + private String updateBy; + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + /**所属部门*/ + private String sysOrgCode; + /**选中状态*/ + private String izSelected; +} diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml b/nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml index cd4f20b7..ece04f02 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/pom.xml @@ -7,6 +7,12 @@ nu-services-api 2.0.0 + + + com.nursingunit.boot + nursing-unit-common + + 4.0.0 nu-services-local-api diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.java new file mode 100644 index 00000000..5cf94e2d --- /dev/null +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectiveConfigApi.java @@ -0,0 +1,8 @@ +package com.nu.modules.care.api; + +import java.util.List; +import java.util.Map; + +public interface ICareDirectiveConfigApi { + List> getServiceTree(); +} diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectivePlanApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectivePlanApi.java new file mode 100644 index 00000000..6e5a6b4b --- /dev/null +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/care/api/ICareDirectivePlanApi.java @@ -0,0 +1,29 @@ +package com.nu.modules.care.api; + +import com.nu.entity.CareDirectiveEntity; +import com.nu.entity.CareDirectiveInstantEntity; +import com.nu.entity.CareDirectivePackageEntity; +import com.nu.entity.ElderTagEntity; + +import java.util.List; +import java.util.Map; + +public interface ICareDirectivePlanApi { + Map getPlanList(CareDirectiveEntity careDirectiveEntity); + CareDirectiveEntity addNuCustomerServer(CareDirectiveEntity careDirectiveEntity); + CareDirectiveEntity editNuCustomerServer(CareDirectiveEntity careDirectiveEntity); + void deleteNuCustomerServer(String id); + CareDirectiveEntity getNuCustomerServerById(String id); + void addBatch(CareDirectiveEntity careDirectiveEntity); + List getNcPackagelist(CareDirectivePackageEntity careDirectivePackageEntity); + CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity); + void editDirective(CareDirectiveEntity careDirectiveEntity); + void deleteDirective(CareDirectiveEntity careDirectiveEntity); + CareDirectiveInstantEntity addInstant(CareDirectiveInstantEntity careDirectiveInstantEntity); + void editInstant(CareDirectiveInstantEntity careDirectiveInstantEntity); + void deleteInstant(CareDirectiveInstantEntity careDirectiveInstantEntity); + ElderTagEntity addElderTag(ElderTagEntity elderTagEntity); + void editElderTag(ElderTagEntity elderTagEntity); + void deleteElderTag(ElderTagEntity elderTagEntity); + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceCategory.java similarity index 80% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceCategory.java index 13fa4ae9..6c96b384 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceCategory.java @@ -1,4 +1,4 @@ -package com.nu.modules.nuApiServiceCategory.entity; +package com.nu.modules.biz.care.config.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -30,57 +30,57 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_category") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class NuConfigServiceCategory implements Serializable { +public class CareConfigServiceCategory implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") - private java.lang.String id; + private String id; /**服务类别名称*/ @Excel(name = "服务类别名称", width = 15) @ApiModelProperty(value = "服务类别名称") - private java.lang.String categoryName; + private String categoryName; @Excel(name = "分类标签id", width = 15) @ApiModelProperty(value = "分类标签id") - private java.lang.String instructionId; + private String instructionId; /**排序*/ @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") - private java.lang.Integer sort; + private Integer sort; /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用 Y启用 N未启用", width = 15) @ApiModelProperty(value = "是否启用 Y启用 N未启用") - private java.lang.String izEnabled; + private String izEnabled; /**是否删除 0未删除 1删除*/ @Excel(name = "是否删除 0未删除 1删除", width = 15) @ApiModelProperty(value = "是否删除 0未删除 1删除") @TableLogic - private java.lang.String delFlag; + private String delFlag; /**创建人*/ @ApiModelProperty(value = "创建人") - private java.lang.String createBy; + private String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; + private Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; + private String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; + private Date updateTime; /**所属部门*/ @ApiModelProperty(value = "所属部门") - private java.lang.String sysOrgCode; + private String sysOrgCode; /**网络标记，0为用pad本地静态图片，1为用网络图*/ @ApiModelProperty(value = "网络标记") - private java.lang.String netFlag; + private String netFlag; /**动画图片*/ @ApiModelProperty(value = "动画图片") - private java.lang.String animationPath; + private String animationPath; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceDirective.java similarity index 78% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceDirective.java index a3c1b122..0d662f2a 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceDirective.java @@ -1,4 +1,4 @@ -package com.nu.modules.nuApiServiceCategory.entity; +package com.nu.modules.biz.care.config.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -28,136 +28,136 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_directive") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class NuConfigServiceDirective implements Serializable { +public class CareConfigServiceDirective implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") - private java.lang.String id; + private String id; /**服务指令名称*/ @Excel(name = "服务指令名称", width = 15) @ApiModelProperty(value = "服务指令名称") - private java.lang.String directiveName; + private String directiveName; /**服务类别id*/ @Excel(name = "服务类别id", width = 15) @ApiModelProperty(value = "服务类别id") - private java.lang.String categoryId; + private String categoryId; /**服务类别*/ @Excel(name = "服务类别", width = 15) @ApiModelProperty(value = "服务类别") @TableField(exist = false) - private java.lang.String categoryName; + private String categoryName; /**服务类型id*/ @Excel(name = "服务类型id", width = 15) @ApiModelProperty(value = "服务类型id") - private java.lang.String typeId; + private String typeId; /**服务类型*/ @Excel(name = "服务类型", width = 15) @ApiModelProperty(value = "服务类型") @TableField(exist = false) - private java.lang.String typeName; + private String typeName; /**指令标签id*/ @Excel(name = "指令标签id", width = 15) @ApiModelProperty(value = "指令标签id") - private java.lang.String instructionTagId; + private String instructionTagId; /**收费价格*/ @Excel(name = "收费价格", width = 15) @ApiModelProperty(value = "收费价格") - private java.math.BigDecimal tollPrice; + private BigDecimal tollPrice; /**提成价格*/ @Excel(name = "提成价格", width = 15) @ApiModelProperty(value = "提成价格") - private java.math.BigDecimal comPrice; + private BigDecimal comPrice; /**是否参与医保报销 0不报销 1报销*/ @Excel(name = "是否参与医保报销 0不报销 1报销", width = 15) @ApiModelProperty(value = "是否参与医保报销 0不报销 1报销") - private java.lang.String izReimbursement; + private String izReimbursement; /**是否参与机构优惠 0不参与 1参与*/ @Excel(name = "是否参与机构优惠 0不参与 1参与", width = 15) @ApiModelProperty(value = "是否参与机构优惠 0不参与 1参与") - private java.lang.String izPreferential; + private String izPreferential; /**收费频次 1按次收费 2按天收费*/ @Excel(name = "收费频次 1按次收费 2按天收费", width = 15) @ApiModelProperty(value = "收费频次 1按次收费 2按天收费") - private java.lang.String chargingFrequency; + private String chargingFrequency; /**周期类型 1日常护理 2周期护理 3即时护理*/ @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") - private java.lang.String cycleType; + private String cycleType; /**周期类型 1日常护理 2周期护理 3即时护理*/ @Excel(name = "周期类型 1日常护理 2周期护理 3即时护理", width = 15) @ApiModelProperty(value = "周期类型 1日常护理 2周期护理 3即时护理") @TableField(exist = false) - private java.lang.String cycleTypeName; + private String cycleTypeName; /**排序*/ @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") - private java.lang.Integer sort; + private Integer sort; /**服务说明*/ @Excel(name = "服务说明", width = 15) @ApiModelProperty(value = "服务说明") - private java.lang.String serviceContent; + private String serviceContent; /**服务时长（分钟）*/ @Excel(name = "服务时长（分钟）", width = 15) @ApiModelProperty(value = "服务时长（分钟）") - private java.lang.String serviceDuration; + private String serviceDuration; /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用 Y启用 N未启用", width = 15) @ApiModelProperty(value = "是否启用 Y启用 N未启用") - private java.lang.String izEnabled; + private String izEnabled; /**是否删除 0未删除 1删除*/ @Excel(name = "是否删除 0未删除 1删除", width = 15) @ApiModelProperty(value = "是否删除 0未删除 1删除") @TableLogic - private java.lang.String delFlag; + private String delFlag; /**创建人*/ @ApiModelProperty(value = "创建人") - private java.lang.String createBy; + private String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; + private Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; + private String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; + private Date updateTime; /**所属部门*/ @ApiModelProperty(value = "所属部门") - private java.lang.String sysOrgCode; + private String sysOrgCode; /**语音文件*/ @Excel(name = "语音文件", width = 15) @ApiModelProperty(value = "语音文件") - private java.lang.String mp3File; + private String mp3File; /**视频文件*/ @Excel(name = "视频文件", width = 15) @ApiModelProperty(value = "视频文件") - private java.lang.String mp4File; + private String mp4File; /** * 即时指令图标 */ @ApiModelProperty(value = "即时指令图标") - private java.lang.String immediateFile; + private String immediateFile; /** * 即时指令焦点图标 */ @ApiModelProperty(value = "即时指令图标") - private java.lang.String immediateFileFocus; + private String immediateFileFocus; /** * 服务指令图片大图 */ @ApiModelProperty(value = "服务指令图片大图") - private java.lang.String previewFile; + private String previewFile; /** * 服务指令图片小图 */ @ApiModelProperty(value = "服务指令图片小图") - private java.lang.String previewFileSmall; + private String previewFileSmall; //体型标签 @TableField(exist = false) private String bodyTagName; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceType.java similarity index 80% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceType.java index 78fa3b33..55bf5d19 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareConfigServiceType.java @@ -1,4 +1,4 @@ -package com.nu.modules.nuApiServiceCategory.entity; +package com.nu.modules.biz.care.config.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -30,57 +30,57 @@ import lombok.experimental.Accessors; @TableName("nu_config_service_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class NuConfigServiceType implements Serializable { +public class CareConfigServiceType implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value = "id") - private java.lang.String id; + private String id; /**服务类别id*/ @Excel(name = "服务类别id", width = 15) @ApiModelProperty(value = "服务类别id") - private java.lang.String categoryId; + private String categoryId; /**服务类型名称*/ @Excel(name = "服务类型名称", width = 15) @ApiModelProperty(value = "服务类型名称") - private java.lang.String typeName; + private String typeName; /**排序*/ @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") - private java.lang.Integer sort; + private Integer sort; /**是否启用 Y启用 N未启用*/ @Excel(name = "是否启用 Y启用 N未启用", width = 15) @ApiModelProperty(value = "是否启用 Y启用 N未启用") - private java.lang.String izEnabled; + private String izEnabled; /**是否删除 0未删除 1删除*/ @Excel(name = "是否删除 0未删除 1删除", width = 15) @ApiModelProperty(value = "是否删除 0未删除 1删除") @TableLogic - private java.lang.String delFlag; + private String delFlag; /**创建人*/ @ApiModelProperty(value = "创建人") - private java.lang.String createBy; + private String createBy; /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建日期") - private java.util.Date createTime; + private Date createTime; /**更新人*/ @ApiModelProperty(value = "更新人") - private java.lang.String updateBy; + private String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") - private java.util.Date updateTime; + private Date updateTime; /**所属部门*/ @ApiModelProperty(value = "所属部门") - private java.lang.String sysOrgCode; + private String sysOrgCode; /**网络标记，0为用pad本地静态图片，1为用网络图*/ @ApiModelProperty(value = "网络标记") - private java.lang.String netFlag; + private String netFlag; /**动画图片*/ @ApiModelProperty(value = "动画图片") - private java.lang.String animationPath; + private String animationPath; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuInstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareInstructionTag.java similarity index 96% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuInstructionTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareInstructionTag.java index 4bae5c5f..c995abb5 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/entity/NuInstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/entity/CareInstructionTag.java @@ -1,4 +1,4 @@ -package com.nu.modules.nuApiServiceCategory.entity; +package com.nu.modules.biz.care.config.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -27,7 +27,7 @@ import java.util.Date; @TableName("nu_config_service_instruction_tag") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -public class NuInstructionTag implements Serializable { +public class CareInstructionTag 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/config/mapper/CareConfigServiceCategoryMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceCategoryMapper.java new file mode 100644 index 00000000..dd66ea21 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceCategoryMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory; + +/** + * @Description: 服务类别 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface CareConfigServiceCategoryMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceDirectiveMapper.java new file mode 100644 index 00000000..354799a6 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceDirectiveMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; + +/** + * @Description: 服务指令 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface CareConfigServiceDirectiveMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceTypeMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceTypeMapper.java new file mode 100644 index 00000000..c61b1f8d --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareConfigServiceTypeMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.config.entity.CareConfigServiceType; + +/** + * @Description: 服务类型 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface CareConfigServiceTypeMapper extends BaseMapper { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareInstructionTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareInstructionTagMapper.java new file mode 100644 index 00000000..1d191514 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/CareInstructionTagMapper.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.config.entity.CareInstructionTag; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +public interface CareInstructionTagMapper extends BaseMapper { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceCategoryMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceCategoryMapper.xml similarity index 62% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceCategoryMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceCategoryMapper.xml index 6aab6669..3e7d9ca5 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceCategoryMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceCategoryMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceDirectiveMapper.xml similarity index 88% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceDirectiveMapper.xml index efc4442e..f4ba2e48 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceDirectiveMapper.xml @@ -1,8 +1,8 @@ - + - select * from ( SELECT csd.id AS id, csd.directive_name, diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceTypeMapper.xml similarity index 64% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceTypeMapper.xml index 0ee76143..41298179 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuInstructionTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareConfigServiceTypeMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceTypeMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareInstructionTagMapper.xml similarity index 63% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceTypeMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareInstructionTagMapper.xml index 52107854..297f0aa9 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceTypeMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/mapper/xml/CareInstructionTagMapper.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceCategoryService.java new file mode 100644 index 00000000..713c26ae --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceCategoryService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory; + +/** + * @Description: 服务类别 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface ICareConfigServiceCategoryService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceDirectiveService.java new file mode 100644 index 00000000..83e5d84b --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceDirectiveService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; + +/** + * @Description: 服务指令 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface ICareConfigServiceDirectiveService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceTypeService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceTypeService.java new file mode 100644 index 00000000..5b93c9b6 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareConfigServiceTypeService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.config.entity.CareConfigServiceType; + +/** + * @Description: 服务类型 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +public interface ICareConfigServiceTypeService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareInstructionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareInstructionTagService.java new file mode 100644 index 00000000..cd6dd14a --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/ICareInstructionTagService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.config.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.config.entity.CareInstructionTag; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +public interface ICareInstructionTagService extends IService { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceCategoryServiceImpl.java similarity index 81% rename from nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceCategoryServiceImpl.java index 2da5be89..3c421887 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/service/impl/NuConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceCategoryServiceImpl.java @@ -1,17 +1,18 @@ -package com.nu.modules.nuApiServiceCategory.service.impl; +package com.nu.modules.biz.care.config.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceCategory; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceDirective; -import com.nu.modules.nuApiServiceCategory.entity.NuConfigServiceType; -import com.nu.modules.nuApiServiceCategory.entity.NuInstructionTag; -import com.nu.modules.nuApiServiceCategory.mapper.NuConfigServiceCategoryMapper; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceCategoryService; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceDirectiveService; -import com.nu.modules.nuApiServiceCategory.service.INuConfigServiceTypeService; -import com.nu.modules.nuApiServiceCategory.service.INuInstructionTagService; +import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory; +import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; +import com.nu.modules.biz.care.config.entity.CareConfigServiceType; +import com.nu.modules.biz.care.config.entity.CareInstructionTag; +import com.nu.modules.biz.care.config.mapper.CareConfigServiceCategoryMapper; +import com.nu.modules.biz.care.config.service.ICareConfigServiceCategoryService; +import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService; +import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService; +import com.nu.modules.biz.care.config.service.ICareInstructionTagService; +import com.nu.modules.care.api.ICareDirectiveConfigApi; import com.nu.modules.sysconfig.ISysConfigApi; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -29,59 +30,56 @@ import java.util.Map; * @Version: V1.0 */ @Service -public class NuConfigServiceCategoryServiceImpl extends ServiceImpl implements INuConfigServiceCategoryService { +public class CareConfigServiceCategoryServiceImpl extends ServiceImpl implements ICareConfigServiceCategoryService, ICareDirectiveConfigApi { @Autowired - private INuInstructionTagService nuInstructionTagService; + private ICareInstructionTagService instructionTagService; @Autowired - private INuConfigServiceTypeService nuConfigServiceTypeService; + private ICareConfigServiceTypeService configServiceTypeService; @Autowired - private INuConfigServiceDirectiveService nuConfigServiceDirectiveService; + private ICareConfigServiceDirectiveService configServiceDirectiveService; @Autowired private ISysConfigApi sysConfigApi; @Override - public List> getServiceTree(NuConfigServiceCategory nuConfigServiceCategory) { + public List> getServiceTree() { //缓存媒体地址 String mediaAddress = getOpeMediaAddress(); //查询护理类服务 - QueryWrapper instructionTagQueryWrapper = new QueryWrapper<>(); + QueryWrapper instructionTagQueryWrapper = new QueryWrapper<>(); instructionTagQueryWrapper.eq("iz_enabled", "Y"); instructionTagQueryWrapper.eq("del_flag", "0"); instructionTagQueryWrapper.eq("instruction_type", "1"); - List instructionTagList = nuInstructionTagService.list(instructionTagQueryWrapper); + List instructionTagList = instructionTagService.list(instructionTagQueryWrapper); Map tagMap = new HashMap(); - for (NuInstructionTag par : instructionTagList) { + for (CareInstructionTag 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 = nuConfigServiceTypeService.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 = nuConfigServiceDirectiveService.list(directiveQueryWrapper); + List directiveList = configServiceDirectiveService.list(directiveQueryWrapper); //封装服务指令和服务类型tree集合 List> typeMapList = new ArrayList<>(); - for (NuConfigServiceType par : typeList) { + for (CareConfigServiceType par : typeList) { Map wllxMap = new HashMap(); List> directiceMapList = new ArrayList>(); - for (NuConfigServiceDirective directicePar : directiveList) { + for (CareConfigServiceDirective directicePar : directiveList) { if (StringUtils.equals(directicePar.getTypeId(), par.getId())) { - if(directicePar.getId().equals("10129a2a776db9a44588fdaf4926659b9bc")){ - System.out.println("111"); - } Map directiceMap = new HashMap(); directiceMap.put("id", directicePar.getId()); directiceMap.put("title", directicePar.getDirectiveName()); @@ -163,7 +161,7 @@ public class NuConfigServiceCategoryServiceImpl extends ServiceImpl> treeList = new ArrayList<>(); int index = 0; - for (NuConfigServiceCategory par : categoryList) { + for (CareConfigServiceCategory 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/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java new file mode 100644 index 00000000..f8b4524a --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceDirectiveServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.biz.care.config.service.impl; + +import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; +import com.nu.modules.biz.care.config.mapper.CareConfigServiceDirectiveMapper; +import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 服务指令 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +@Service +public class CareConfigServiceDirectiveServiceImpl extends ServiceImpl implements ICareConfigServiceDirectiveService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceTypeServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceTypeServiceImpl.java new file mode 100644 index 00000000..ae2d6e3f --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareConfigServiceTypeServiceImpl.java @@ -0,0 +1,19 @@ +package com.nu.modules.biz.care.config.service.impl; + +import com.nu.modules.biz.care.config.entity.CareConfigServiceType; +import com.nu.modules.biz.care.config.mapper.CareConfigServiceTypeMapper; +import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 服务类型 + * @Author: yangjun + * @Date: 2025-03-28 + * @Version: V1.0 + */ +@Service +public class CareConfigServiceTypeServiceImpl extends ServiceImpl implements ICareConfigServiceTypeService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareInstructionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareInstructionTagServiceImpl.java new file mode 100644 index 00000000..6a57303c --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/config/service/impl/CareInstructionTagServiceImpl.java @@ -0,0 +1,18 @@ +package com.nu.modules.biz.care.config.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nu.modules.biz.care.config.entity.CareInstructionTag; +import com.nu.modules.biz.care.config.mapper.CareInstructionTagMapper; +import com.nu.modules.biz.care.config.service.ICareInstructionTagService; +import org.springframework.stereotype.Service; + +/** + * @Description: 分类标签 + * @Author: caolei + * @Date: 2025-10-11 + * @Version: V1.0 + */ +@Service +public class CareInstructionTagServiceImpl extends ServiceImpl implements ICareInstructionTagService { + +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPool.java similarity index 94% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPool.java index a447b74a..9682062c 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPool.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPool.java @@ -1,4 +1,4 @@ -package com.nu.modules.directive.datapool.entity; +package com.nu.modules.biz.care.datapool.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -22,10 +22,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("nu_biz_nu_directive_data_pool") +@TableName("nu_biz_nu_care_directive_data_pool") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_directive_data_pool对象", description="服务指令数据池主表") +@ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池主表") public class DataPool implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPoolSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPoolSub.java similarity index 94% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPoolSub.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPoolSub.java index 5b043a50..bae7b085 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/entity/DataPoolSub.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/entity/DataPoolSub.java @@ -1,4 +1,4 @@ -package com.nu.modules.directive.datapool.entity; +package com.nu.modules.biz.care.datapool.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -19,10 +19,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("nu_biz_nu_directive_data_pool_sub") +@TableName("nu_biz_nu_care_directive_data_pool_sub") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_directive_data_pool对象", description="服务指令数据池子表") +@ApiModel(value="nu_biz_nu_care_directive_data_pool对象", description="服务指令数据池子表") public class DataPoolSub implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/job/DataPoolJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/DataPoolJob.java similarity index 87% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/job/DataPoolJob.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/DataPoolJob.java index ef57002c..cb8a11b4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/job/DataPoolJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/job/DataPoolJob.java @@ -1,6 +1,6 @@ -package com.nu.modules.directive.datapool.job; +package com.nu.modules.biz.care.datapool.job; -import com.nu.modules.directive.datapool.service.IDataPoolService; +import com.nu.modules.biz.care.datapool.service.IDataPoolService; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java similarity index 86% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java index b117018b..66d51acd 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolMapper.java @@ -1,8 +1,7 @@ -package com.nu.modules.directive.datapool.mapper; +package com.nu.modules.biz.care.datapool.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directive.datapool.entity.DataPool; -import com.nu.modules.directive.datapool.entity.DataPoolSub; +import com.nu.modules.biz.care.datapool.entity.DataPool; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java similarity index 78% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolSubMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java index b01ffb6d..2c79fac1 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/DataPoolSubMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/DataPoolSubMapper.java @@ -1,8 +1,7 @@ -package com.nu.modules.directive.datapool.mapper; +package com.nu.modules.biz.care.datapool.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directive.datapool.entity.DataPoolSub; - +import com.nu.modules.biz.care.datapool.entity.DataPoolSub; import java.util.List; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolMapper.xml similarity index 96% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolMapper.xml index adfaeb16..2bff55eb 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolMapper.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, @@ -113,7 +113,7 @@ end_time, iz_orders, iz_start - from nu_biz_nu_directive_data_pool + from nu_biz_nu_care_directive_data_pool AND biz_id = #{bizId} @@ -139,7 +139,7 @@ - select id, biz_id, @@ -168,7 +168,7 @@ start_time, end_time, iz_start - from nu_biz_nu_directive_data_pool + from nu_biz_nu_care_directive_data_pool AND nu_id = #{nuId} @@ -285,7 +285,7 @@ insert into ${tableName} select a.*,#{operationFlag} - from nu_biz_nu_directive_data_pool a + from nu_biz_nu_care_directive_data_pool a AND id = #{id} @@ -299,7 +299,7 @@ insert into ${tableName} select a.*,#{operationFlag} - from nu_biz_nu_directive_data_pool_sub a + from nu_biz_nu_care_directive_data_pool_sub a AND main_id = #{id} @@ -311,7 +311,7 @@ - delete from nu_biz_nu_directive_data_pool a + delete from nu_biz_nu_care_directive_data_pool a AND id = #{id} @@ -323,7 +323,7 @@ - delete from nu_biz_nu_directive_data_pool_sub a + delete from nu_biz_nu_care_directive_data_pool_sub a AND main_id = #{id} @@ -433,7 +433,7 @@ ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '护理单元-服务指令-工单日志子表' ROW_FORMAT = Dynamic; - select id, nu_id, @@ -463,7 +463,7 @@ start_time, end_time, iz_start - from nu_biz_nu_directive_order + from nu_biz_nu_care_directive_order where pool_id = #{id} AND iz_start = #{izStart} @@ -471,24 +471,24 @@ insert into ${tableName} select a.*,#{remarks} - from nu_biz_nu_directive_order a + from nu_biz_nu_care_directive_order a where id = #{id} insert into ${tableName} select a.*,#{remarks} - from nu_biz_nu_directive_order_sub a + from nu_biz_nu_care_directive_order_sub a where main_id = #{id} - delete from nu_biz_nu_directive_order + delete from nu_biz_nu_care_directive_order where id = #{id} - delete from nu_biz_nu_directive_order_sub a + delete from nu_biz_nu_care_directive_order_sub a where main_id = #{id} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolSubMapper.xml similarity index 89% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolSubMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolSubMapper.xml index e6902b74..d07a3b02 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolSubMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/mapper/xml/DataPoolSubMapper.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-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolService.java similarity index 53% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolService.java index 11213f99..ffe64071 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolService.java @@ -1,8 +1,8 @@ -package com.nu.modules.directive.datapool.service; +package com.nu.modules.biz.care.datapool.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; -import com.nu.modules.directive.datapool.entity.DataPool; +import com.nu.modules.biz.care.datapool.entity.DataPool; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; import org.jeecg.common.api.vo.Result; /** @@ -20,21 +20,21 @@ public interface IDataPoolService extends IService { /** * 单一生成 - * @param nuBizNuCustomerServer + * @param planBizNuCustomerServer */ - void generateDataPool(NuBizNuCustomerServer nuBizNuCustomerServer); + void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer); /** * 删除 - * @param nuBizNuCustomerServer + * @param planBizNuCustomerServer */ - void deleteDataPool(NuBizNuCustomerServer nuBizNuCustomerServer); + void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer); /** * 修改 - * @param nuBizNuCustomerServer + * @param planBizNuCustomerServer */ - void editDataPool(NuBizNuCustomerServer nuBizNuCustomerServer); + void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer); /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java similarity index 78% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolSubService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java index dcbc21c3..34f3b881 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/IDataPoolSubService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/IDataPoolSubService.java @@ -1,8 +1,7 @@ -package com.nu.modules.directive.datapool.service; +package com.nu.modules.biz.care.datapool.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.directive.datapool.entity.DataPoolSub; - +import com.nu.modules.biz.care.datapool.entity.DataPoolSub; import java.util.List; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolServiceImpl.java similarity index 82% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolServiceImpl.java index 808ed39b..f32e379e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolServiceImpl.java @@ -1,14 +1,13 @@ -package com.nu.modules.directive.datapool.service.impl; +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.NuBizNuCustomerServer.entity.NuBizNuCustomerServer; -import com.nu.modules.directive.datapool.entity.DataPool; -import com.nu.modules.directive.datapool.entity.DataPoolSub; -import com.nu.modules.directive.datapool.mapper.DataPoolMapper; -import com.nu.modules.directive.datapool.service.IDataPoolService; -import com.nu.modules.directive.datapool.service.IDataPoolSubService; -import com.nu.modules.directive.order.entity.OrdersSub; +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.sysconfig.ISysConfigApi; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; @@ -256,38 +255,38 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 单一指令生成到数据池 - * @param nuBizNuCustomerServer + * @param planBizNuCustomerServer */ @Override - public void generateDataPool(NuBizNuCustomerServer nuBizNuCustomerServer){ + public void generateDataPool(PlanBizNuCustomerServer planBizNuCustomerServer){ DataPool dataPool = new DataPool(); - dataPool.setBizId(nuBizNuCustomerServer.getId()); - dataPool.setNuId(nuBizNuCustomerServer.getNuId()); - dataPool.setNuName(nuBizNuCustomerServer.getNuName()); - dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId()); - dataPool.setCustomerName(nuBizNuCustomerServer.getCustomerName()); - if(nuBizNuCustomerServer.getIzPackage().equals("Y")){ - dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); - dataPool.setPackageName(nuBizNuCustomerServer.getDirectiveName()); + dataPool.setBizId(planBizNuCustomerServer.getId()); + dataPool.setNuId(planBizNuCustomerServer.getNuId()); + dataPool.setNuName(planBizNuCustomerServer.getNuName()); + dataPool.setCustomerId(planBizNuCustomerServer.getCustomerId()); + dataPool.setCustomerName(planBizNuCustomerServer.getCustomerName()); + if(planBizNuCustomerServer.getIzPackage().equals("Y")){ + dataPool.setPackageId(planBizNuCustomerServer.getDirectiveId()); + dataPool.setPackageName(planBizNuCustomerServer.getDirectiveName()); }else{ - dataPool.setDirectiveId(nuBizNuCustomerServer.getDirectiveId()); - dataPool.setDirectiveName(nuBizNuCustomerServer.getDirectiveName()); + dataPool.setDirectiveId(planBizNuCustomerServer.getDirectiveId()); + dataPool.setDirectiveName(planBizNuCustomerServer.getDirectiveName()); } - dataPool.setCycleTypeId(nuBizNuCustomerServer.getCycleTypeId()); - dataPool.setCycleType(nuBizNuCustomerServer.getCycleType()); - dataPool.setCycleValue(nuBizNuCustomerServer.getCycleValue()); - dataPool.setPreviewFile(nuBizNuCustomerServer.getPreviewFile()); - dataPool.setNetPreviewFile(nuBizNuCustomerServer.getNetPreviewFile()); - dataPool.setPreviewFileSmall(nuBizNuCustomerServer.getPreviewFileSmall()); - dataPool.setNetPreviewFileSmall(nuBizNuCustomerServer.getNetPreviewFileSmall()); - dataPool.setMp3File(nuBizNuCustomerServer.getMp3File()); - dataPool.setNetMp3File(nuBizNuCustomerServer.getNetMp3File()); - dataPool.setMp4File(nuBizNuCustomerServer.getMp4File()); - dataPool.setNetMp4File(nuBizNuCustomerServer.getNetMp4File()); - dataPool.setIzPackage(nuBizNuCustomerServer.getIzPackage()); - dataPool.setServiceDuration(nuBizNuCustomerServer.getServiceDuration()); - dataPool.setServiceContent(nuBizNuCustomerServer.getServiceContent()); - String startTime = nuBizNuCustomerServer.getStartTime(); + dataPool.setCycleTypeId(planBizNuCustomerServer.getCycleTypeId()); + dataPool.setCycleType(planBizNuCustomerServer.getCycleType()); + dataPool.setCycleValue(planBizNuCustomerServer.getCycleValue()); + dataPool.setPreviewFile(planBizNuCustomerServer.getPreviewFile()); + dataPool.setNetPreviewFile(planBizNuCustomerServer.getNetPreviewFile()); + dataPool.setPreviewFileSmall(planBizNuCustomerServer.getPreviewFileSmall()); + dataPool.setNetPreviewFileSmall(planBizNuCustomerServer.getNetPreviewFileSmall()); + dataPool.setMp3File(planBizNuCustomerServer.getMp3File()); + dataPool.setNetMp3File(planBizNuCustomerServer.getNetMp3File()); + dataPool.setMp4File(planBizNuCustomerServer.getMp4File()); + dataPool.setNetMp4File(planBizNuCustomerServer.getNetMp4File()); + dataPool.setIzPackage(planBizNuCustomerServer.getIzPackage()); + dataPool.setServiceDuration(planBizNuCustomerServer.getServiceDuration()); + dataPool.setServiceContent(planBizNuCustomerServer.getServiceContent()); + String startTime = planBizNuCustomerServer.getStartTime(); String[] starts = startTime.split(":"); String hour = starts[0]; String minute = starts[1]; @@ -297,7 +296,7 @@ public class DataPoolServiceImpl extends ServiceImpl i c.set(Calendar.SECOND,0); c.set(Calendar.MILLISECOND,0); dataPool.setStartTime(c.getTime()); - String endTime = nuBizNuCustomerServer.getEndTime(); + String endTime = planBizNuCustomerServer.getEndTime(); String[] ends = endTime.split(":"); hour = ends[0]; minute = ends[1]; @@ -311,11 +310,11 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 删除数据池 - * @param nuBizNuCustomerServer + * @param planBizNuCustomerServer */ @Override - public void deleteDataPool(NuBizNuCustomerServer nuBizNuCustomerServer) { - String startTime = nuBizNuCustomerServer.getStartTime(); + public void deleteDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) { + String startTime = planBizNuCustomerServer.getStartTime(); String[] starts = startTime.split(":"); String hour = starts[0]; String minute = starts[1]; @@ -325,17 +324,17 @@ public class DataPoolServiceImpl extends ServiceImpl i c.set(Calendar.SECOND,0); c.set(Calendar.MILLISECOND,0); DataPool dataPool = new DataPool(); - dataPool.setBizId(nuBizNuCustomerServer.getId()); - dataPool.setNuId(nuBizNuCustomerServer.getNuId()); - dataPool.setCustomerId(nuBizNuCustomerServer.getCustomerId()); + dataPool.setBizId(planBizNuCustomerServer.getId()); + dataPool.setNuId(planBizNuCustomerServer.getNuId()); + dataPool.setCustomerId(planBizNuCustomerServer.getCustomerId()); dataPool.setStartTime(c.getTime()); // dataPool.setIzOrders("N"); dataPool.setIzStart("N"); - String izPackage = nuBizNuCustomerServer.getIzPackage(); + String izPackage = planBizNuCustomerServer.getIzPackage(); if(izPackage.equals("Y")){ - dataPool.setPackageId(nuBizNuCustomerServer.getDirectiveId()); + dataPool.setPackageId(planBizNuCustomerServer.getDirectiveId()); }else{ - dataPool.setDirectiveId(nuBizNuCustomerServer.getDirectiveId()); + dataPool.setDirectiveId(planBizNuCustomerServer.getDirectiveId()); } DataPool pool = baseMapper.queryPoolOne(dataPool); if(pool!=null){ @@ -367,7 +366,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * 创建工单日志表 */ private void addOrdersLog(String dateStr,DataPool dataPool){ - String tableName = "nu_biz_nu_directive_order_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); + String tableName = "nu_biz_nu_care_directive_order_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); dataPool.setTableName(tableName); baseMapper.createOrdersLog(dataPool);//创建日志主表 dataPool.setRemarks("计划删除，删除未开始工单"); @@ -379,7 +378,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * 创建工单日志表 */ private void addOrdersSubLog(String dateStr,DataPool dataPool){ - String tableName = "nu_biz_nu_directive_order_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); + String tableName = "nu_biz_nu_care_directive_order_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); dataPool.setTableName(tableName); baseMapper.createOrdersLogSub(dataPool);//创建日志子表 dataPool.setRemarks("计划删除，删除未开始工单"); @@ -389,12 +388,12 @@ public class DataPoolServiceImpl extends ServiceImpl i /** * 编辑数据池 - * @param nuBizNuCustomerServer + * @param planBizNuCustomerServer */ @Override - public void editDataPool(NuBizNuCustomerServer nuBizNuCustomerServer) { - deleteDataPool(nuBizNuCustomerServer); - DataPool dataPool = baseMapper.queryPlanById(nuBizNuCustomerServer.getId()); + public void editDataPool(PlanBizNuCustomerServer planBizNuCustomerServer) { + deleteDataPool(planBizNuCustomerServer); + DataPool dataPool = baseMapper.queryPlanById(planBizNuCustomerServer.getId()); DataPool pool = baseMapper.queryPoolOne(dataPool); if(pool==null){ addDataPool(dataPool); @@ -405,7 +404,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * 创建日志表 */ private void addDataPoolLog(String dateStr,String id){ - String tableName = "nu_biz_nu_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); + String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); DataPool dataPool = new DataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLog(dataPool);//创建日志主表 @@ -419,7 +418,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * 创建日志表 */ private void addDataPoolSubLog(String dateStr,String id){ - String tableName = "nu_biz_nu_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); + String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); DataPool dataPool = new DataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLogSub(dataPool);//创建日志子表 @@ -448,7 +447,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * 创建日志表 */ private void addDataPoolLogByClean(String dateStr){ - String tableName = "nu_biz_nu_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); + String tableName = "nu_biz_nu_care_directive_data_pool_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); DataPool dataPool = new DataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLog(dataPool);//创建日志主表 @@ -467,7 +466,7 @@ public class DataPoolServiceImpl extends ServiceImpl i * 创建日志表 */ private void addDataPoolSubLogByClean(String dateStr){ - String tableName = "nu_biz_nu_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); + String tableName = "nu_biz_nu_care_directive_data_pool_sub_log_"+dateStr.substring(2, 4)+dateStr.substring(5, 7); DataPool dataPool = new DataPool(); dataPool.setTableName(tableName); baseMapper.createDataPoolLogSub(dataPool);//创建日志子表 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolSubServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolSubServiceImpl.java similarity index 74% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolSubServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolSubServiceImpl.java index 7c295cf6..ddeead43 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/service/impl/DataPoolSubServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/datapool/service/impl/DataPoolSubServiceImpl.java @@ -1,12 +1,11 @@ -package com.nu.modules.directive.datapool.service.impl; +package com.nu.modules.biz.care.datapool.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directive.datapool.entity.DataPoolSub; -import com.nu.modules.directive.datapool.mapper.DataPoolSubMapper; -import com.nu.modules.directive.datapool.service.IDataPoolSubService; +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 lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; - import java.util.List; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/Orders.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/Orders.java similarity index 96% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/Orders.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/Orders.java index f2a90a29..45f345c7 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/Orders.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/Orders.java @@ -1,4 +1,4 @@ -package com.nu.modules.directive.order.entity; +package com.nu.modules.biz.care.order.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -23,10 +23,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("nu_biz_nu_directive_order") +@TableName("nu_biz_nu_care_directive_order") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_directive_order对象", description="服务指令工单主表") +@ApiModel(value="nu_biz_nu_care_directive_order对象", description="服务指令工单主表") public class Orders implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/OrdersSub.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/OrdersSub.java similarity index 95% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/OrdersSub.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/OrdersSub.java index 98eb7436..d20c923a 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/entity/OrdersSub.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/OrdersSub.java @@ -1,4 +1,4 @@ -package com.nu.modules.directive.order.entity; +package com.nu.modules.biz.care.order.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -21,10 +21,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("nu_biz_nu_directive_order_sub") +@TableName("nu_biz_nu_care_directive_order_sub") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_biz_nu_directive_order_sub对象", description="服务指令工单子表") +@ApiModel(value="nu_biz_nu_care_directive_order_sub对象", description="服务指令工单子表") public class OrdersSub implements Serializable { private static final long serialVersionUID = 1L; /**id*/ diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/job/OrdersJob.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/OrdersJob.java similarity index 87% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/job/OrdersJob.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/OrdersJob.java index 0ecd5154..b661afca 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/job/OrdersJob.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/job/OrdersJob.java @@ -1,6 +1,6 @@ -package com.nu.modules.directive.order.job; +package com.nu.modules.biz.care.order.job; -import com.nu.modules.directive.order.service.IOrdersService; +import com.nu.modules.biz.care.order.service.IOrdersService; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java similarity index 87% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java index 922b8d4d..45be84cb 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersMapper.java @@ -1,9 +1,8 @@ -package com.nu.modules.directive.order.mapper; +package com.nu.modules.biz.care.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directive.order.entity.Orders; +import com.nu.modules.biz.care.order.entity.Orders; import org.apache.ibatis.annotations.Param; - import java.util.Date; import java.util.List; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersSubMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java similarity index 66% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersSubMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java index 7d66094e..d8051cf5 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/OrdersSubMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/OrdersSubMapper.java @@ -1,9 +1,8 @@ -package com.nu.modules.directive.order.mapper; +package com.nu.modules.biz.care.order.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directive.order.entity.Orders; -import com.nu.modules.directive.order.entity.OrdersSub; - +import com.nu.modules.biz.care.order.entity.Orders; +import com.nu.modules.biz.care.order.entity.OrdersSub; import java.util.List; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersMapper.xml similarity index 89% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersMapper.xml index d9951b1b..5d865116 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersMapper.xml @@ -1,8 +1,8 @@ - + - select a.id as poolId, a.biz_id as bizId, @@ -31,13 +31,13 @@ a.start_time as startTime, a.end_time as endTime, (case when b.orderly is null then 2 else 1 end) as orderEmp - from nu_biz_nu_directive_data_pool a + from nu_biz_nu_care_directive_data_pool a left join nu_biz_elder_info b on a.customer_id = b.id where a.iz_orders = 'N' order by a.start_time,orderEmp,a.nu_id - select distinct a.id as employeeId, @@ -60,14 +60,14 @@ round(sum(ifnull(com_price,0)),4) as totalComPrice, max(start_time) as maxTime, sum(case when iz_finish='N' then 1 else 0 end) as ownCn - from nu_biz_nu_directive_order_sub + from nu_biz_nu_care_directive_order_sub where start_time >=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') and start_time <=DATE_FORMAT(NOW(), '%Y-%m-%d 23:59:59') group by employee_id ) e on a.id = e.employee_id left join ( select employee_id,sum(case when iz_finish='N' then 1 else 0 end) as orderNum - from nu_biz_nu_directive_order_sub + from nu_biz_nu_care_directive_order_sub where start_time = #{startTime} or (start_time < #{startTime} and end_time > #{startTime}) group by employee_id @@ -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-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersSubMapper.xml similarity index 90% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersSubMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersSubMapper.xml index 88487b18..9cd03e64 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/mapper/xml/OrdersSubMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/OrdersSubMapper.xml @@ -1,8 +1,8 @@ - + - select id as poolSubId, nu_id as nuId, @@ -35,7 +35,7 @@ iz_package as izPackage, start_time as startTime, end_time as endTime - from nu_biz_nu_directive_data_pool_sub + from nu_biz_nu_care_directive_data_pool_sub where main_id = #{poolId} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersService.java similarity index 75% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersService.java index 1dc2dedd..df1277d1 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersService.java @@ -1,7 +1,7 @@ -package com.nu.modules.directive.order.service; +package com.nu.modules.biz.care.order.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.directive.order.entity.Orders; +import com.nu.modules.biz.care.order.entity.Orders; import org.jeecg.common.api.vo.Result; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersSubService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java similarity index 66% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersSubService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java index 7dae3d31..24103ed4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/IOrdersSubService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/IOrdersSubService.java @@ -1,9 +1,8 @@ -package com.nu.modules.directive.order.service; +package com.nu.modules.biz.care.order.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.directive.order.entity.Orders; -import com.nu.modules.directive.order.entity.OrdersSub; - +import com.nu.modules.biz.care.order.entity.Orders; +import com.nu.modules.biz.care.order.entity.OrdersSub; import java.util.List; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/impl/OrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersServiceImpl.java similarity index 97% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/impl/OrdersServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersServiceImpl.java index 1491aea1..a9c9aa15 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/impl/OrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersServiceImpl.java @@ -1,16 +1,15 @@ -package com.nu.modules.directive.order.service.impl; +package com.nu.modules.biz.care.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directive.order.entity.Orders; -import com.nu.modules.directive.order.entity.OrdersSub; -import com.nu.modules.directive.order.mapper.OrdersMapper; -import com.nu.modules.directive.order.service.IOrdersService; -import com.nu.modules.directive.order.service.IOrdersSubService; +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 lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.*; import java.util.stream.Collectors; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/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 similarity index 65% rename from nursing-unit-api/src/main/java/com/nu/modules/directive/order/service/impl/OrdersSubServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/OrdersSubServiceImpl.java index 0e97caf8..1731fa0e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/directive/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 @@ -1,13 +1,12 @@ -package com.nu.modules.directive.order.service.impl; +package com.nu.modules.biz.care.order.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directive.order.entity.Orders; -import com.nu.modules.directive.order.entity.OrdersSub; -import com.nu.modules.directive.order.mapper.OrdersSubMapper; -import com.nu.modules.directive.order.service.IOrdersSubService; +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; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerElderTag.java similarity index 92% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerElderTag.java index a69b7947..be367216 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerElderTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerElderTag.java @@ -1,4 +1,4 @@ -package com.nu.modules.NuBizNuCustomerServer.entity; +package com.nu.modules.biz.care.plan.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -15,7 +15,6 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; -import java.util.List; /** * @Description: 护理单元客户配置长者标签 @@ -28,7 +27,7 @@ import java.util.List; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_customer_elder_tag对象", description="护理单元客户配置长者标签") -public class NuBizNuCustomerElderTag implements Serializable { +public class PlanBizNuCustomerElderTag implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @@ -67,22 +66,22 @@ public class NuBizNuCustomerElderTag implements Serializable { @Excel(name = "图标", width = 15) @ApiModelProperty(value = "图标") @TableField(exist = false) - private java.lang.String pic; + private String pic; /**图标*/ @Excel(name = "图标", width = 15) @ApiModelProperty(value = "图标") @TableField(exist = false) - private java.lang.String netPic; + private String netPic; /**焦点图标*/ @Excel(name = "焦点图标", width = 15) @ApiModelProperty(value = "焦点图标") @TableField(exist = false) - private java.lang.String picFocus; + private String picFocus; /**图标*/ @Excel(name = "图标", width = 15) @ApiModelProperty(value = "图标") @TableField(exist = false) - private java.lang.String netPicFocus; + private String netPicFocus; /**创建人*/ @ApiModelProperty(value = "创建人") private String createBy; diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServer.java similarity index 82% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServer.java index 99e582b9..769b5df6 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServer.java @@ -1,21 +1,14 @@ -package com.nu.modules.NuBizNuCustomerServer.entity; +package com.nu.modules.biz.care.plan.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; import java.util.Date; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.*; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -30,7 +23,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令") -public class NuBizNuCustomerServer implements Serializable { +public class PlanBizNuCustomerServer implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @@ -105,13 +98,13 @@ public class NuBizNuCustomerServer implements Serializable { /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date createTime; + private Date createTime; /**更新人*/ private String updateBy; /**更新日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date updateTime; + private Date updateTime; /**所属部门*/ private String sysOrgCode; /**是否是服务指令包 N否 Y是*/ @@ -121,15 +114,15 @@ public class NuBizNuCustomerServer 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; + private List tagList; /**服务包中的服务列表**/ @TableField(exist = false) - private List directivesList; + private List directivesList; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java similarity index 88% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java index c9e41422..3996433e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanBizNuCustomerServerInstant.java @@ -1,7 +1,6 @@ -package com.nu.modules.NuBizNuCustomerServer.entity; +package com.nu.modules.biz.care.plan.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -27,7 +26,7 @@ import java.util.Date; @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令") -public class NuBizNuCustomerServerInstant implements Serializable { +public class PlanBizNuCustomerServerInstant implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @@ -76,28 +75,28 @@ public class NuBizNuCustomerServerInstant implements Serializable { private String directiveName; /**即时指令图标*/ @ApiModelProperty(value = "即时指令图标") - private java.lang.String immediateFile; + private String immediateFile; /**即时指令图标*/ @ApiModelProperty(value = "即时指令图标") - private java.lang.String netImmediateFile; + private String netImmediateFile; /**即时指令焦点图标*/ @ApiModelProperty(value = "即时指令图标") - private java.lang.String immediateFileFocus; + private String immediateFileFocus; /**即时指令焦点图标*/ @ApiModelProperty(value = "即时指令图标") - private java.lang.String netImmediateFileFocus; + private String netImmediateFileFocus; /**服务指令图片大图*/ @ApiModelProperty(value = "服务指令图片大图") - private java.lang.String previewFile; + private String previewFile; /**服务指令图片大图*/ @ApiModelProperty(value = "服务指令图片大图") - private java.lang.String netPreviewFile; + private String netPreviewFile; /**服务指令图片小图*/ @ApiModelProperty(value = "服务指令图片小图") - private java.lang.String previewFileSmall; + private String previewFileSmall; /**服务指令图片小图*/ @ApiModelProperty(value = "服务指令图片小图") - private java.lang.String netPreviewFileSmall; + private String netPreviewFileSmall; /**指令音频文件*/ @ApiModelProperty(value = "指令音频文件") private String mp3File; @@ -135,8 +134,8 @@ public class NuBizNuCustomerServerInstant implements Serializable { private String sysOrgCode; /**是否是服务指令包 N否 Y是*/ @ApiModelProperty(value = "是否是服务指令包") - private java.lang.String izPackage; + private String izPackage; @ApiModelProperty(value = "排序") - private java.lang.Long sort; + private Long sort; } diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/ConfigServiceDirectiveDto.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanConfigServiceDirective.java similarity index 95% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/ConfigServiceDirectiveDto.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanConfigServiceDirective.java index 50970cf6..9093c390 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/ConfigServiceDirectiveDto.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanConfigServiceDirective.java @@ -1,12 +1,8 @@ -package com.nu.modules.NuBizNuCustomerServer.entity; +package com.nu.modules.biz.care.plan.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; @@ -19,7 +15,7 @@ import java.io.Serializable; * @Version: V1.0 */ @Data -public class ConfigServiceDirectiveDto implements Serializable { +public class PlanConfigServiceDirective implements Serializable { private static final long serialVersionUID = 1L; /** diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java similarity index 90% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java index 6f635580..b3229826 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/DirectivePackageDto.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/entity/PlanDirectivePackage.java @@ -1,4 +1,4 @@ -package com.nu.modules.NuBizNuCustomerServer.entity; +package com.nu.modules.biz.care.plan.entity; import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; @@ -16,7 +16,7 @@ import java.util.List; * @Version: V1.0 */ @Data -public class DirectivePackageDto implements Serializable { +public class PlanDirectivePackage implements Serializable { private static final long serialVersionUID = 1L; /**id*/ @@ -54,6 +54,6 @@ public class DirectivePackageDto 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/PlanBizNuCustomerElderTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerElderTagMapper.java new file mode 100644 index 00000000..571dd5fa --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerElderTagMapper.java @@ -0,0 +1,19 @@ +package com.nu.modules.biz.care.plan.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 护理单元客户配置长者标签 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +public interface PlanBizNuCustomerElderTagMapper extends BaseMapper { + List getElderTags(PlanBizNuCustomerElderTag planBizNuCustomerElderTag); + + int deleteByIdPhysic(@Param("id") String id); +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java similarity index 54% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java index 831dfbce..710686a2 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/NuBizNuCustomerServerInstantMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerInstantMapper.java @@ -1,7 +1,7 @@ -package com.nu.modules.NuBizNuCustomerServer.mapper; +package com.nu.modules.biz.care.plan.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServerInstant; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant; 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 NuBizNuCustomerServerInstantMapper extends BaseMapper { +public interface PlanBizNuCustomerServerInstantMapper 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/PlanBizNuCustomerServerMapper.java new file mode 100644 index 00000000..e263dbf7 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/PlanBizNuCustomerServerMapper.java @@ -0,0 +1,24 @@ +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.PlanDirectivePackage; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 护理单元客户配置服务指令 + * @Author: yangjun + * @Date: 2025-03-31 + * @Version: V1.0 + */ +public interface PlanBizNuCustomerServerMapper extends BaseMapper { + + List getGroupPositioning(PlanBizNuCustomerServer planBizNuCustomerServer); + + List getNcPackagelist(@Param("params") PlanDirectivePackage directivePackageDto); + + List getNcDirectiveList(@Param("params") PlanBizNuCustomerServer planBizNuCustomerServer); + + int deleteByIdPhysic(@Param("id") String id); +} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerElderTagMapper.xml similarity index 80% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerElderTagMapper.xml index 0e6c18da..fa704c76 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerElderTagMapper.xml @@ -1,11 +1,11 @@ - + delete from nu_biz_nu_customer_elder_tag where id = #{id} - select a.id as tagId, a.type as tagType, diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerInstantMapper.xml similarity index 73% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerInstantMapper.xml index c5e3f805..f8a35626 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerInstantMapper.xml @@ -1,6 +1,6 @@ - + delete from nu_biz_nu_customer_care_server_instant where id = #{id} diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml similarity index 79% rename from nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml index 7f14110d..fbe78279 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/mapper/xml/PlanBizNuCustomerServerMapper.xml @@ -1,16 +1,16 @@ - + delete from nu_biz_nu_customer_care_server where id = #{id} - - select id, package_name as packageName, total_duration as serviceDuration, @@ -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/IPlanBizNuCustomerElderTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerElderTagService.java new file mode 100644 index 00000000..86874b8a --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerElderTagService.java @@ -0,0 +1,18 @@ +package com.nu.modules.biz.care.plan.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerElderTag; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * @Description: 护理单元客户配置长者标签 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +public interface IPlanBizNuCustomerElderTagService extends IService { + List getElderTags(PlanBizNuCustomerElderTag planBizNuCustomerElderTag); + + int deleteByIdPhysic(String id); +} 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/IPlanBizNuCustomerServerInstantService.java new file mode 100644 index 00000000..c087eab6 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerInstantService.java @@ -0,0 +1,15 @@ +package com.nu.modules.biz.care.plan.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServerInstant; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +public interface IPlanBizNuCustomerServerInstantService 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/IPlanBizNuCustomerServerService.java new file mode 100644 index 00000000..656e5952 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/IPlanBizNuCustomerServerService.java @@ -0,0 +1,14 @@ +package com.nu.modules.biz.care.plan.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.nu.modules.biz.care.plan.entity.PlanBizNuCustomerServer; + +/** + * @Description: 护理单元客户配置服务指令 + * @Author: yangjun + * @Date: 2025-03-31 + * @Version: V1.0 + */ +public interface IPlanBizNuCustomerServerService extends IService { + +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerElderTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerElderTagServiceImpl.java new file mode 100644 index 00000000..a698a28c --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerElderTagServiceImpl.java @@ -0,0 +1,27 @@ +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.PlanBizNuCustomerElderTag; +import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerElderTagMapper; +import com.nu.modules.biz.care.plan.service.IPlanBizNuCustomerElderTagService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description: 护理单元客户配置服务指令即时指令 + * @Author: caolei + * @Date: 2025-10-13 + * @Version: V1.0 + */ +@Service +public class PlanBizNuCustomerElderTagServiceImpl extends ServiceImpl implements IPlanBizNuCustomerElderTagService { + public List getElderTags(PlanBizNuCustomerElderTag PlanBizNuCustomerElderTag){ + return baseMapper.getElderTags(PlanBizNuCustomerElderTag); + } + + @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/PlanBizNuCustomerServerInstantServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerInstantServiceImpl.java new file mode 100644 index 00000000..31995b41 --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerInstantServiceImpl.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.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/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java new file mode 100644 index 00000000..4eafe89e --- /dev/null +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/plan/service/impl/PlanBizNuCustomerServerServiceImpl.java @@ -0,0 +1,441 @@ +package com.nu.modules.biz.care.plan.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.nu.entity.CareDirectiveInstantEntity; +import com.nu.entity.CareDirectivePackageEntity; +import com.nu.entity.ElderTagEntity; +import org.springframework.beans.BeanUtils; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.nu.entity.CareDirectiveEntity; +import com.nu.modules.biz.care.config.entity.CareConfigServiceCategory; +import com.nu.modules.biz.care.config.entity.CareConfigServiceDirective; +import com.nu.modules.biz.care.config.entity.CareConfigServiceType; +import com.nu.modules.biz.care.config.service.ICareConfigServiceCategoryService; +import com.nu.modules.biz.care.config.service.ICareConfigServiceDirectiveService; +import com.nu.modules.biz.care.config.service.ICareConfigServiceTypeService; +import com.nu.modules.biz.care.datapool.service.impl.DataPoolServiceImpl; +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.PlanDirectivePackage; +import com.nu.modules.biz.care.plan.mapper.PlanBizNuCustomerServerMapper; +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.care.api.ICareDirectivePlanApi; +import com.nu.modules.sysconfig.ISysConfigApi; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.*; + +/** + * @Description: 护理单元客户配置服务指令 + * @Author: yangjun + * @Date: 2025-03-31 + * @Version: V1.0 + */ +@Service +public class PlanBizNuCustomerServerServiceImpl extends ServiceImpl implements IPlanBizNuCustomerServerService, ICareDirectivePlanApi { + + @Autowired + private ICareConfigServiceCategoryService careConfigServiceCategoryService; + @Autowired + private ICareConfigServiceTypeService careConfigServiceTypeService; + @Autowired + private ICareConfigServiceDirectiveService careConfigServiceDirectiveService; + @Autowired + private IPlanBizNuCustomerServerInstantService planBizNuCustomerServerInstantService; + @Autowired + private IPlanBizNuCustomerElderTagService planBizNuCustomerElderTagService; + @Autowired + private ISysConfigApi sysConfigApi; + @Autowired + private DataPoolServiceImpl dataPoolServiceImpl; + + private String serverNetUrl; + + @Override + public Map getPlanList(CareDirectiveEntity careDirectiveEntity) { + Map resMap = new HashMap<>(); + //服务指令计划 + 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) { + if (par.getIzPackage().equals("Y")) { + String directiveId = par.getDirectiveId(); + if (directiveId != null && !directiveId.equals("")) { + PlanBizNuCustomerServer packageDirective = new PlanBizNuCustomerServer(); + packageDirective.setPackageId(directiveId); + List pdList = baseMapper.getNcDirectiveList(packageDirective); + for (PlanBizNuCustomerServer pd : pdList) { + getNetImages(pd); + } + par.setDirectivesList(pdList); + } + } + } + + resMap.put("serviceList", groupList);//服务指令计划 + //即时指令 + 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); +// for (PlanBizNuCustomerServerInstant pari : instantList) { +// getInstantNetImages(pari); +// } + resMap.put("instantList", instantList); + PlanBizNuCustomerElderTag elderTag = new PlanBizNuCustomerElderTag(); + //体型标签 + elderTag.setNuId(careDirectiveEntity.getNuId()); + elderTag.setCustomerId(careDirectiveEntity.getCustomerId()); + elderTag.setTagType("tx"); + List bodyTagList = planBizNuCustomerElderTagService.getElderTags(elderTag); + for (PlanBizNuCustomerElderTag bt : bodyTagList) { + if (bt.getPic() != null) { + String pic = getImageNetUrl(bt.getPic()); + bt.setNetPic(pic); + } else { + bt.setPic(""); + bt.setNetPic(""); + } + if (bt.getPicFocus() != null) { + String picFocus = getImageNetUrl(bt.getPicFocus()); + bt.setNetPicFocus(picFocus); + } else { + bt.setPicFocus(""); + bt.setNetPicFocus(""); + } + } + resMap.put("bodyTagList", bodyTagList); + //情绪标签 + elderTag.setTagType("qx"); + List emotionTagList = planBizNuCustomerElderTagService.getElderTags(elderTag); + for (PlanBizNuCustomerElderTag et : emotionTagList) { + if (et.getPic() != null) { + String pic = getImageNetUrl(et.getPic()); + et.setNetPic(pic); + } else { + et.setPic(""); + et.setNetPic(""); + } + if (et.getPicFocus() != null) { + String picFocus = getImageNetUrl(et.getPicFocus()); + et.setNetPicFocus(picFocus); + } else { + et.setPicFocus(""); + et.setNetPicFocus(""); + } + } + resMap.put("emotionTagList", emotionTagList); + return resMap; + } + + private PlanBizNuCustomerServer getNetImages(PlanBizNuCustomerServer par) { + if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) { + String immediateFile = getImageNetUrl(par.getImmediateFile()); + par.setNetImmediateFile(immediateFile); + } else { + par.setImmediateFile(""); + par.setNetImmediateFile(""); + } + if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) { + String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); + par.setNetImmediateFileFocus(immediateFileFocus); + } else { + par.setImmediateFileFocus(""); + par.setNetImmediateFileFocus(""); + } + if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) { + String previewFile = getImageNetUrl(par.getPreviewFile()); + par.setNetPreviewFile(previewFile); + } else { + par.setPreviewFile(""); + par.setNetPreviewFile(""); + } + if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) { + String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); + par.setNetPreviewFileSmall(previewFileSmall); + } else { + par.setPreviewFileSmall(""); + par.setNetPreviewFileSmall(""); + } + if (par.getMp3File() != null && !par.getMp3File().equals("")) { + String netMp3File = getImageNetUrl(par.getMp3File()); + par.setNetMp3File(netMp3File); + } else { + par.setMp3File(""); + par.setNetMp3File(""); + } + if (par.getMp4File() != null && !par.getMp4File().equals("")) { + String netMp4File = getImageNetUrl(par.getMp4File()); + par.setNetMp4File(netMp4File); + } else { + par.setMp4File(""); + par.setNetMp4File(""); + } + return par; + } + + private PlanBizNuCustomerServerInstant getInstantNetImages(PlanBizNuCustomerServerInstant par) { + if (par.getImmediateFile() != null && !par.getImmediateFile().equals("")) { + String immediateFile = getImageNetUrl(par.getImmediateFile()); + par.setNetImmediateFile(immediateFile); + } else { + par.setImmediateFile(""); + par.setNetImmediateFile(""); + } + if (par.getImmediateFileFocus() != null && !par.getImmediateFileFocus().equals("")) { + String immediateFileFocus = getImageNetUrl(par.getImmediateFileFocus()); + par.setNetImmediateFileFocus(immediateFileFocus); + } else { + par.setImmediateFileFocus(""); + par.setNetImmediateFileFocus(""); + } + if (par.getPreviewFile() != null && !par.getPreviewFile().equals("")) { + String previewFile = getImageNetUrl(par.getPreviewFile()); + par.setNetPreviewFile(previewFile); + } else { + par.setPreviewFile(""); + par.setNetPreviewFile(""); + } + if (par.getPreviewFileSmall() != null && !par.getPreviewFileSmall().equals("")) { + String previewFileSmall = getImageNetUrl(par.getPreviewFileSmall()); + par.setNetPreviewFileSmall(previewFileSmall); + } else { + par.setPreviewFileSmall(""); + par.setNetPreviewFileSmall(""); + } + if (par.getMp3File() != null && !par.getMp3File().equals("")) { + String netMp3File = getImageNetUrl(par.getMp3File()); + par.setNetMp3File(netMp3File); + } else { + par.setMp3File(""); + par.setNetMp3File(""); + } + if (par.getMp4File() != null && !par.getMp4File().equals("")) { + String netMp4File = getImageNetUrl(par.getMp4File()); + par.setNetMp4File(netMp4File); + } else { + par.setMp4File(""); + par.setNetMp4File(""); + } + return par; + } + + @Override + public CareDirectiveEntity addNuCustomerServer(CareDirectiveEntity careDirectiveEntity) { + PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer(); + BeanUtils.copyProperties(careDirectiveEntity, planBizNuCustomerServer); + CareConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId()); + CareConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId()); + CareConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId()); + planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId()); + planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName()); + planBizNuCustomerServer.setTypeId(careConfigServiceType.getId()); + planBizNuCustomerServer.setTypeName(careConfigServiceType.getTypeName()); + baseMapper.insert(planBizNuCustomerServer); + BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity); + return careDirectiveEntity; + } + + @Override + public CareDirectiveEntity editNuCustomerServer(CareDirectiveEntity careDirectiveEntity) { + PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer(); + BeanUtils.copyProperties(careDirectiveEntity, planBizNuCustomerServer); + CareConfigServiceDirective careConfigServiceDirective = careConfigServiceDirectiveService.getById(planBizNuCustomerServer.getDirectiveId()); + CareConfigServiceCategory careConfigServiceCategory = careConfigServiceCategoryService.getById(careConfigServiceDirective.getCategoryId()); + CareConfigServiceType careConfigServiceType = careConfigServiceTypeService.getById(careConfigServiceDirective.getTypeId()); + planBizNuCustomerServer.setCategoryId(careConfigServiceCategory.getId()); + planBizNuCustomerServer.setCategoryName(careConfigServiceCategory.getCategoryName()); + planBizNuCustomerServer.setTypeId(careConfigServiceType.getId()); + planBizNuCustomerServer.setTypeName(careConfigServiceType.getTypeName()); + baseMapper.updateById(planBizNuCustomerServer); + BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity); + return careDirectiveEntity; + } + + @Override + public void deleteNuCustomerServer(String id){ + baseMapper.deleteById(id); + } + + @Override + public CareDirectiveEntity getNuCustomerServerById(String id){ + PlanBizNuCustomerServer planBizNuCustomerServer = this.getById(id); + CareDirectiveEntity careDirectiveEntity = new CareDirectiveEntity(); + BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity); + return careDirectiveEntity; + } + + @Override + public void addBatch(CareDirectiveEntity careDirectiveEntity) { + //保存长者标签 + String nuId = careDirectiveEntity.getNuId(); + String customerId = careDirectiveEntity.getCustomerId(); + QueryWrapper tagQueryWrapper = new QueryWrapper<>(); + tagQueryWrapper.eq("nu_id", nuId); + tagQueryWrapper.eq("customer_id", customerId); + planBizNuCustomerElderTagService.remove(tagQueryWrapper); + List tagList = careDirectiveEntity.getTagList(); + List elderTagList = BeanUtil.copyToList(tagList,PlanBizNuCustomerElderTag.class); + if (elderTagList.size() > 0) { + for (PlanBizNuCustomerElderTag tg : elderTagList) { + tg.setNuId(nuId); + tg.setNuName(careDirectiveEntity.getNuName()); + tg.setCustomerId(customerId); + tg.setCustomerName(careDirectiveEntity.getCustomerName()); + } + planBizNuCustomerElderTagService.saveBatch(elderTagList); + } + } + + @Override + public CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity) { + PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer(); + BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer); + baseMapper.insert(planBizNuCustomerServer); + //TODO 增加日志 + + //单一指令生成到数据池 + dataPoolServiceImpl.generateDataPool(planBizNuCustomerServer); + BeanUtils.copyProperties(planBizNuCustomerServer, careDirectiveEntity); + return careDirectiveEntity; + } + + @Override + public void editDirective(CareDirectiveEntity careDirectiveEntity) { + PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer(); + BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer); + PlanBizNuCustomerServer entity = baseMapper.selectById(careDirectiveEntity.getId()); + baseMapper.updateById(planBizNuCustomerServer); + //TODO 增加日志 + //调用方法先删除数据池中的数据，再生成数据池中的数据 + dataPoolServiceImpl.editDataPool(entity); + } + + @Override + public void deleteDirective(CareDirectiveEntity careDirectiveEntity) { + PlanBizNuCustomerServer planBizNuCustomerServer = new PlanBizNuCustomerServer(); + BeanUtils.copyProperties(careDirectiveEntity,planBizNuCustomerServer); + String id = planBizNuCustomerServer.getId(); + //调用方法删除数据池中的数据 + dataPoolServiceImpl.deleteDataPool(planBizNuCustomerServer); + baseMapper.deleteByIdPhysic(id); + //TODO 增加日志 + } + + @Override + public CareDirectiveInstantEntity addInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) { + PlanBizNuCustomerServerInstant customerServerInstant = new PlanBizNuCustomerServerInstant(); + BeanUtils.copyProperties(careDirectiveInstantEntity,customerServerInstant); + planBizNuCustomerServerInstantService.save(customerServerInstant); + //TODO 增加日志 + + //生成即时指令到数据池，测试 +// DataPool dataPool = new DataPool(); +// dataPool.setBizId(customerServerInstant.getId()); +// dataPool.setNuId(customerServerInstant.getNuId()); +// dataPool.setNuName(customerServerInstant.getNuName()); +// dataPool.setCustomerId(customerServerInstant.getCustomerId()); +// dataPool.setCustomerName(customerServerInstant.getCustomerName()); +// dataPool.setDirectiveId(customerServerInstant.getDirectiveId()); +// dataPool.setDirectiveName(customerServerInstant.getDirectiveName()); +// dataPool.setServiceDuration(customerServerInstant.getServiceDuration()); +// dataPoolServiceImpl.addInstant(dataPool); + + BeanUtils.copyProperties(customerServerInstant,careDirectiveInstantEntity); + return careDirectiveInstantEntity; + } + + @Override + public void editInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) { + PlanBizNuCustomerServerInstant customerServerInstant = new PlanBizNuCustomerServerInstant(); + BeanUtils.copyProperties(careDirectiveInstantEntity,customerServerInstant); + planBizNuCustomerServerInstantService.updateById(customerServerInstant); + //TODO 增加日志 + } + + @Override + public void deleteInstant(CareDirectiveInstantEntity careDirectiveInstantEntity) { + planBizNuCustomerServerInstantService.deleteByIdPhysic(careDirectiveInstantEntity.getId()); + //TODO 增加日志 + } + + @Override + public ElderTagEntity addElderTag(ElderTagEntity elderTagEntity) { + PlanBizNuCustomerElderTag planBizNuCustomerElderTag = new PlanBizNuCustomerElderTag(); + BeanUtils.copyProperties(elderTagEntity,planBizNuCustomerElderTag); + planBizNuCustomerElderTagService.save(planBizNuCustomerElderTag); + //TODO 增加日志 + + BeanUtils.copyProperties(planBizNuCustomerElderTag,elderTagEntity); + return elderTagEntity; + } + + @Override + public void editElderTag(ElderTagEntity elderTagEntity) { + PlanBizNuCustomerElderTag planBizNuCustomerElderTag = new PlanBizNuCustomerElderTag(); + BeanUtils.copyProperties(elderTagEntity,planBizNuCustomerElderTag); + planBizNuCustomerElderTagService.updateById(planBizNuCustomerElderTag); + //TODO 增加日志 + } + + @Override + public void deleteElderTag(ElderTagEntity elderTagEntity) { + planBizNuCustomerElderTagService.deleteByIdPhysic(elderTagEntity.getId()); + //TODO 增加日志 + } + + @Override + public List getNcPackagelist(CareDirectivePackageEntity careDirectivePackageEntity) { + PlanDirectivePackage directivePackage = new PlanDirectivePackage(); + BeanUtils.copyProperties(careDirectivePackageEntity, directivePackage); + List list = baseMapper.getNcPackagelist(directivePackage); + List mainList = BeanUtil.copyToList(list,CareDirectivePackageEntity.class); + List directiveList = baseMapper.getNcDirectiveList(new PlanBizNuCustomerServer()); + for (CareDirectivePackageEntity et : mainList) { + List directivesList = new ArrayList<>(); + for (PlanBizNuCustomerServer etd : directiveList) { + if (etd.getPackageId().equals(et.getId())) { + getNetImages(etd); + CareDirectiveEntity careDirectiveEntity = new CareDirectiveEntity(); + BeanUtils.copyProperties(etd, careDirectiveEntity); + directivesList.add(careDirectiveEntity); + } + } + et.setDirectivesList(directivesList); + } + return mainList; + } + + /** + * 获取管理平台静态资源路径 + * + * @return + */ + private void getOpeMediaAddress() { + if (serverNetUrl == null || serverNetUrl.equals("")) { + JSONObject json = sysConfigApi.getByKey("ope_media_address"); + if (json != null) { + String configValue = json.getString("configValue"); + if (!configValue.endsWith("/")) { + configValue += "/"; + } + serverNetUrl = configValue; + } + } + } + + private String getImageNetUrl(String imageUrl) { + getOpeMediaAddress(); + return serverNetUrl + imageUrl; + } +} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/controller/CanAddDirectiveController.java similarity index 88% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/controller/CanAddDirectiveController.java index fa222c85..c6c3acf2 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/controller/CanAddDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/controller/CanAddDirectiveController.java @@ -1,16 +1,10 @@ -package com.nu.modules.canadddirective.controller; +package com.nu.modules.config.canadddirective.controller; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; @@ -22,9 +16,8 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.vo.LoginUser; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.canadddirective.entity.CanAddDirective; -import com.nu.modules.canadddirective.service.ICanAddDirectiveService; +import com.nu.modules.config.canadddirective.entity.CanAddDirective; +import com.nu.modules.config.canadddirective.service.ICanAddDirectiveService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -32,22 +25,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.config.JeecgBaseConfig; -import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 可新增指令 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java similarity index 94% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java index 04dd6414..b476a62b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/entity/CanAddDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/entity/CanAddDirective.java @@ -1,13 +1,8 @@ -package com.nu.modules.canadddirective.entity; +package com.nu.modules.config.canadddirective.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.*; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/mapper/CanAddDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/mapper/CanAddDirectiveMapper.java similarity index 57% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/mapper/CanAddDirectiveMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/mapper/CanAddDirectiveMapper.java index 0f8365fe..c1b94841 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/mapper/CanAddDirectiveMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/mapper/CanAddDirectiveMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.canadddirective.mapper; +package com.nu.modules.config.canadddirective.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.canadddirective.entity.CanAddDirective; +import com.nu.modules.config.canadddirective.entity.CanAddDirective; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/mapper/xml/CanAddDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/mapper/xml/CanAddDirectiveMapper.xml similarity index 100% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/mapper/xml/CanAddDirectiveMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/mapper/xml/CanAddDirectiveMapper.xml diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/ICanAddDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/ICanAddDirectiveService.java similarity index 66% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/ICanAddDirectiveService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/ICanAddDirectiveService.java index 076aaa44..2c799251 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/ICanAddDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/ICanAddDirectiveService.java @@ -1,6 +1,6 @@ -package com.nu.modules.canadddirective.service; +package com.nu.modules.config.canadddirective.service; -import com.nu.modules.canadddirective.entity.CanAddDirective; +import com.nu.modules.config.canadddirective.entity.CanAddDirective; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/impl/CanAddDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/impl/CanAddDirectiveServiceImpl.java similarity index 56% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/impl/CanAddDirectiveServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/impl/CanAddDirectiveServiceImpl.java index 1c4f8d48..dda135b3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/canadddirective/service/impl/CanAddDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/canadddirective/service/impl/CanAddDirectiveServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.canadddirective.service.impl; +package com.nu.modules.config.canadddirective.service.impl; -import com.nu.modules.canadddirective.entity.CanAddDirective; -import com.nu.modules.canadddirective.mapper.CanAddDirectiveMapper; -import com.nu.modules.canadddirective.service.ICanAddDirectiveService; +import com.nu.modules.config.canadddirective.entity.CanAddDirective; +import com.nu.modules.config.canadddirective.mapper.CanAddDirectiveMapper; +import com.nu.modules.config.canadddirective.service.ICanAddDirectiveService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/controller/NuBizCustomerCareTempMainController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/controller/NuBizCustomerCareTempMainController.java similarity index 87% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/controller/NuBizCustomerCareTempMainController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/controller/NuBizCustomerCareTempMainController.java index 06a52aa4..f3f8175d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/controller/NuBizCustomerCareTempMainController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/controller/NuBizCustomerCareTempMainController.java @@ -1,41 +1,24 @@ -package com.nu.modules.customercaretemp.controller; +package com.nu.modules.config.customercaretemp.controller; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.nu.modules.customercaretemp.service.INuBizCustomerCareTempInfoService; +import com.nu.modules.config.customercaretemp.service.INuBizCustomerCareTempInfoService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempMain; -import com.nu.modules.customercaretemp.service.INuBizCustomerCareTempMainService; +import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempMain; +import com.nu.modules.config.customercaretemp.service.INuBizCustomerCareTempMainService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempInfo.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempInfo.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java index dce50d51..b81effce 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempInfo.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempInfo.java @@ -1,19 +1,13 @@ -package com.nu.modules.customercaretemp.entity; +package com.nu.modules.config.customercaretemp.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.*; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempMain.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempMain.java similarity index 90% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempMain.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempMain.java index 8692ed01..601f7111 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/entity/NuBizCustomerCareTempMain.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/entity/NuBizCustomerCareTempMain.java @@ -1,14 +1,9 @@ -package com.nu.modules.customercaretemp.entity; +package com.nu.modules.config.customercaretemp.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.*; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java similarity index 79% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java index 8a8727f2..e24cec31 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/NuBizCustomerCareTempInfoMapper.java @@ -1,7 +1,7 @@ -package com.nu.modules.customercaretemp.mapper; +package com.nu.modules.config.customercaretemp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempInfo; +import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempInfo; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/NuBizCustomerCareTempMainMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/NuBizCustomerCareTempMainMapper.java similarity index 59% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/NuBizCustomerCareTempMainMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/NuBizCustomerCareTempMainMapper.java index 2ad942ca..50391a0b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/NuBizCustomerCareTempMainMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/NuBizCustomerCareTempMainMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.customercaretemp.mapper; +package com.nu.modules.config.customercaretemp.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempMain; +import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempMain; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml index f6e51a4f..0c7868d3 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml @@ -5,7 +5,7 @@ delete from nu_biz_customer_care_temp_info where pk_id = #{pkId} - 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/customercaretemp/mapper/xml/NuBizCustomerCareTempMainMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempMainMapper.xml similarity index 100% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/mapper/xml/NuBizCustomerCareTempMainMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempMainMapper.xml diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/INuBizCustomerCareTempInfoService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/INuBizCustomerCareTempInfoService.java similarity index 73% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/INuBizCustomerCareTempInfoService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/INuBizCustomerCareTempInfoService.java index 52e7c713..a642fe78 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/INuBizCustomerCareTempInfoService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/INuBizCustomerCareTempInfoService.java @@ -1,6 +1,6 @@ -package com.nu.modules.customercaretemp.service; +package com.nu.modules.config.customercaretemp.service; -import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempInfo; +import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempInfo; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Map; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/INuBizCustomerCareTempMainService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/INuBizCustomerCareTempMainService.java similarity index 65% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/INuBizCustomerCareTempMainService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/INuBizCustomerCareTempMainService.java index 073bc4ef..63d20cc0 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/INuBizCustomerCareTempMainService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/INuBizCustomerCareTempMainService.java @@ -1,10 +1,8 @@ -package com.nu.modules.customercaretemp.service; +package com.nu.modules.config.customercaretemp.service; -import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempMain; +import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempMain; import com.baomidou.mybatisplus.extension.service.IService; -import java.util.Map; - /** * @Description: 服务指令模版主表 * @Author: jeecg-boot diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/impl/NuBizCustomerCareTempInfoServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/impl/NuBizCustomerCareTempInfoServiceImpl.java similarity index 92% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/impl/NuBizCustomerCareTempInfoServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/impl/NuBizCustomerCareTempInfoServiceImpl.java index 7e5fd3a1..0e45e45e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/impl/NuBizCustomerCareTempInfoServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/impl/NuBizCustomerCareTempInfoServiceImpl.java @@ -1,11 +1,10 @@ -package com.nu.modules.customercaretemp.service.impl; +package com.nu.modules.config.customercaretemp.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempInfo; -import com.nu.modules.customercaretemp.mapper.NuBizCustomerCareTempInfoMapper; -import com.nu.modules.customercaretemp.service.INuBizCustomerCareTempInfoService; +import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempInfo; +import com.nu.modules.config.customercaretemp.mapper.NuBizCustomerCareTempInfoMapper; +import com.nu.modules.config.customercaretemp.service.INuBizCustomerCareTempInfoService; import com.nu.modules.sysconfig.ISysConfigApi; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/impl/NuBizCustomerCareTempMainServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/impl/NuBizCustomerCareTempMainServiceImpl.java similarity index 57% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/impl/NuBizCustomerCareTempMainServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/impl/NuBizCustomerCareTempMainServiceImpl.java index 003e966c..20943f9f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/customercaretemp/service/impl/NuBizCustomerCareTempMainServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/service/impl/NuBizCustomerCareTempMainServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.customercaretemp.service.impl; +package com.nu.modules.config.customercaretemp.service.impl; -import com.nu.modules.customercaretemp.entity.NuBizCustomerCareTempMain; -import com.nu.modules.customercaretemp.mapper.NuBizCustomerCareTempMainMapper; -import com.nu.modules.customercaretemp.service.INuBizCustomerCareTempMainService; +import com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempMain; +import com.nu.modules.config.customercaretemp.mapper.NuBizCustomerCareTempMainMapper; +import com.nu.modules.config.customercaretemp.service.INuBizCustomerCareTempMainService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/controller/DirectiveMediaController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/controller/DirectiveMediaController.java similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/controller/DirectiveMediaController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/controller/DirectiveMediaController.java index b05e2dfd..bfafcc21 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/controller/DirectiveMediaController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/controller/DirectiveMediaController.java @@ -1,11 +1,11 @@ -package com.nu.modules.directivemedia.controller; +package com.nu.modules.config.directivemedia.controller; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directivemedia.entity.DirectiveMedia; -import com.nu.modules.directivemedia.service.IDirectiveMediaService; +import com.nu.modules.config.directivemedia.entity.DirectiveMedia; +import com.nu.modules.config.directivemedia.service.IDirectiveMediaService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/entity/DirectiveMedia.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java similarity index 91% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/entity/DirectiveMedia.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java index fd02efd9..02a7416b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/entity/DirectiveMedia.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/entity/DirectiveMedia.java @@ -1,17 +1,9 @@ -package com.nu.modules.directivemedia.entity; +package com.nu.modules.config.directivemedia.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.*; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; -import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/mapper/DirectiveMediaMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/mapper/DirectiveMediaMapper.java similarity index 58% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/mapper/DirectiveMediaMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/mapper/DirectiveMediaMapper.java index d927ba8f..8249be1e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/mapper/DirectiveMediaMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/mapper/DirectiveMediaMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.directivemedia.mapper; +package com.nu.modules.config.directivemedia.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.directivemedia.entity.DirectiveMedia; +import com.nu.modules.config.directivemedia.entity.DirectiveMedia; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/mapper/xml/DirectiveMediaMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/mapper/xml/DirectiveMediaMapper.xml similarity index 100% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/mapper/xml/DirectiveMediaMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/mapper/xml/DirectiveMediaMapper.xml diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/service/IDirectiveMediaService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/service/IDirectiveMediaService.java similarity index 63% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/service/IDirectiveMediaService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/service/IDirectiveMediaService.java index 744241e9..968e4249 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/service/IDirectiveMediaService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/service/IDirectiveMediaService.java @@ -1,8 +1,7 @@ -package com.nu.modules.directivemedia.service; +package com.nu.modules.config.directivemedia.service; -import com.nu.modules.directivemedia.entity.DirectiveMedia; +import com.nu.modules.config.directivemedia.entity.DirectiveMedia; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; /** * @Description: 服务指令资源管理 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/service/impl/DirectiveMediaServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/service/impl/DirectiveMediaServiceImpl.java similarity index 91% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/service/impl/DirectiveMediaServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/service/impl/DirectiveMediaServiceImpl.java index bea401f7..b385fa0d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivemedia/service/impl/DirectiveMediaServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivemedia/service/impl/DirectiveMediaServiceImpl.java @@ -1,9 +1,9 @@ -package com.nu.modules.directivemedia.service.impl; +package com.nu.modules.config.directivemedia.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directivemedia.entity.DirectiveMedia; -import com.nu.modules.directivemedia.mapper.DirectiveMediaMapper; -import com.nu.modules.directivemedia.service.IDirectiveMediaService; +import com.nu.modules.config.directivemedia.entity.DirectiveMedia; +import com.nu.modules.config.directivemedia.mapper.DirectiveMediaMapper; +import com.nu.modules.config.directivemedia.service.IDirectiveMediaService; import com.nu.utils.NuFileUtils; import org.springframework.stereotype.Service; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/controller/DirectivePackageController.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/controller/DirectivePackageController.java index 68d0a92e..6cf5fb32 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/controller/DirectivePackageController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/controller/DirectivePackageController.java @@ -1,10 +1,10 @@ -package com.nu.modules.directivepackage.controller; +package com.nu.modules.config.directivepackage.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directivepackage.entity.DirectivePackage; -import com.nu.modules.directivepackage.service.IDirectivePackageService; +import com.nu.modules.config.directivepackage.entity.DirectivePackage; +import com.nu.modules.config.directivepackage.service.IDirectivePackageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java index c8d14de9..1158e267 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java @@ -1,10 +1,10 @@ -package com.nu.modules.directivepackage.entity; +package com.nu.modules.config.directivepackage.entity; import java.io.Serializable; import java.util.List; import com.baomidou.mybatisplus.annotation.*; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/DirectivePackageMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/DirectivePackageMapper.java similarity index 86% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/DirectivePackageMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/DirectivePackageMapper.java index 07cde8fe..82ab893a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/DirectivePackageMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/DirectivePackageMapper.java @@ -1,9 +1,9 @@ -package com.nu.modules.directivepackage.mapper; +package com.nu.modules.config.directivepackage.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.nu.modules.directivepackage.entity.DirectivePackage; +import com.nu.modules.config.directivepackage.entity.DirectivePackage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml index a1c90c91..dc1d9967 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml @@ -3,7 +3,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/IDirectivePackageService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/IDirectivePackageService.java similarity index 82% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/IDirectivePackageService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/IDirectivePackageService.java index 262809a3..de19ecbf 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/IDirectivePackageService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/IDirectivePackageService.java @@ -1,7 +1,7 @@ -package com.nu.modules.directivepackage.service; +package com.nu.modules.config.directivepackage.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nu.modules.directivepackage.entity.DirectivePackage; +import com.nu.modules.config.directivepackage.entity.DirectivePackage; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/impl/DirectivePackageServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java similarity index 82% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/impl/DirectivePackageServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java index 85031121..0a094b35 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/service/impl/DirectivePackageServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java @@ -1,13 +1,11 @@ -package com.nu.modules.directivepackage.service.impl; +package com.nu.modules.config.directivepackage.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.nu.modules.directivepackage.entity.DirectivePackage; -import com.nu.modules.directivepackage.mapper.DirectivePackageMapper; -import com.nu.modules.directivepackage.service.IDirectivePackageService; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import org.apache.commons.lang.StringUtils; +import com.nu.modules.config.directivepackage.entity.DirectivePackage; +import com.nu.modules.config.directivepackage.mapper.DirectivePackageMapper; +import com.nu.modules.config.directivepackage.service.IDirectivePackageService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/controller/DirectiveBodyTagController.java similarity index 96% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/controller/DirectiveBodyTagController.java index 273f574b..ef609472 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/controller/DirectiveBodyTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/controller/DirectiveBodyTagController.java @@ -1,12 +1,12 @@ -package com.nu.modules.directivetag.body.controller; +package com.nu.modules.config.directivetag.body.controller; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.body.service.IDirectiveBodyTagService; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.body.service.IDirectiveBodyTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTag.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTag.java index 794ae71a..f7be3d61 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTag.java @@ -1,4 +1,4 @@ -package com.nu.modules.directivetag.body.entity; +package com.nu.modules.config.directivetag.body.entity; import java.io.Serializable; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTagRelation.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTagRelation.java similarity index 92% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTagRelation.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTagRelation.java index 86a916c8..d550235e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/entity/DirectiveBodyTagRelation.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/entity/DirectiveBodyTagRelation.java @@ -1,4 +1,4 @@ -package com.nu.modules.directivetag.body.entity; +package com.nu.modules.config.directivetag.body.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagMapper.java similarity index 69% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagMapper.java index bada1653..4fc60572 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagMapper.java @@ -1,8 +1,7 @@ -package com.nu.modules.directivetag.body.mapper; +package com.nu.modules.config.directivetag.body.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTagRelation; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java similarity index 78% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java index f359441f..d10a4519 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/DirectiveBodyTagRelationMapper.java @@ -1,7 +1,7 @@ -package com.nu.modules.directivetag.body.mapper; +package com.nu.modules.config.directivetag.body.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTagRelation; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTagRelation; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml similarity index 88% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml index a300a8ac..adc70717 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagMapper.xml @@ -2,7 +2,7 @@ - select distinct b.* from nu_config_body_tag b left join nu_directive_body_tag d on b.id = d.tag_id d.directive_id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml similarity index 88% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml index 86b33c17..f7a00a7d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/mapper/xml/DirectiveBodyTagRelationMapper.xml @@ -9,7 +9,7 @@ delete from nu_directive_body_tag - select * from nu_directive_body_tag directive_id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/IDirectiveBodyTagService.java similarity index 80% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/IDirectiveBodyTagService.java index ca816e9b..0fdad735 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/IDirectiveBodyTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/IDirectiveBodyTagService.java @@ -1,8 +1,8 @@ -package com.nu.modules.directivetag.body.service; +package com.nu.modules.config.directivetag.body.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTagRelation; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTagRelation; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java similarity index 80% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java index 15b8fce8..41a2a392 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/body/service/impl/DirectiveBodyTagServiceImpl.java @@ -1,13 +1,13 @@ -package com.nu.modules.directivetag.body.service.impl; +package com.nu.modules.config.directivetag.body.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTagRelation; -import com.nu.modules.directivetag.body.mapper.DirectiveBodyTagMapper; -import com.nu.modules.directivetag.body.mapper.DirectiveBodyTagRelationMapper; -import com.nu.modules.directivetag.body.service.IDirectiveBodyTagService; -import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTagRelation; +import com.nu.modules.config.directivetag.body.mapper.DirectiveBodyTagMapper; +import com.nu.modules.config.directivetag.body.mapper.DirectiveBodyTagRelationMapper; +import com.nu.modules.config.directivetag.body.service.IDirectiveBodyTagService; +import com.nu.modules.config.servicedirective.mapper.ConfigServiceDirectiveMapper; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/controller/DirectiveEmotionTagController.java similarity index 96% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/controller/DirectiveEmotionTagController.java index 4a4c4882..18e246c1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/controller/DirectiveEmotionTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/controller/DirectiveEmotionTagController.java @@ -1,12 +1,12 @@ -package com.nu.modules.directivetag.emotion.controller; +package com.nu.modules.config.directivetag.emotion.controller; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.directivetag.emotion.service.IDirectiveEmotionTagService; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.directivetag.emotion.service.IDirectiveEmotionTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTag.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTag.java index f50e4423..df1e452e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTag.java @@ -1,4 +1,4 @@ -package com.nu.modules.directivetag.emotion.entity; +package com.nu.modules.config.directivetag.emotion.entity; import java.io.Serializable; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTagRelation.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTagRelation.java similarity index 92% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTagRelation.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTagRelation.java index a90627f9..be2a84da 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/entity/DirectiveEmotionTagRelation.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/entity/DirectiveEmotionTagRelation.java @@ -1,4 +1,4 @@ -package com.nu.modules.directivetag.emotion.entity; +package com.nu.modules.config.directivetag.emotion.entity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java similarity index 76% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java index 17cc5912..f31823ed 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagMapper.java @@ -1,7 +1,7 @@ -package com.nu.modules.directivetag.emotion.mapper; +package com.nu.modules.config.directivetag.emotion.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java similarity index 78% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java index 10b078df..9503e436 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/DirectiveEmotionTagRelationMapper.java @@ -1,7 +1,7 @@ -package com.nu.modules.directivetag.emotion.mapper; +package com.nu.modules.config.directivetag.emotion.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTagRelation; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTagRelation; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml similarity index 88% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml index 83fb500a..9b257786 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagMapper.xml @@ -1,7 +1,7 @@ - select distinct e.* from nu_config_emotion_tag e left join nu_directive_emotion_tag d on e.id = d.tag_id directive_id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml similarity index 88% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml index 03b7440e..55673552 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/mapper/xml/DirectiveEmotionTagRelationMapper.xml @@ -9,7 +9,7 @@ delete from nu_directive_emotion_tag - select * from nu_directive_emotion_tag directive_id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/IDirectiveEmotionTagService.java similarity index 79% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/IDirectiveEmotionTagService.java index 3ef5183c..1f15ccd4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/IDirectiveEmotionTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/IDirectiveEmotionTagService.java @@ -1,8 +1,8 @@ -package com.nu.modules.directivetag.emotion.service; +package com.nu.modules.config.directivetag.emotion.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTagRelation; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTagRelation; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java similarity index 79% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java index 9fd0e743..d059e5a2 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivetag/emotion/service/impl/DirectiveEmotionTagServiceImpl.java @@ -1,13 +1,13 @@ -package com.nu.modules.directivetag.emotion.service.impl; +package com.nu.modules.config.directivetag.emotion.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTagRelation; -import com.nu.modules.directivetag.emotion.mapper.DirectiveEmotionTagMapper; -import com.nu.modules.directivetag.emotion.mapper.DirectiveEmotionTagRelationMapper; -import com.nu.modules.directivetag.emotion.service.IDirectiveEmotionTagService; -import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTagRelation; +import com.nu.modules.config.directivetag.emotion.mapper.DirectiveEmotionTagMapper; +import com.nu.modules.config.directivetag.emotion.mapper.DirectiveEmotionTagRelationMapper; +import com.nu.modules.config.directivetag.emotion.service.IDirectiveEmotionTagService; +import com.nu.modules.config.servicedirective.mapper.ConfigServiceDirectiveMapper; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/controller/InstructionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/controller/InstructionTagController.java similarity index 86% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/controller/InstructionTagController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/controller/InstructionTagController.java index d84173e4..21b448d4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/controller/InstructionTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/controller/InstructionTagController.java @@ -1,13 +1,6 @@ -package com.nu.modules.instructiontag.controller; +package com.nu.modules.config.instructiontag.controller; import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -18,33 +11,22 @@ import com.nu.utils.RabbitMQUtil; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.query.QueryGenerator; -import org.jeecg.common.system.query.QueryRuleEnum; -import org.jeecg.common.util.oConvertUtils; -import com.nu.modules.instructiontag.entity.InstructionTag; -import com.nu.modules.instructiontag.service.IInstructionTagService; +import com.nu.modules.config.instructiontag.entity.InstructionTag; +import com.nu.modules.config.instructiontag.service.IInstructionTagService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; -import org.apache.shiro.authz.annotation.RequiresPermissions; /** * @Description: 服务指令-分类标签 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/entity/InstructionTag.java similarity index 92% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/entity/InstructionTag.java index 44268db2..560d318e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/entity/InstructionTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/entity/InstructionTag.java @@ -1,15 +1,11 @@ -package com.nu.modules.instructiontag.entity; +package com.nu.modules.config.instructiontag.entity; import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import org.jeecg.common.constant.ProvinceCityArea; -import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/mapper/InstructionTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/mapper/InstructionTagMapper.java similarity index 59% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/mapper/InstructionTagMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/mapper/InstructionTagMapper.java index f3524e28..576c5faf 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/mapper/InstructionTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/mapper/InstructionTagMapper.java @@ -1,9 +1,6 @@ -package com.nu.modules.instructiontag.mapper; +package com.nu.modules.config.instructiontag.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.nu.modules.instructiontag.entity.InstructionTag; +import com.nu.modules.config.instructiontag.entity.InstructionTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/mapper/xml/InstructionTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/mapper/xml/InstructionTagMapper.xml similarity index 100% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/mapper/xml/InstructionTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/mapper/xml/InstructionTagMapper.xml diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/service/IInstructionTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/service/IInstructionTagService.java similarity index 73% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/service/IInstructionTagService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/service/IInstructionTagService.java index 02353e8d..95722f78 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/service/IInstructionTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/service/IInstructionTagService.java @@ -1,6 +1,6 @@ -package com.nu.modules.instructiontag.service; +package com.nu.modules.config.instructiontag.service; -import com.nu.modules.instructiontag.entity.InstructionTag; +import com.nu.modules.config.instructiontag.entity.InstructionTag; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/service/impl/InstructionTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/service/impl/InstructionTagServiceImpl.java similarity index 67% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/service/impl/InstructionTagServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/service/impl/InstructionTagServiceImpl.java index ef43f51b..518610e5 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/instructiontag/service/impl/InstructionTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/service/impl/InstructionTagServiceImpl.java @@ -1,8 +1,8 @@ -package com.nu.modules.instructiontag.service.impl; +package com.nu.modules.config.instructiontag.service.impl; -import com.nu.modules.instructiontag.entity.InstructionTag; -import com.nu.modules.instructiontag.mapper.InstructionTagMapper; -import com.nu.modules.instructiontag.service.IInstructionTagService; +import com.nu.modules.config.instructiontag.entity.InstructionTag; +import com.nu.modules.config.instructiontag.mapper.InstructionTagMapper; +import com.nu.modules.config.instructiontag.service.IInstructionTagService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/controller/ConfigServiceCategoryController.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/controller/ConfigServiceCategoryController.java index a66e98cb..5c54febb 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/controller/ConfigServiceCategoryController.java @@ -1,12 +1,12 @@ -package com.nu.modules.servicecategory.controller; +package com.nu.modules.config.servicecategory.controller; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; -import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; +import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicecategory.service.IConfigServiceCategoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/entity/ConfigServiceCategory.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/entity/ConfigServiceCategory.java index 5a98db31..5758d88f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/entity/ConfigServiceCategory.java @@ -1,4 +1,4 @@ -package com.nu.modules.servicecategory.entity; +package com.nu.modules.config.servicecategory.entity; import java.io.Serializable; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/mapper/ConfigServiceCategoryMapper.java similarity index 78% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/mapper/ConfigServiceCategoryMapper.java index e3eed658..8d7de8b9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/ConfigServiceCategoryMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/mapper/ConfigServiceCategoryMapper.java @@ -1,6 +1,6 @@ -package com.nu.modules.servicecategory.mapper; +package com.nu.modules.config.servicecategory.mapper; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml similarity index 89% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml index 12047a73..f71cdf52 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/mapper/xml/ConfigServiceCategoryMapper.xml @@ -5,7 +5,7 @@ delete from nu_config_service_category - select distinct c.* from nu_config_service_category c left join nu_config_service_directive d on c.id = d.category_id d.id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/service/IConfigServiceCategoryService.java similarity index 83% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/service/IConfigServiceCategoryService.java index ece99187..d627a7f4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/IConfigServiceCategoryService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/service/IConfigServiceCategoryService.java @@ -1,6 +1,6 @@ -package com.nu.modules.servicecategory.service; +package com.nu.modules.config.servicecategory.service; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java similarity index 83% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java index 114dee0f..b8f120df 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicecategory/service/impl/ConfigServiceCategoryServiceImpl.java @@ -1,14 +1,14 @@ -package com.nu.modules.servicecategory.service.impl; +package com.nu.modules.config.servicecategory.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.nu.modules.servicetype.entity.ConfigServiceType; -import com.nu.modules.servicetype.service.IConfigServiceTypeService; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; -import com.nu.modules.servicecategory.mapper.ConfigServiceCategoryMapper; -import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicecategory.mapper.ConfigServiceCategoryMapper; +import com.nu.modules.config.servicecategory.service.IConfigServiceCategoryService; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.service.IConfigServiceDirectiveService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index 5dac895c..bc75f1e7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -1,4 +1,4 @@ -package com.nu.modules.servicedirective.controller; +package com.nu.modules.config.servicedirective.controller; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; @@ -8,11 +8,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.dto.DirectiveAsyncMQDto; -import com.nu.modules.canadddirective.entity.CanAddDirective; -import com.nu.modules.canadddirective.service.ICanAddDirectiveService; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import com.nu.modules.servicedirective.entity.TreeNode; -import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; +import com.nu.modules.config.canadddirective.entity.CanAddDirective; +import com.nu.modules.config.canadddirective.service.ICanAddDirectiveService; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.entity.TreeNode; +import com.nu.modules.config.servicedirective.service.IConfigServiceDirectiveService; import com.nu.utils.RabbitMQUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java index 140c7787..94986c54 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java @@ -1,9 +1,9 @@ -package com.nu.modules.servicedirective.entity; +package com.nu.modules.config.servicedirective.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/TreeNode.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java similarity index 87% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/TreeNode.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java index 851f313b..fc3d0f14 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/TreeNode.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/TreeNode.java @@ -1,7 +1,7 @@ -package com.nu.modules.servicedirective.entity; +package com.nu.modules.config.servicedirective.entity; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; import lombok.Data; import java.util.ArrayList; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/ConfigServiceDirectiveMapper.java similarity index 83% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/ConfigServiceDirectiveMapper.java index b47603a1..e00db127 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/ConfigServiceDirectiveMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/ConfigServiceDirectiveMapper.java @@ -1,16 +1,15 @@ -package com.nu.modules.servicedirective.mapper; +package com.nu.modules.config.servicedirective.mapper; import java.util.List; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.instructiontag.entity.InstructionTag; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; -import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.instructiontag.entity.InstructionTag; +import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; import org.apache.ibatis.annotations.Param; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import retrofit2.http.DELETE; /** * @Description: 服务指令 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml similarity index 89% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index fab4cc3f..ca92f1b9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -4,7 +4,7 @@ + type="com.nu.modules.config.servicedirective.entity.ConfigServiceDirective"> @@ -40,12 +40,12 @@ - + - + @@ -110,7 +110,7 @@ - SELECT id, instruction_name, sort, iz_enabled, icon FROM nu_config_service_instruction_tag WHERE del_flag = '0' ORDER BY sort ASC - SELECT id, category_name, instruction_id, sort, iz_enabled FROM nu_config_service_category WHERE del_flag = '0' ORDER BY sort ASC - SELECT id, type_name, instruction_id, category_id, sort, iz_enabled FROM nu_config_service_type WHERE del_flag = '0' @@ -223,25 +223,25 @@ - SELECT bt.id, bt.tag_name, bt.sort, bt.iz_enabled FROM nu_config_body_tag bt INNER JOIN nu_directive_body_tag dbt ON bt.id = dbt.tag_id WHERE dbt.directive_id = #{directiveId} - SELECT et.id, et.tag_name, et.sort, et.iz_enabled FROM nu_config_emotion_tag et INNER JOIN nu_directive_emotion_tag det ON et.id = det.tag_id WHERE det.directive_id = #{directiveId} - select id from nu_config_service_directive - select m.id, i.instruction_name as instructionName, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java similarity index 90% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java index 8f47820a..2c1651ff 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java @@ -1,12 +1,11 @@ -package com.nu.modules.servicedirective.service; +package com.nu.modules.config.servicedirective.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.nu.dto.DirectiveAsyncMQDto; import com.nu.dto.DirectiveMQDto; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import com.nu.modules.servicedirective.entity.TreeNode; -import org.apache.commons.compress.utils.Lists; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.entity.TreeNode; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index e9f68c62..848a5256 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -1,7 +1,6 @@ -package com.nu.modules.servicedirective.service.impl; +package com.nu.modules.config.servicedirective.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; @@ -9,46 +8,34 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.Maps; import com.nu.dto.*; -import com.nu.enums.MQStatus; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.body.service.IDirectiveBodyTagService; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.directivetag.emotion.service.IDirectiveEmotionTagService; -import com.nu.modules.instructiontag.entity.InstructionTag; -import com.nu.modules.instructiontag.service.IInstructionTagService; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; -import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import com.nu.modules.servicedirective.entity.TreeNode; -import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper; -import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; -import com.nu.modules.servicetype.entity.ConfigServiceType; -import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.body.service.IDirectiveBodyTagService; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.directivetag.emotion.service.IDirectiveEmotionTagService; +import com.nu.modules.config.instructiontag.entity.InstructionTag; +import com.nu.modules.config.instructiontag.service.IInstructionTagService; +import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicecategory.service.IConfigServiceCategoryService; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.entity.TreeNode; +import com.nu.modules.config.servicedirective.mapper.ConfigServiceDirectiveMapper; +import com.nu.modules.config.servicedirective.service.IConfigServiceDirectiveService; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.servicetype.service.IConfigServiceTypeService; import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.mq.directive.listener.DirectiveMQListener; import com.nu.utils.HttpRequestUtil; import com.nu.utils.NuFileUtils; import com.nu.utils.RabbitMQUtil; import org.apache.commons.compress.utils.Lists; -import org.apache.commons.lang.StringUtils; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.DictModel; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import java.nio.file.Files; -import java.security.MessageDigest; import java.util.*; import java.util.stream.Collectors; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/controller/ServiceTagController.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/controller/ServiceTagController.java index 39cda002..1a4e0017 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/controller/ServiceTagController.java @@ -1,10 +1,10 @@ -package com.nu.modules.servicetag.controller; +package com.nu.modules.config.servicetag.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.servicetag.entity.ServiceTag; -import com.nu.modules.servicetag.service.IServiceTagService; +import com.nu.modules.config.servicetag.entity.ServiceTag; +import com.nu.modules.config.servicetag.service.IServiceTagService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java index 910367f3..f98d61af 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/entity/ServiceTag.java @@ -1,8 +1,8 @@ -package com.nu.modules.servicetag.entity; +package com.nu.modules.config.servicetag.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java similarity index 80% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java index de73df0d..dfcc8fdf 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/ServiceTagMapper.java @@ -1,11 +1,9 @@ -package com.nu.modules.servicetag.mapper; +package com.nu.modules.config.servicetag.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.servicetag.entity.ServiceTag; +import com.nu.modules.config.servicetag.entity.ServiceTag; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml similarity index 95% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml index 0ec1614b..f2034a5d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -182,7 +182,7 @@ - select nst.id, nst.tag_name, nst.description, @@ -201,7 +201,7 @@ - select a.id, b.tag_name, b.description, a.create_time, b.id as employeesTagsId from nu_biz_employees_servcie_tags a LEFT JOIN nu_service_tag b on a.tags_id = b.id diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java similarity index 82% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java index cf1179a1..4672e8ee 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/IServiceTagService.java @@ -1,10 +1,9 @@ -package com.nu.modules.servicetag.service; +package com.nu.modules.config.servicetag.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.servicetag.entity.ServiceTag; +import com.nu.modules.config.servicetag.entity.ServiceTag; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java similarity index 85% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java index 0c8f56e1..5316eec4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/service/impl/ServiceTagServiceImpl.java @@ -1,15 +1,15 @@ -package com.nu.modules.servicetag.service.impl; +package com.nu.modules.config.servicetag.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import com.nu.modules.servicetag.entity.ServiceTag; -import com.nu.modules.servicetag.mapper.ServiceTagMapper; -import com.nu.modules.servicetag.service.IServiceTagService; +import com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag; +import com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicetag.entity.ServiceTag; +import com.nu.modules.config.servicetag.mapper.ServiceTagMapper; +import com.nu.modules.config.servicetag.service.IServiceTagService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/controller/ConfigServiceTypeController.java similarity index 97% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/controller/ConfigServiceTypeController.java index 4d17a7be..b1cb044c 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/controller/ConfigServiceTypeController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/controller/ConfigServiceTypeController.java @@ -1,13 +1,12 @@ -package com.nu.modules.servicetype.controller; +package com.nu.modules.config.servicetype.controller; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; -import com.nu.modules.servicetype.entity.ConfigServiceType; -import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.servicetype.service.IConfigServiceTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/entity/ConfigServiceType.java similarity index 98% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/entity/ConfigServiceType.java index c4c4bc08..aaa66cc9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/entity/ConfigServiceType.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/entity/ConfigServiceType.java @@ -1,4 +1,4 @@ -package com.nu.modules.servicetype.entity; +package com.nu.modules.config.servicetype.entity; import java.io.Serializable; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/mapper/ConfigServiceTypeMapper.java similarity index 79% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/mapper/ConfigServiceTypeMapper.java index d24ee6b0..4f7ff6dd 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/ConfigServiceTypeMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/mapper/ConfigServiceTypeMapper.java @@ -1,7 +1,7 @@ -package com.nu.modules.servicetype.mapper; +package com.nu.modules.config.servicetype.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/mapper/xml/ConfigServiceTypeMapper.xml similarity index 90% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/mapper/xml/ConfigServiceTypeMapper.xml index 3ca2d684..5a80a61e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/mapper/xml/ConfigServiceTypeMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/mapper/xml/ConfigServiceTypeMapper.xml @@ -6,7 +6,7 @@ delete from nu_config_service_type - select distinct t.* from nu_config_service_type t left join nu_config_service_directive d on t.id = d.type_id d.id in diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/service/IConfigServiceTypeService.java similarity index 83% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/service/IConfigServiceTypeService.java index 4cb8d669..148bed17 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/IConfigServiceTypeService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/service/IConfigServiceTypeService.java @@ -1,7 +1,7 @@ -package com.nu.modules.servicetype.service; +package com.nu.modules.config.servicetype.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.nu.modules.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; import java.util.List; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/service/impl/ConfigServiceTypeServiceImpl.java similarity index 82% rename from nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java rename to nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/service/impl/ConfigServiceTypeServiceImpl.java index e567dd02..9ab8157e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetype/service/impl/ConfigServiceTypeServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetype/service/impl/ConfigServiceTypeServiceImpl.java @@ -1,13 +1,13 @@ -package com.nu.modules.servicetype.service.impl; +package com.nu.modules.config.servicetype.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; -import com.nu.modules.servicetype.entity.ConfigServiceType; -import com.nu.modules.servicetype.mapper.ConfigServiceTypeMapper; -import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.service.IConfigServiceDirectiveService; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.servicetype.mapper.ConfigServiceTypeMapper; +import com.nu.modules.config.servicetype.service.IConfigServiceTypeService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java index f75babdf..f303428b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java @@ -5,29 +5,21 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.nu.dto.*; import com.nu.enums.MQStatus; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTag; -import com.nu.modules.directivetag.body.entity.DirectiveBodyTagRelation; -import com.nu.modules.directivetag.body.service.IDirectiveBodyTagService; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTag; -import com.nu.modules.directivetag.emotion.entity.DirectiveEmotionTagRelation; -import com.nu.modules.directivetag.emotion.service.IDirectiveEmotionTagService; -import com.nu.modules.instructiontag.entity.InstructionTag; -import com.nu.modules.instructiontag.service.IInstructionTagService; -import com.nu.modules.mediaasyncerrorlog.entity.MediaAsyncErrorLog; +import com.nu.modules.config.directivetag.body.service.IDirectiveBodyTagService; +import com.nu.modules.config.directivetag.emotion.service.IDirectiveEmotionTagService; +import com.nu.modules.config.instructiontag.entity.InstructionTag; +import com.nu.modules.config.instructiontag.service.IInstructionTagService; import com.nu.modules.mediaasyncerrorlog.service.IMediaAsyncErrorLogService; -import com.nu.modules.servicecategory.entity.ConfigServiceCategory; -import com.nu.modules.servicecategory.service.IConfigServiceCategoryService; -import com.nu.modules.servicedirective.entity.ConfigServiceDirective; -import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService; -import com.nu.modules.servicetype.entity.ConfigServiceType; -import com.nu.modules.servicetype.service.IConfigServiceTypeService; +import com.nu.modules.config.servicecategory.entity.ConfigServiceCategory; +import com.nu.modules.config.servicecategory.service.IConfigServiceCategoryService; +import com.nu.modules.config.servicedirective.entity.ConfigServiceDirective; +import com.nu.modules.config.servicedirective.service.IConfigServiceDirectiveService; +import com.nu.modules.config.servicetype.entity.ConfigServiceType; +import com.nu.modules.config.servicetype.service.IConfigServiceTypeService; import com.nu.modules.sysconfig.service.ISysConfigService; -import com.nu.utils.FileDownloader; import com.nu.utils.RabbitMQUtil; -import com.nu.utils.SafetyUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.compress.utils.Lists; -import org.apache.commons.lang.StringUtils; import org.springframework.amqp.core.ExchangeTypes; import org.springframework.amqp.rabbit.annotation.Exchange; import org.springframework.amqp.rabbit.annotation.Queue; @@ -38,10 +30,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.io.File; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/instructiontag/listener/InstructionTagMQListener.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/instructiontag/listener/InstructionTagMQListener.java index e7712347..8552758a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/instructiontag/listener/InstructionTagMQListener.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/instructiontag/listener/InstructionTagMQListener.java @@ -1,8 +1,8 @@ package com.nu.mq.instructiontag.listener; import com.nu.dto.InstructionTagMQDto; -import com.nu.modules.instructiontag.entity.InstructionTag; -import com.nu.modules.instructiontag.service.IInstructionTagService; +import com.nu.modules.config.instructiontag.entity.InstructionTag; +import com.nu.modules.config.instructiontag.service.IInstructionTagService; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.ExchangeTypes; import org.springframework.amqp.rabbit.annotation.Exchange;