diff --git a/nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/pom.xml similarity index 81% rename from nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml rename to nursing-unit-admin/nu-admin-api/nu-admin-local-api/pom.xml index dfeacb1..59cf75e 100644 --- a/nursing-unit-config/nu-config-api/nu-config-local-api/pom.xml +++ b/nursing-unit-admin/nu-admin-api/nu-admin-local-api/pom.xml @@ -4,11 +4,10 @@ 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-admin-api 2.0.0 4.0.0 - - nu-config-local-api + nu-admin-local-api diff --git a/nursing-unit-config/nu-config-api/pom.xml b/nursing-unit-admin/nu-admin-api/pom.xml similarity index 82% rename from nursing-unit-config/nu-config-api/pom.xml rename to nursing-unit-admin/nu-admin-api/pom.xml index 1fa3625..79e967c 100644 --- a/nursing-unit-config/nu-config-api/pom.xml +++ b/nursing-unit-admin/nu-admin-api/pom.xml @@ -4,16 +4,15 @@ 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-admin 2.0.0 4.0.0 - - nu-config-api + nu-admin-api pom - nu-config-local-api + nu-admin-local-api 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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/pom.xml b/nursing-unit-admin/pom.xml similarity index 75% rename from nursing-unit-config/pom.xml rename to nursing-unit-admin/pom.xml index 7e2fcdf..b36b042 100644 --- a/nursing-unit-config/pom.xml +++ b/nursing-unit-admin/pom.xml @@ -7,14 +7,14 @@ nursing-unit-parent 2.0.0 + nu基础管理模块 4.0.0 - - nursing-unit-config + nursing-unit-admin pom - nu-config-api - nu-config-biz + nu-admin-api + nu-admin-biz 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-api/nu-invoicing-local-api/pom.xml b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml new file mode 100644 index 0000000..7c44f9b --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/pom.xml @@ -0,0 +1,14 @@ + + + + com.nursingunit.boot + nu-invoicing-api + 2.0.0 + + 4.0.0 + + nu-invoicing-local-api + + diff --git a/nursing-unit-invoicing/nu-invoicing-api/pom.xml b/nursing-unit-invoicing/nu-invoicing-api/pom.xml new file mode 100644 index 0000000..ddea156 --- /dev/null +++ b/nursing-unit-invoicing/nu-invoicing-api/pom.xml @@ -0,0 +1,25 @@ + + + + com.nursingunit.boot + nursing-unit-invoicing + 2.0.0 + + 4.0.0 + + nu-invoicing-api + pom + + + nu-invoicing-local-api + + + + + com.nursingunit.boot + nursing-unit-base-core + + + 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 98% 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 index 9b7d7f6..20b90ca 100644 --- 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 @@ -25,7 +25,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_material_category") +@TableName("nu_config_material_category") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="config_material_category对象", description="物料类别") 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 85% 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 index 89f0e3b..98e9ded 100644 --- 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 @@ -25,7 +25,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_material_info") +@TableName("nu_config_material_info") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="config_material_info对象", description="物料信息") @@ -37,18 +37,18 @@ public class ConfigMaterialInfo implements Serializable { @ApiModelProperty(value = "id") private java.lang.String id; /**物料类别*/ - @Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id") - @Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id") + @Excel(name = "物料类别", width = 15, dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id") + @Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id") @ApiModelProperty(value = "物料类别") private java.lang.String categoryId; /**物料类型*/ - @Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id") - @Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id") + @Excel(name = "物料类型", width = 15, dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id") + @Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id") @ApiModelProperty(value = "物料类型") private java.lang.String typeId; /**用药类型*/ - @Excel(name = "用药类型", width = 15, dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id") - @Dict(dictTable = "config_material_medication", dicText = "medication_name", dicCode = "id") + @Excel(name = "用药类型", width = 15, dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id") + @Dict(dictTable = "nu_config_material_medication", dicText = "medication_name", dicCode = "id") @ApiModelProperty(value = "用药类型") private java.lang.String medicationId; /**货品名称*/ @@ -108,9 +108,9 @@ public class ConfigMaterialInfo implements Serializable { @ApiModelProperty(value = "多单位采购默认使用 0子集 1父级 2爷级") private java.lang.String multiUnitType; /**供应商*/ - @Excel(name = "供应商", width = 15,dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") + @Excel(name = "供应商", width = 15,dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") @ApiModelProperty(value = "供应商") - @Dict(dictTable = "config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") + @Dict(dictTable = "nu_config_suppliers_info" , dicCode = "id" , dicText = "suppliers_name") private java.lang.String suppliers; /**物料图片*/ @ApiModelProperty(value = "物料图片") 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 85% 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 index 4c9f924..efa2ad5 100644 --- 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 @@ -27,7 +27,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_material_medication") +@TableName("nu_config_material_medication") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="config_material_medication对象", description="物料用药类型") @@ -39,13 +39,13 @@ public class ConfigMaterialMedication implements Serializable { @ApiModelProperty(value = "id") private java.lang.String id; /**物料类别*/ - @Excel(name = "物料类别", width = 15, dictTable = "config_material_category", dicText = "category_name", dicCode = "id") - @Dict(dictTable = "config_material_category", dicText = "category_name", dicCode = "id") + @Excel(name = "物料类别", width = 15, dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id") + @Dict(dictTable = "nu_config_material_category", dicText = "category_name", dicCode = "id") @ApiModelProperty(value = "物料类别") private java.lang.String categoryId; /**物料类型*/ - @Excel(name = "物料类型", width = 15, dictTable = "config_material_type", dicText = "type_name", dicCode = "id") - @Dict(dictTable = "config_material_type", dicText = "type_name", dicCode = "id") + @Excel(name = "物料类型", width = 15, dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id") + @Dict(dictTable = "nu_config_material_type", dicText = "type_name", dicCode = "id") @ApiModelProperty(value = "物料类型") private java.lang.String typeId; /**名称*/ 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 91% 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 index 16fe4bb..5eb211c 100644 --- 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 @@ -27,7 +27,7 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_material_type") +@TableName("nu_config_material_type") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @ApiModel(value="config_material_type对象", description="物料类型") @@ -39,9 +39,9 @@ public class ConfigMaterialType implements Serializable { @ApiModelProperty(value = "id") private java.lang.String id; /**物料类别*/ - @Excel(name = "物料类别", width = 15,dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id") + @Excel(name = "物料类别", width = 15,dictTable = "nu_config_material_category" , dicText = "category_name" , dicCode = "id") @ApiModelProperty(value = "物料类别") - @Dict(dictTable = "config_material_category" , dicText = "category_name" , dicCode = "id") + @Dict(dictTable = "nu_config_material_category" , dicText = "category_name" , dicCode = "id") private java.lang.String categoryId; /**物料类型*/ @Excel(name = "物料类型", width = 15) 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 75% 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 index 5412f1c..0fee51d 100644 --- 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 @@ -13,9 +13,9 @@ a.id as category_id, b.id as type_id, c.id as medication_id - from config_material_category a - LEFT JOIN config_material_type b on a.id = b.category_id and b.iz_enabled = 0 and b.del_flag = 0 - LEFT JOIN config_material_medication c on b.id = c.type_id and c.iz_enabled = 0 and c.del_flag = 0 + from nu_config_material_category a + LEFT JOIN nu_config_material_type b on a.id = b.category_id and b.iz_enabled = 0 and b.del_flag = 0 + LEFT JOIN nu_config_material_medication c on b.id = c.type_id and c.iz_enabled = 0 and c.del_flag = 0 where a.iz_enabled = 0 and a.del_flag = 0 order by a.sort asc,b.id asc,c.id asc ) a ${ew.customSqlSegment} 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 99% 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 index 51b11bb..47e5a7f 100644 --- 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 @@ -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-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/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 97% 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 index a175275..79a6ef5 100644 --- 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 @@ -27,10 +27,10 @@ import lombok.experimental.Accessors; * @Version: V1.0 */ @Data -@TableName("config_suppliers_info") +@TableName("nu_config_suppliers_info") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@ApiModel(value="config_suppliers_info对象", description="供应商") +@ApiModel(value="nu_config_suppliers_info对象", description="供应商") public class ConfigSuppliersInfo implements Serializable { private static final long serialVersionUID = 1L; 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/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-invoicing/pom.xml b/nursing-unit-invoicing/pom.xml new file mode 100644 index 0000000..86701b0 --- /dev/null +++ b/nursing-unit-invoicing/pom.xml @@ -0,0 +1,20 @@ + + + + com.nursingunit.boot + nursing-unit-parent + 2.0.0 + + 进销存 + 4.0.0 + nursing-unit-invoicing + pom + + + nu-invoicing-api + nu-invoicing-biz + + + 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 ServiceImplnursing-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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 93% rename from nursing-unit-config/nu-config-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 index b5d952b..12375d2 100644 --- a/nursing-unit-config/nu-config-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 @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 服务指令 @@ -69,6 +70,14 @@ public class ConfigServiceDirectiveController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap); queryWrapper.select("id"); + //如果有服务指令需要提前查询下对应的服务指令id + List directiveIds = null; + if (StringUtils.isNotBlank(configServiceDirective.getTags())) { + directiveIds = configServiceDirectiveService.queryDirectiveIdByTagIds(configServiceDirective.getTags()); + if(directiveIds != null && !directiveIds.isEmpty()){ + queryWrapper.in("id", directiveIds.stream().map(ConfigServiceDirective::getId).collect(Collectors.toList())); + } + } Page page = new Page(pageNo, pageSize); IPage list = configServiceDirectiveService.page(page, queryWrapper); List pageList = service.pageList(configServiceDirective, list); diff --git a/nursing-unit-config/nu-config-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-config/nu-config-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-config/nu-config-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-config/nu-config-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 88% rename from nursing-unit-config/nu-config-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 index 7cb10e2..20db783 100644 --- a/nursing-unit-config/nu-config-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 @@ -35,6 +35,12 @@ public interface ConfigServiceDirectiveMapper extends BaseMapper queryDirectiveIdByTagIds(@Param("tagIds") String tagIds); + /** * 查询指令标签是否被使用 * @return diff --git a/nursing-unit-config/nu-config-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 84% rename from nursing-unit-config/nu-config-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..ff3ae31 100644 --- a/nursing-unit-config/nu-config-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 @@ -76,8 +76,15 @@ ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc + +