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
+
+