From 0559db8bb42f401a1de25d60fb06eda7268ab88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 21 Mar 2025 15:10:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?tplink=E6=91=84=E5=83=8F=E5=A4=B4=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E4=BC=98=E5=8C=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectInfoController.java | 28 +++++----- .../project/mapper/ProjectInfoMapper.java | 1 + .../project/mapper/xml/ProjectInfoMapper.xml | 54 ++++++++++++++++++- .../service/impl/ProjectInfoServiceImpl.java | 5 ++ .../controller/RegionInfoController.java | 30 +++++------ .../tplink/region/entity/RegionInfo.java | 48 ++++++++--------- .../tplink/region/job/RegionSyncJob.java | 2 +- .../region/mapper/RegionInfoMapper.java | 2 +- .../tplink/region/model/RegionTreeModel.java | 2 +- .../region/service/IRegionInfoService.java | 2 +- .../service/impl/RegionInfoServiceImpl.java | 21 ++++---- 11 files changed, 128 insertions(+), 67 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java index 531aa7b..f0631df 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java @@ -26,12 +26,12 @@ import io.swagger.annotations.ApiOperation; import java.util.List; /** - * @Description: 护理单元-物联管理-TPLINK机构信息 + * @Description: 护理单元-物联管理-TPLINK项目信息 * @Author: jeecg-boot * @Date: 2025-01-22 * @Version: V1.0 */ -@Api(tags="护理单元-物联管理-TPLINK机构信息") +@Api(tags="护理单元-物联管理-TPLINK项目信息") @RestController @RequestMapping("/iot/projectInfo") @Slf4j @@ -48,8 +48,8 @@ public class ProjectInfoController extends JeecgController> queryPageList(ProjectInfo projectInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -61,7 +61,7 @@ public class ProjectInfoController extends JeecgController add(@RequestBody ProjectInfo projectInfo) { return service.addProject(projectInfo); @@ -108,8 +108,8 @@ public class ProjectInfoController extends JeecgController edit(@RequestBody ProjectInfo projectInfo) { return service.editProject(projectInfo); @@ -121,8 +121,8 @@ public class ProjectInfoController extends JeecgController deleteProject(@RequestBody ProjectInfo projectInfo) { return service.deleteProject(projectInfo); @@ -134,8 +134,8 @@ public class ProjectInfoController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { ProjectInfo projectInfo = service.getById(id); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java index 11c2be5..ba5ad87 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/ProjectInfoMapper.java @@ -21,6 +21,7 @@ public interface ProjectInfoMapper extends BaseMapper { IPage findPage(Page page, @Param("params") ProjectInfo projectInfo); int add(Map map); int updateById(Map map); + int updateByProjectId(ProjectInfo projectInfo); int deleteByProjectId(String projectId); int updateLeafByPId(Map map); List queryTreeList(); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml index 0c229f2..182e51f 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/mapper/xml/ProjectInfoMapper.xml @@ -124,6 +124,58 @@ + update nu_iot_tplink_project + set + + project_name = #{projectName}, + + + institutional_id = #{institutionalId}, + + + create_time = #{createTime}, + + + device_num = #{deviceNum}, + + + sort = #{sort}, + + + offline_num = #{offlineNum}, + + + abnormal_num = #{abnormalNum}, + + + unread_message_num = #{unreadMessageNum}, + + + total_nms_dev_num = #{totalNmsDevNum}, + + + total_vms_dev_num = #{totalVmsDevNum}, + + + total_nbs_dev_num = #{totalNbsDevNum}, + + + offline_nms_dev_num = #{offlineNmsDevNum}, + + + offline_vms_dev_num = #{offlineVmsDevNum}, + + + offline_nbs_dev_num = #{offlineNbsDevNum}, + + + running_time = #{runningTime}, + + project_id = #{projectId} + where id = #{id} + + + update nu_iot_tplink_project set project_id = #{projectId}, project_name = #{projectName}, @@ -142,7 +194,7 @@ offline_vms_dev_num = #{offlineVmsDevNum}, offline_nbs_dev_num = #{offlineNbsDevNum}, running_time = #{runningTime} - where id = #{id} + where project_id = #{projectId} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java index 05e4d8a..62a74ed 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/service/impl/ProjectInfoServiceImpl.java @@ -143,6 +143,10 @@ public class ProjectInfoServiceImpl extends ServiceImpl> queryPageList(RegionInfo regionInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -57,7 +57,7 @@ public class RegionInfoController extends JeecgController add(@RequestBody RegionInfo regionInfo) { return service.addRegion(regionInfo); @@ -115,8 +115,8 @@ public class RegionInfoController extends JeecgController edit(@RequestBody RegionInfo regionInfo) { return service.editRegion(regionInfo); @@ -128,8 +128,8 @@ public class RegionInfoController extends JeecgController deleteRegion(@RequestBody RegionInfo regionInfo) { return service.deleteRegion(regionInfo); @@ -141,8 +141,8 @@ public class RegionInfoController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { RegionInfo regionInfo = service.getById(id); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java index 99e2d49..fb7e516 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java @@ -15,7 +15,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-02-20 * @Version: V1.0 @@ -24,7 +24,7 @@ import java.io.Serializable; @TableName("nu_iot_tplink_region") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="nu_iot_tplink_region对象", description="护理单元-物联管理-TPLINK区域信息") +@ApiModel(value="nu_iot_tplink_region对象", description="护理单元-物联管理-TPLINK分组信息") public class RegionInfo implements Serializable { private static final long serialVersionUID = 1L; @@ -32,19 +32,19 @@ public class RegionInfo implements Serializable { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "ID") private Integer id; - /**区域ID*/ - @Excel(name = "区域ID", width = 15) - @ApiModelProperty(value = "区域ID") + /**分组ID*/ + @Excel(name = "分组ID", width = 15) + @ApiModelProperty(value = "分组ID") private String regionId; - /**区域名称*/ - @Excel(name = "区域名称", width = 15) - @ApiModelProperty(value = "区域名称") + /**分组名称*/ + @Excel(name = "分组名称", width = 15) + @ApiModelProperty(value = "分组名称") private String regionName; - /**区域层级*/ - @Excel(name = "区域层级", width = 15) - @ApiModelProperty(value = "区域层级") + /**分组层级*/ + @Excel(name = "分组层级", width = 15) + @ApiModelProperty(value = "分组层级") private String regionLevel; - /**区域次序，接口对应字段，在数据库中是关键字，数据库中用sort代替order*/ + /**分组次序，接口对应字段，在数据库中是关键字，数据库中用sort代替order*/ @ApiModelProperty(value = "项目次序") @TableField(exist = false) private String order; @@ -52,13 +52,13 @@ public class RegionInfo implements Serializable { @Excel(name = "项目次序", width = 15) @ApiModelProperty(value = "项目次序") private Integer sort; - /**父区域ID*/ - @Excel(name = "父区域ID", width = 15) - @ApiModelProperty(value = "父区域ID") + /**父分组ID*/ + @Excel(name = "父分组ID", width = 15) + @ApiModelProperty(value = "父分组ID") private String parentId; - /**父区域ID*/ - @Excel(name = "父区域", width = 15) - @ApiModelProperty(value = "父区域") + /**父分组ID*/ + @Excel(name = "父分组", width = 15) + @ApiModelProperty(value = "父分组") @TableField(exist = false) private String parentName; /**项目ID*/ @@ -78,13 +78,13 @@ public class RegionInfo implements Serializable { @Excel(name = "流道", width = 15) @ApiModelProperty(value = "流道") private String streamWay; - /**是否有子区域*/ - @Excel(name = "是否有子区域", width = 15) - @ApiModelProperty(value = "是否有子区域 0无 1有") + /**是否有子分组*/ + @Excel(name = "是否有子分组", width = 15) + @ApiModelProperty(value = "是否有子分组 0无 1有") private String hasChildren; - /**区域类型*/ - @Excel(name = "区域类型", width = 15) - @ApiModelProperty(value = "区域类型") + /**分组类型*/ + @Excel(name = "分组类型", width = 15) + @ApiModelProperty(value = "分组类型") private String regionType; /**更新时间*/ @Excel(name = "更新时间", width = 15) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java index 05dc45e..5cc1313 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/job/RegionSyncJob.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import java.util.List; /** - * 区域信息同步 + * 分组信息同步 */ @Slf4j public class RegionSyncJob implements Job { diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java index b7bafc5..e018a04 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-02-20 * @Version: V1.0 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java index 9b16874..739b7a6 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/model/RegionTreeModel.java @@ -8,7 +8,7 @@ import java.util.Objects; /** *

- * 区域表 存储区域结构数据的实体类 + * 分组表 存储分组结构数据的实体类 *

* * @Author 曹磊 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java index 084d1c1..2f30389 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java @@ -10,7 +10,7 @@ import com.nu.modules.tplink.region.model.RegionTreeModel; import java.util.List; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-01-22 * @Version: V1.0 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java index 2d3c5d2..3597403 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 护理单元-物联管理-TPLINK区域信息 + * @Description: 护理单元-物联管理-TPLINK分组信息 * @Author: jeecg-boot * @Date: 2025-02-20 * @Version: V1.0 @@ -37,7 +37,7 @@ public class RegionInfoServiceImpl extends ServiceImpl Date: Mon, 24 Mar 2025 11:28:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B0=86config=E6=A8=A1=E5=9D=97=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=BF=9B=E9=94=80=E5=AD=98=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu-invoicing-api/nu-invoicing-local-api}/pom.xml | 4 ++-- .../nu-invoicing-api}/pom.xml | 6 +++--- .../nu-invoicing-biz}/pom.xml | 6 +++--- .../controller/ConfigMaterialCategoryController.java | 0 .../controller/ConfigMaterialInfoController.java | 0 .../controller/ConfigMaterialMedicationController.java | 0 .../controller/ConfigMaterialTypeController.java | 0 .../ConfigMaterial/entity/ConfigMaterialCategory.java | 0 .../modules/ConfigMaterial/entity/ConfigMaterialInfo.java | 0 .../ConfigMaterial/entity/ConfigMaterialMedication.java | 0 .../modules/ConfigMaterial/entity/ConfigMaterialType.java | 0 .../mapper/ConfigMaterialCategoryMapper.java | 0 .../ConfigMaterial/mapper/ConfigMaterialInfoMapper.java | 0 .../mapper/ConfigMaterialMedicationMapper.java | 0 .../ConfigMaterial/mapper/ConfigMaterialTypeMapper.java | 0 .../mapper/xml/ConfigMaterialCategoryMapper.xml | 0 .../ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml | 0 .../mapper/xml/ConfigMaterialMedicationMapper.xml | 0 .../ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml | 0 .../service/IConfigMaterialCategoryService.java | 0 .../ConfigMaterial/service/IConfigMaterialInfoService.java | 0 .../service/IConfigMaterialMedicationService.java | 0 .../ConfigMaterial/service/IConfigMaterialTypeService.java | 0 .../service/impl/ConfigMaterialCategoryServiceImpl.java | 0 .../service/impl/ConfigMaterialInfoServiceImpl.java | 0 .../service/impl/ConfigMaterialMedicationServiceImpl.java | 0 .../service/impl/ConfigMaterialTypeServiceImpl.java | 0 .../controller/ConfigServiceTypeController.java | 0 .../nu/modules/ServiceType/entity/ConfigServiceType.java | 0 .../ServiceType/mapper/ConfigServiceTypeMapper.java | 0 .../ServiceType/mapper/xml/ConfigServiceTypeMapper.xml | 0 .../ServiceType/service/IConfigServiceTypeService.java | 0 .../service/impl/ConfigServiceTypeServiceImpl.java | 0 .../controller/ConfigSuppliersInfoController.java | 0 .../configSuppliersInfo/entity/ConfigSuppliersInfo.java | 0 .../mapper/ConfigSuppliersInfoMapper.java | 0 .../mapper/xml/ConfigSuppliersInfoMapper.xml | 0 .../service/IConfigSuppliersInfoService.java | 0 .../service/impl/ConfigSuppliersInfoServiceImpl.java | 0 .../nu/modules/dictType/controller/DictTypeController.java | 0 .../dictType/controller/DictTypeItemController.java | 0 .../main/java/com/nu/modules/dictType/entity/DictType.java | 0 .../java/com/nu/modules/dictType/entity/DictTypeItem.java | 0 .../com/nu/modules/dictType/mapper/DictTypeItemMapper.java | 0 .../com/nu/modules/dictType/mapper/DictTypeMapper.java | 0 .../nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml | 0 .../com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml | 0 .../nu/modules/dictType/service/IDictTypeItemService.java | 0 .../com/nu/modules/dictType/service/IDictTypeService.java | 0 .../dictType/service/impl/DictTypeItemServiceImpl.java | 0 .../modules/dictType/service/impl/DictTypeServiceImpl.java | 0 .../directiveTag/controller/DirectiveTagController.java | 0 .../com/nu/modules/directiveTag/entity/DirectiveTag.java | 0 .../nu/modules/directiveTag/mapper/DirectiveTagMapper.java | 0 .../modules/directiveTag/mapper/xml/DirectiveTagMapper.xml | 0 .../modules/directiveTag/service/IDirectiveTagService.java | 0 .../directiveTag/service/impl/DirectiveTagServiceImpl.java | 0 .../controller/ConfigServiceCategoryController.java | 0 .../serviceCategory/entity/ConfigServiceCategory.java | 0 .../mapper/ConfigServiceCategoryMapper.java | 0 .../mapper/xml/ConfigServiceCategoryMapper.xml | 0 .../service/IConfigServiceCategoryService.java | 0 .../service/impl/ConfigServiceCategoryServiceImpl.java | 0 .../controller/ConfigServiceDirectiveController.java | 0 .../serviceDirective/entity/ConfigServiceDirective.java | 0 .../mapper/ConfigServiceDirectiveMapper.java | 0 .../mapper/xml/ConfigServiceDirectiveMapper.xml | 0 .../service/IConfigServiceDirectiveService.java | 0 .../service/impl/ConfigServiceDirectiveServiceImpl.java | 0 .../src/main/java/com/nu/modules/utils/PinyinUtils.java | 0 {nursing-unit-config => nursing-unit-invoicing}/pom.xml | 6 +++--- nursing-unit-system/nu-system-start/pom.xml | 2 +- pom.xml | 7 ++++++- 73 files changed, 18 insertions(+), 13 deletions(-) rename {nursing-unit-config/nu-config-api/nu-config-local-api => nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api}/pom.xml (80%) rename {nursing-unit-config/nu-config-api => nursing-unit-invoicing/nu-invoicing-api}/pom.xml (81%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/pom.xml (87%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/configSuppliersInfo/controller/ConfigSuppliersInfoController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/configSuppliersInfo/mapper/ConfigSuppliersInfoMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/configSuppliersInfo/mapper/xml/ConfigSuppliersInfoMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/configSuppliersInfo/service/IConfigSuppliersInfoService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/configSuppliersInfo/service/impl/ConfigSuppliersInfoServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/entity/DictType.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java (100%) rename {nursing-unit-config/nu-config-biz => nursing-unit-invoicing/nu-invoicing-biz}/src/main/java/com/nu/modules/utils/PinyinUtils.java (100%) rename {nursing-unit-config => nursing-unit-invoicing}/pom.xml (79%) diff --git a/nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml similarity index 80% rename from nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml rename to nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml index dfeacb1..7c44f9b 100644 --- a/nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nursingunit.boot - nu-config-api + nu-invoicing-api 2.0.0 4.0.0 - nu-config-local-api + nu-invoicing-local-api diff --git a/nursing-unit-config/nu-config-api/pom.xml b/nursing-unit-invoicing/nu-invoicing-api/pom.xml similarity index 81% rename from nursing-unit-config/nu-config-api/pom.xml rename to nursing-unit-invoicing/nu-invoicing-api/pom.xml index 1fa3625..ddea156 100644 --- a/nursing-unit-config/nu-config-api/pom.xml +++ b/nursing-unit-invoicing/nu-invoicing-api/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nursingunit.boot - nursing-unit-config + nursing-unit-invoicing 2.0.0 4.0.0 - nu-config-api + nu-invoicing-api pom - nu-config-local-api + nu-invoicing-local-api diff --git a/nursing-unit-config/nu-config-biz/pom.xml b/nursing-unit-invoicing/nu-invoicing-biz/pom.xml similarity index 87% rename from nursing-unit-config/nu-config-biz/pom.xml rename to nursing-unit-invoicing/nu-invoicing-biz/pom.xml index e0a057d..2516b7e 100644 --- a/nursing-unit-config/nu-config-biz/pom.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/pom.xml @@ -3,17 +3,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.nursingunit.boot - nursing-unit-config + nursing-unit-invoicing 2.0.0 4.0.0 - nu-config-biz + nu-invoicing-biz com.nursingunit.boot - nu-config-local-api + nu-invoicing-local-api ${nursingunit.version} diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialCategoryController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialInfoController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialMedicationController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/controller/ConfigMaterialTypeController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialCategory.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialInfo.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialMedication.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/entity/ConfigMaterialType.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialCategoryMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialInfoMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialMedicationMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/ConfigMaterialTypeMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialCategoryMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialMedicationMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialTypeMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialCategoryService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialInfoService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialMedicationService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/IConfigMaterialTypeService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialInfoServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialMedicationServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialTypeServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/controller/ConfigSuppliersInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/controller/ConfigSuppliersInfoController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/controller/ConfigSuppliersInfoController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/controller/ConfigSuppliersInfoController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/entity/ConfigSuppliersInfo.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/ConfigSuppliersInfoMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/ConfigSuppliersInfoMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/ConfigSuppliersInfoMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/ConfigSuppliersInfoMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/xml/ConfigSuppliersInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/xml/ConfigSuppliersInfoMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/xml/ConfigSuppliersInfoMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/mapper/xml/ConfigSuppliersInfoMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/IConfigSuppliersInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/IConfigSuppliersInfoService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/IConfigSuppliersInfoService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/IConfigSuppliersInfoService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/impl/ConfigSuppliersInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/impl/ConfigSuppliersInfoServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/impl/ConfigSuppliersInfoServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersInfo/service/impl/ConfigSuppliersInfoServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java similarity index 100% rename from nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java rename to nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/utils/PinyinUtils.java diff --git a/nursing-unit-config/pom.xml b/nursing-unit-invoicing/pom.xml similarity index 79% rename from nursing-unit-config/pom.xml rename to nursing-unit-invoicing/pom.xml index 7e2fcdf..6fa24e2 100644 --- a/nursing-unit-config/pom.xml +++ b/nursing-unit-invoicing/pom.xml @@ -9,12 +9,12 @@ 4.0.0 - nursing-unit-config + nursing-unit-invoicing pom - nu-config-api - nu-config-biz + nu-invoicing-api + nu-invoicing-biz diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index 6b487e0..a268db1 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -27,7 +27,7 @@ com.nursingunit.boot - nu-config-biz + nu-invoicing-biz ${nursingunit.version} diff --git a/pom.xml b/pom.xml index db89b09..8adeffb 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,15 @@ + nursing-unit-base-core + nursing-unit-demo - nursing-unit-config + + nursing-unit-invoicing + nursing-unit-iot + nursing-unit-system From 9f34947107bd7fedbcb7686dcaf2cc42b533b05f Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 24 Mar 2025 13:46:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E5=A2=9Enu=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu-admin-api/nu-admin-local-api/pom.xml | 13 +++++++ nursing-unit-admin/nu-admin-api/pom.xml | 24 +++++++++++++ nursing-unit-admin/nu-admin-biz/pom.xml | 35 +++++++++++++++++++ nursing-unit-admin/pom.xml | 19 ++++++++++ nursing-unit-system/nu-system-start/pom.xml | 9 +++-- nursing-unit-yourModuleName/pom.xml | 1 + pom.xml | 2 ++ 7 files changed, 101 insertions(+), 2 deletions(-) create mode 100644 nursing-unit-admin/nu-admin-api/nu-admin-local-api/pom.xml create mode 100644 nursing-unit-admin/nu-admin-api/pom.xml create mode 100644 nursing-unit-admin/nu-admin-biz/pom.xml create mode 100644 nursing-unit-admin/pom.xml diff --git a/nursing-unit-admin/nu-admin-api/nu-admin-local-api/pom.xml b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/pom.xml new file mode 100644 index 0000000..59cf75e --- /dev/null +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/pom.xml @@ -0,0 +1,13 @@ + + + + com.nursingunit.boot + nu-admin-api + 2.0.0 + + 4.0.0 + nu-admin-local-api + + diff --git a/nursing-unit-admin/nu-admin-api/pom.xml b/nursing-unit-admin/nu-admin-api/pom.xml new file mode 100644 index 0000000..79e967c --- /dev/null +++ b/nursing-unit-admin/nu-admin-api/pom.xml @@ -0,0 +1,24 @@ + + + + com.nursingunit.boot + nursing-unit-admin + 2.0.0 + + 4.0.0 + nu-admin-api + pom + + + nu-admin-local-api + + + + + com.nursingunit.boot + nursing-unit-base-core + + + diff --git a/nursing-unit-admin/nu-admin-biz/pom.xml b/nursing-unit-admin/nu-admin-biz/pom.xml new file mode 100644 index 0000000..020a5ba --- /dev/null +++ b/nursing-unit-admin/nu-admin-biz/pom.xml @@ -0,0 +1,35 @@ + + + com.nursingunit.boot + nursing-unit-admin + 2.0.0 + + 4.0.0 + nu-admin-biz + + + + com.nursingunit.boot + nu-admin-local-api + ${nursingunit.version} + + + org.hibernate + hibernate-core + + + org.jeecgframework.boot + hibernate-re + + + + + org.jeecgframework + weixin4j + + + + + diff --git a/nursing-unit-admin/pom.xml b/nursing-unit-admin/pom.xml new file mode 100644 index 0000000..805b8eb --- /dev/null +++ b/nursing-unit-admin/pom.xml @@ -0,0 +1,19 @@ + + + + com.nursingunit.boot + nursing-unit-parent + 2.0.0 + + 4.0.0 + nursing-unit-admin + pom + + + nu-admin-api + nu-admin-biz + + + diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index a268db1..197a4f2 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -24,7 +24,7 @@ nursing-unit-demo ${nursingunit.version} - + com.nursingunit.boot nu-invoicing-biz @@ -36,7 +36,12 @@ nu-iot-biz ${nursingunit.version} - + + + com.nursingunit.boot + nu-admin-biz + ${nursingunit.version} + diff --git a/nursing-unit-yourModuleName/pom.xml b/nursing-unit-yourModuleName/pom.xml index a2820a3..589746b 100644 --- a/nursing-unit-yourModuleName/pom.xml +++ b/nursing-unit-yourModuleName/pom.xml @@ -15,6 +15,7 @@ nu-yourModuleName-api + nu-yourModuleName-biz diff --git a/pom.xml b/pom.xml index 8adeffb..9be57c7 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,8 @@ nursing-unit-invoicing nursing-unit-iot + + nursing-unit-admin nursing-unit-system From 2f3d6c38f0d8f4b85879fbd3f71ddeb458d0a354 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 24 Mar 2025 14:57:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DictTypeController.java | 0 .../controller/DictTypeItemController.java | 0 .../nu/modules/dictType/entity/DictType.java | 4 +- .../modules/dictType/entity/DictTypeItem.java | 22 ++++------ .../dictType/mapper/DictTypeItemMapper.java | 0 .../dictType/mapper/DictTypeMapper.java | 0 .../mapper/xml/DictTypeItemMapper.xml | 2 +- .../dictType/mapper/xml/DictTypeMapper.xml | 2 +- .../service/IDictTypeItemService.java | 0 .../dictType/service/IDictTypeService.java | 0 .../service/impl/DictTypeItemServiceImpl.java | 0 .../service/impl/DictTypeServiceImpl.java | 0 nursing-unit-admin/pom.xml | 1 + nursing-unit-base-core/pom.xml | 2 +- nursing-unit-demo/pom.xml | 2 +- .../ConfigMaterialCategoryServiceImpl.java | 1 - nursing-unit-invoicing/pom.xml | 2 +- nursing-unit-iot/pom.xml | 1 + .../nu-service-directive-local-api/pom.xml | 14 +++++++ .../nu-service-directive-api/pom.xml | 25 +++++++++++ .../nu-service-directive-biz/pom.xml | 42 +++++++++++++++++++ .../ConfigServiceTypeController.java | 0 .../ServiceType/entity/ConfigServiceType.java | 6 +-- .../mapper/ConfigServiceTypeMapper.java | 0 .../mapper/xml/ConfigServiceTypeMapper.xml | 0 .../service/IConfigServiceTypeService.java | 0 .../impl/ConfigServiceTypeServiceImpl.java | 0 .../controller/DirectiveTagController.java | 0 .../directiveTag/entity/DirectiveTag.java | 4 +- .../mapper/DirectiveTagMapper.java | 0 .../mapper/xml/DirectiveTagMapper.xml | 0 .../service/IDirectiveTagService.java | 0 .../service/impl/DirectiveTagServiceImpl.java | 0 .../ConfigServiceCategoryController.java | 0 .../entity/ConfigServiceCategory.java | 4 +- .../mapper/ConfigServiceCategoryMapper.java | 0 .../xml/ConfigServiceCategoryMapper.xml | 0 .../IConfigServiceCategoryService.java | 0 .../ConfigServiceCategoryServiceImpl.java | 0 .../ConfigServiceDirectiveController.java | 0 .../entity/ConfigServiceDirective.java | 8 ++-- .../mapper/ConfigServiceDirectiveMapper.java | 0 .../xml/ConfigServiceDirectiveMapper.xml | 12 +++--- .../IConfigServiceDirectiveService.java | 0 .../ConfigServiceDirectiveServiceImpl.java | 0 nursing-unit-service-directive/pom.xml | 20 +++++++++ nursing-unit-system/nu-system-start/pom.xml | 6 +++ nursing-unit-system/pom.xml | 2 +- nursing-unit-yourModuleName/pom.xml | 2 + pom.xml | 2 + 50 files changed, 147 insertions(+), 39 deletions(-) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/entity/DictType.java (95%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java (88%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml (67%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml (68%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-admin/nu-admin-biz}/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java (100%) create mode 100644 nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml create mode 100644 nursing-unit-service-directive/nu-service-directive-api/pom.xml create mode 100644 nursing-unit-service-directive/nu-service-directive-biz/pom.xml rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java (93%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java (95%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java (95%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java (94%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml (91%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java (100%) rename {nursing-unit-invoicing/nu-invoicing-biz => nursing-unit-service-directive/nu-service-directive-biz}/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java (100%) create mode 100644 nursing-unit-service-directive/pom.xml diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/controller/DictTypeItemController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java similarity index 95% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java index 690e7b1..1fc5d9e 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictType.java @@ -23,10 +23,10 @@ import java.util.Date; * @Version: V1.0 */ @Data -@TableName("dict_type") +@TableName("nu_dict_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="dict_type对象", description="业务字典主表") +@ApiModel(value="nu_dict_type对象", description="业务字典主表") public class DictType implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java similarity index 88% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java index b37e4c2..f93ade6 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/entity/DictTypeItem.java @@ -1,24 +1,20 @@ package com.nu.modules.dictType.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; -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.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** * @Description: dict_type_item @@ -27,10 +23,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("dict_type_item") +@TableName("nu_dict_type_item") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="dict_type_item对象", description="dict_type_item") +@ApiModel(value="nu_dict_type_item对象", description="dict_type_item") public class DictTypeItem implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeItemMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/DictTypeMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml similarity index 67% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml index a2f52f0..769c239 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeItemMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml similarity index 68% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml index 19118df..9010d83 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/mapper/xml/DictTypeMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeItemService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/IDictTypeService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeItemServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java rename to nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/dictType/service/impl/DictTypeServiceImpl.java diff --git a/nursing-unit-admin/pom.xml b/nursing-unit-admin/pom.xml index 805b8eb..b36b042 100644 --- a/nursing-unit-admin/pom.xml +++ b/nursing-unit-admin/pom.xml @@ -7,6 +7,7 @@ nursing-unit-parent 2.0.0 + nu基础管理模块 4.0.0 nursing-unit-admin pom diff --git a/nursing-unit-base-core/pom.xml b/nursing-unit-base-core/pom.xml index 16bb52a..077c23a 100644 --- a/nursing-unit-base-core/pom.xml +++ b/nursing-unit-base-core/pom.xml @@ -6,9 +6,9 @@ nursing-unit-parent 2.0.0 + 框架基础模块 4.0.0 nursing-unit-base-core - aliyun diff --git a/nursing-unit-demo/pom.xml b/nursing-unit-demo/pom.xml index 4cd97ea..56083fd 100644 --- a/nursing-unit-demo/pom.xml +++ b/nursing-unit-demo/pom.xml @@ -7,8 +7,8 @@ nursing-unit-parent 2.0.0 + 框架demo模块 4.0.0 - nursing-unit-demo diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java index 51b11bb..47e5a7f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/service/impl/ConfigMaterialCategoryServiceImpl.java @@ -10,7 +10,6 @@ import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialCategoryMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialMedicationMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialTypeMapper; import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService; -import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/nursing-unit-invoicing/pom.xml b/nursing-unit-invoicing/pom.xml index 6fa24e2..86701b0 100644 --- a/nursing-unit-invoicing/pom.xml +++ b/nursing-unit-invoicing/pom.xml @@ -7,8 +7,8 @@ nursing-unit-parent 2.0.0 + 进销存 4.0.0 - nursing-unit-invoicing pom diff --git a/nursing-unit-iot/pom.xml b/nursing-unit-iot/pom.xml index 383741c..9ecc14c 100644 --- a/nursing-unit-iot/pom.xml +++ b/nursing-unit-iot/pom.xml @@ -7,6 +7,7 @@ nursing-unit-parent 2.0.0 + 摄像头 4.0.0 nursing-unit-iot pom diff --git a/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml b/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml new file mode 100644 index 0000000..1f4ba09 --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml @@ -0,0 +1,14 @@ + + + + com.nursingunit.boot + nu-service-directive-api + 2.0.0 + + 4.0.0 + + nu-service-directive-local-api + + diff --git a/nursing-unit-service-directive/nu-service-directive-api/pom.xml b/nursing-unit-service-directive/nu-service-directive-api/pom.xml new file mode 100644 index 0000000..98bed17 --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-api/pom.xml @@ -0,0 +1,25 @@ + + + + com.nursingunit.boot + nursing-unit-service-directive + 2.0.0 + + 4.0.0 + + nu-service-directive-api + pom + + + nu-service-directive-local-api + + + + + com.nursingunit.boot + nursing-unit-base-core + + + diff --git a/nursing-unit-service-directive/nu-service-directive-biz/pom.xml b/nursing-unit-service-directive/nu-service-directive-biz/pom.xml new file mode 100644 index 0000000..809337a --- /dev/null +++ b/nursing-unit-service-directive/nu-service-directive-biz/pom.xml @@ -0,0 +1,42 @@ + + + com.nursingunit.boot + nursing-unit-service-directive + 2.0.0 + + 4.0.0 + + nu-service-directive-biz + + + + com.nursingunit.boot + nu-service-directive-local-api + ${nursingunit.version} + + + org.hibernate + hibernate-core + + + org.jeecgframework.boot + hibernate-re + + + + + org.jeecgframework + weixin4j + + + + + com.belerweb + pinyin4j + 2.5.0 + + + + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java similarity index 93% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java index bd92300..3178b74 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java @@ -27,10 +27,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_service_type") +@TableName("nu_config_service_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_service_type对象", description="服务类型") +@ApiModel(value="nu_config_service_type对象", description="服务类型") public class ConfigServiceType implements Serializable { private static final long serialVersionUID = 1L; @@ -41,7 +41,7 @@ public class ConfigServiceType implements Serializable { /**服务类别id*/ @Excel(name = "服务类别", width = 15) @ApiModelProperty(value = "服务类别") - @Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name") + @Dict(dicCode = "id" , dictTable = "nu_config_service_category" , dicText = "category_name") private java.lang.String categoryId; /**服务类型名称*/ @Excel(name = "服务类型名称", width = 15) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java similarity index 95% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java index 4f7e193..0fea656 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java @@ -27,10 +27,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_directive_tag") +@TableName("nu_config_directive_tag") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_directive_tag对象", description="指令标签") +@ApiModel(value="nu_config_directive_tag对象", description="指令标签") public class DirectiveTag implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java similarity index 95% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java index bd0802b..ffc5fec 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java @@ -27,10 +27,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_service_category") +@TableName("nu_config_service_category") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_service_category对象", description="服务类别") +@ApiModel(value="nu_config_service_category对象", description="服务类别") public class ConfigServiceCategory implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java similarity index 94% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java index 987d3a7..92d2687 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java @@ -22,10 +22,10 @@ import java.util.List; * @Version: V1.0 */ @Data -@TableName("config_service_directive") +@TableName("nu_config_service_directive") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_service_directive对象", description="服务指令") +@ApiModel(value="nu_config_service_directive对象", description="服务指令") public class ConfigServiceDirective implements Serializable { private static final long serialVersionUID = 1L; @@ -36,12 +36,12 @@ public class ConfigServiceDirective implements Serializable { /**服务类别id*/ @Excel(name = "服务类别", width = 15) @ApiModelProperty(value = "服务类别") - @Dict(dicCode = "id" , dictTable = "config_service_category" , dicText = "category_name") + @Dict(dicCode = "id" , dictTable = "nu_config_service_category" , dicText = "category_name") private java.lang.String categoryId; /**服务类型id*/ @Excel(name = "服务类型", width = 15) @ApiModelProperty(value = "服务类型") - @Dict(dicCode = "id" , dictTable = "config_service_type" , dicText = "type_name") + @Dict(dicCode = "id" , dictTable = "nu_config_service_type" , dicText = "type_name") private java.lang.String typeId; /**分类标签*/ @Excel(name = "分类标签", width = 15) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java similarity index 100% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml similarity index 91% rename from nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml rename to nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 81584bf..cfb9cb0 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -64,9 +64,9 @@ c.mp4_file, tag.id as tagId, tag.tag_name as tagName - FROM config_service_directive c - LEFT JOIN directive_tag d ON c.id = d.directive_id - LEFT JOIN config_directive_tag tag ON d.tag_id = tag.id + FROM nu_config_service_directive c + LEFT JOIN nu_directive_tag d ON c.id = d.directive_id + LEFT JOIN nu_config_directive_tag tag ON d.tag_id = tag.id c.id IN @@ -77,7 +77,7 @@ + +