nursing-unit-api/src/main/java/com/nu/modules/nuApiServiceCategory/mapper/xml/NuConfigServiceDirectiveMapper.xml

@@ -27,9 +27,6 @@
         csd.sys_org_code,
         csd.mp3_file,
         csd.mp4_file,
-        csd.preview_file,
-        csd.immediate_file,
-        cdt.id AS tag_id,
         cdt.tag_name
         FROM  nu_config_service_directive csd
         LEFT JOIN (

nursing-unit-service-directive/nu-service-directive-api/nu-service-directive-local-api/pom.xml

@@ -4,11 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.nursingunit.boot</groupId>
-        <artifactId>nu-services-api</artifactId>
+        <artifactId>nu-service-directive-api</artifactId>
         <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>nu-services-local-api</artifactId>
+    <artifactId>nu-service-directive-local-api</artifactId>
 
 </project>

nursing-unit-service-directive/nu-service-directive-api/pom.xml

@@ -4,16 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.nursingunit.boot</groupId>
-        <artifactId>nursing-unit-services</artifactId>
+        <artifactId>nursing-unit-service-directive</artifactId>
         <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>nu-services-api</artifactId>
+    <artifactId>nu-service-directive-api</artifactId>
     <packaging>pom</packaging>
 
     <modules>
-        <module>nu-services-local-api</module>
+        <module>nu-service-directive-local-api</module>
     </modules>
 
     <dependencies>

nursing-unit-service-directive/nu-service-directive-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">
 	<parent>
 		<groupId>com.nursingunit.boot</groupId>
-		<artifactId>nursing-unit-services</artifactId>
+		<artifactId>nursing-unit-service-directive</artifactId>
 		<version>2.0.0</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>nu-services-biz</artifactId>
+	<artifactId>nu-service-directive-biz</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.nursingunit.boot</groupId>
-			<artifactId>nu-services-local-api</artifactId>
+			<artifactId>nu-service-directive-local-api</artifactId>
 			<version>${nursingunit.version}</version>
 		</dependency>
 		<dependency>

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java

@@ -1,10 +1,10 @@
-package com.nu.modules.servicetype.controller;
+package com.nu.modules.ServiceType.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.modules.servicetype.entity.ConfigServiceType;
-import com.nu.modules.servicetype.service.IConfigServiceTypeService;
+import com.nu.modules.ServiceType.entity.ConfigServiceType;
+import com.nu.modules.ServiceType.service.IConfigServiceTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/entity/ConfigServiceType.java

@@ -1,11 +1,15 @@
-package com.nu.modules.servicetype.entity;
+package com.nu.modules.ServiceType.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;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/ConfigServiceTypeMapper.java

@@ -1,6 +1,9 @@
-package com.nu.modules.servicetype.mapper;
+package com.nu.modules.ServiceType.mapper;
 
-import com.nu.modules.servicetype.entity.ConfigServiceType;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.nu.modules.ServiceType.entity.ConfigServiceType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/mapper/xml/ConfigServiceTypeMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.servicetype.mapper.ConfigServiceTypeMapper">
+<mapper namespace="com.nu.modules.ServiceType.mapper.ConfigServiceTypeMapper">
 
 </mapper>

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java

@@ -1,6 +1,6 @@
-package com.nu.modules.servicetype.service;
+package com.nu.modules.ServiceType.service;
 
-import com.nu.modules.servicetype.entity.ConfigServiceType;
+import com.nu.modules.ServiceType.entity.ConfigServiceType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java

@@ -1,11 +1,11 @@
-package com.nu.modules.servicetype.service.impl;
+package com.nu.modules.ServiceType.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.nu.modules.servicetype.entity.ConfigServiceType;
-import com.nu.modules.servicetype.mapper.ConfigServiceTypeMapper;
-import com.nu.modules.servicetype.service.IConfigServiceTypeService;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
-import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService;
+import com.nu.modules.ServiceType.entity.ConfigServiceType;
+import com.nu.modules.ServiceType.mapper.ConfigServiceTypeMapper;
+import com.nu.modules.ServiceType.service.IConfigServiceTypeService;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/controller/DirectivePackageController.java

@@ -1,10 +1,10 @@
-package com.nu.modules.directivepackage.controller;
+package com.nu.modules.directivePackage.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.modules.directivepackage.entity.DirectivePackage;
-import com.nu.modules.directivepackage.service.IDirectivePackageService;
+import com.nu.modules.directivePackage.entity.DirectivePackage;
+import com.nu.modules.directivePackage.service.IDirectivePackageService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/entity/DirectivePackage.java

@@ -1,10 +1,15 @@
-package com.nu.modules.directivepackage.entity;
+package com.nu.modules.directivePackage.entity;
 
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
+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;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/DirectivePackageMapper.java

@@ -1,9 +1,10 @@
-package com.nu.modules.directivepackage.mapper;
+package com.nu.modules.directivePackage.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
-import com.nu.modules.directivepackage.entity.DirectivePackage;
+import com.nu.modules.directivePackage.entity.DirectivePackage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.directivepackage.mapper.DirectivePackageMapper">
+<mapper namespace="com.nu.modules.directivePackage.mapper.DirectivePackageMapper">
 
     <!-- 定义 resultMap -->
-    <resultMap id="DirectivePackageResultMap" type="com.nu.modules.directivepackage.entity.DirectivePackage">
+    <resultMap id="DirectivePackageResultMap" type="com.nu.modules.directivePackage.entity.DirectivePackage">
         <id property="id" column="id" />
         <result property="packageName" column="package_name" />
         <result property="description" column="description" />
@@ -15,7 +15,7 @@
         <result property="updateBy" column="update_by" />
         <result property="updateTime" column="update_time" />
         <!-- 关联的指令列表 -->
-        <collection property="directives" ofType="com.nu.modules.servicedirective.entity.ConfigServiceDirective">
+        <collection property="directives" ofType="com.nu.modules.serviceDirective.entity.ConfigServiceDirective">
             <id property="id" column="directive_id" />
             <result property="directiveName" column="directive_name" />
             <result property="categoryId" column="category_id" />
@@ -40,10 +40,8 @@
             <result property="mp4File" column="mp4_file" />
             <result property="categoryName" column="csc_category_name" />
             <result property="typeName" column="cst_type_name" />
-            <result property="previewFile" column="preview_file"/>
-            <result property="immediateFile" column="immediate_file"/>
             <!-- 关联的标签列表 -->
-            <collection property="tagList" ofType="com.nu.modules.directivetag.entity.DirectiveTag">
+            <collection property="tagList" ofType="com.nu.modules.directiveTag.entity.DirectiveTag">
                 <id property="id" column="tag_id" />
                 <result property="tagName" column="tag_name" />
                 <result property="sort" column="tag_sort" />
@@ -93,8 +91,6 @@
         csd.sys_org_code AS directive_sys_org_code,
         csd.mp3_file,
         csd.mp4_file,
-        csd.preview_file,
-        csd.immediate_file,
         cdt.id AS tag_id,
         cdt.tag_name,
         cdt.sort AS tag_sort,
@@ -137,6 +133,10 @@
                 AND iz_enabled = #{directivePackage.izEnabled}
             </if>
         </where>
+    </select>
+    <select id="queryByPackageId" resultType="com.nu.modules.directivePackage.entity.DirectivePackage">
+
+
     </select>
 
     <delete id="deleteDirectives">

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/IDirectivePackageService.java

@@ -1,9 +1,12 @@
-package com.nu.modules.directivepackage.service;
+package com.nu.modules.directivePackage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nu.modules.directivepackage.entity.DirectivePackage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.nu.modules.directivePackage.entity.DirectivePackage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 服务指令包
  * @Author: 张明远

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/service/impl/DirectivePackageServiceImpl.java

@@ -1,14 +1,16 @@
-package com.nu.modules.directivepackage.service.impl;
+package com.nu.modules.directivePackage.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.nu.modules.directivepackage.entity.DirectivePackage;
-import com.nu.modules.directivepackage.mapper.DirectivePackageMapper;
-import com.nu.modules.directivepackage.service.IDirectivePackageService;
+import com.nu.modules.directivePackage.entity.DirectivePackage;
+import com.nu.modules.directivePackage.mapper.DirectivePackageMapper;
+import com.nu.modules.directivePackage.service.IDirectivePackageService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 服务指令包

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java

@@ -1,10 +1,10 @@
-package com.nu.modules.directivetag.controller;
+package com.nu.modules.directiveTag.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.modules.directivetag.entity.DirectiveTag;
-import com.nu.modules.directivetag.service.IDirectiveTagService;
+import com.nu.modules.directiveTag.entity.DirectiveTag;
+import com.nu.modules.directiveTag.service.IDirectiveTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/entity/DirectiveTag.java

@@ -1,11 +1,15 @@
-package com.nu.modules.directivetag.entity;
+package com.nu.modules.directiveTag.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;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/DirectiveTagMapper.java

@@ -1,6 +1,9 @@
-package com.nu.modules.directivetag.mapper;
+package com.nu.modules.directiveTag.mapper;
 
-import com.nu.modules.directivetag.entity.DirectiveTag;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.nu.modules.directiveTag.entity.DirectiveTag;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/mapper/xml/DirectiveTagMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.directivetag.mapper.DirectiveTagMapper">
+<mapper namespace="com.nu.modules.directiveTag.mapper.DirectiveTagMapper">
 
 </mapper>

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java

@@ -1,6 +1,6 @@
-package com.nu.modules.directivetag.service;
+package com.nu.modules.directiveTag.service;
 
-import com.nu.modules.directivetag.entity.DirectiveTag;
+import com.nu.modules.directiveTag.entity.DirectiveTag;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java

@@ -1,9 +1,11 @@
-package com.nu.modules.directivetag.service.impl;
+package com.nu.modules.directiveTag.service.impl;
 
-import com.nu.modules.directivetag.entity.DirectiveTag;
-import com.nu.modules.directivetag.mapper.DirectiveTagMapper;
-import com.nu.modules.directivetag.service.IDirectiveTagService;
-import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.nu.modules.directiveTag.entity.DirectiveTag;
+import com.nu.modules.directiveTag.mapper.DirectiveTagMapper;
+import com.nu.modules.directiveTag.service.IDirectiveTagService;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -11,6 +13,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * @Description: 指令标签

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java

@@ -1,10 +1,10 @@
-package com.nu.modules.servicecategory.controller;
+package com.nu.modules.serviceCategory.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.modules.servicecategory.entity.ConfigServiceCategory;
-import com.nu.modules.servicecategory.service.IConfigServiceCategoryService;
+import com.nu.modules.serviceCategory.entity.ConfigServiceCategory;
+import com.nu.modules.serviceCategory.service.IConfigServiceCategoryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/entity/ConfigServiceCategory.java

@@ -1,11 +1,15 @@
-package com.nu.modules.servicecategory.entity;
+package com.nu.modules.serviceCategory.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;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/ConfigServiceCategoryMapper.java

@@ -1,6 +1,9 @@
-package com.nu.modules.servicecategory.mapper;
+package com.nu.modules.serviceCategory.mapper;
 
-import com.nu.modules.servicecategory.entity.ConfigServiceCategory;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.nu.modules.serviceCategory.entity.ConfigServiceCategory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/mapper/xml/ConfigServiceCategoryMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.servicecategory.mapper.ConfigServiceCategoryMapper">
+<mapper namespace="com.nu.modules.serviceCategory.mapper.ConfigServiceCategoryMapper">
 
 </mapper>

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java

@@ -1,6 +1,6 @@
-package com.nu.modules.servicecategory.service;
+package com.nu.modules.serviceCategory.service;
 
-import com.nu.modules.servicecategory.entity.ConfigServiceCategory;
+import com.nu.modules.serviceCategory.entity.ConfigServiceCategory;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java

@@ -1,13 +1,13 @@
-package com.nu.modules.servicecategory.service.impl;
+package com.nu.modules.serviceCategory.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.nu.modules.servicetype.entity.ConfigServiceType;
-import com.nu.modules.servicetype.service.IConfigServiceTypeService;
-import com.nu.modules.servicecategory.entity.ConfigServiceCategory;
-import com.nu.modules.servicecategory.mapper.ConfigServiceCategoryMapper;
-import com.nu.modules.servicecategory.service.IConfigServiceCategoryService;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
-import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService;
+import com.nu.modules.ServiceType.entity.ConfigServiceType;
+import com.nu.modules.ServiceType.service.IConfigServiceTypeService;
+import com.nu.modules.serviceCategory.entity.ConfigServiceCategory;
+import com.nu.modules.serviceCategory.mapper.ConfigServiceCategoryMapper;
+import com.nu.modules.serviceCategory.service.IConfigServiceCategoryService;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java

@@ -1,10 +1,12 @@
-package com.nu.modules.servicedirective.controller;
+package com.nu.modules.serviceDirective.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.ListUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
-import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/entity/ConfigServiceDirective.java

@@ -1,8 +1,8 @@
-package com.nu.modules.servicedirective.entity;
+package com.nu.modules.serviceDirective.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.nu.modules.directivetag.entity.DirectiveTag;
+import com.nu.modules.directiveTag.entity.DirectiveTag;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -122,17 +122,13 @@ public class ConfigServiceDirective implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
 	/**语音文件*/
+	@Excel(name = "语音文件", width = 15)
     @ApiModelProperty(value = "语音文件")
     private java.lang.String mp3File;
 	/**视频文件*/
+	@Excel(name = "视频文件", width = 15)
     @ApiModelProperty(value = "视频文件")
     private java.lang.String mp4File;
-    /**预览图片*/
-    @ApiModelProperty(value = "预览图片")
-    private java.lang.String previewFile;
-    /**即时指令图片*/
-    @ApiModelProperty(value = "即时指令图片")
-    private java.lang.String immediateFile;
 
     //合并单元格用：类别合并的行数
     @TableField(exist = false)

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java

@@ -1,9 +1,11 @@
-package com.nu.modules.servicedirective.mapper;
+package com.nu.modules.serviceDirective.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper">
+<mapper namespace="com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper">
 
     <!-- 自定义结果映射 -->
     <resultMap id="ConfigServiceDirectiveResultMap"
-               type="com.nu.modules.servicedirective.entity.ConfigServiceDirective">
+               type="com.nu.modules.serviceDirective.entity.ConfigServiceDirective">
         <id property="id" column="id"/>
         <result property="categoryId" column="category_id"/>
         <result property="typeId" column="type_id"/>
@@ -28,10 +28,8 @@
         <result property="sysOrgCode" column="sys_org_code"/>
         <result property="mp3File" column="mp3_file"/>
         <result property="mp4File" column="mp4_file"/>
-        <result property="previewFile" column="preview_file"/>
-        <result property="immediateFile" column="immediate_file"/>
 
-        <collection property="tagList" ofType="com.nu.modules.directivetag.entity.DirectiveTag">
+        <collection property="tagList" ofType="com.nu.modules.directiveTag.entity.DirectiveTag">
             <id property="id" column="tagId"/>
             <result property="tagName" column="tagName"/>
         </collection>
@@ -63,8 +61,6 @@
         c.sys_org_code,
         c.mp3_file,
         c.mp4_file,
-        c.preview_file,
-        c.immediate_file,
         tag.id as tagId,
         tag.tag_name as tagName
         FROM nu_config_service_directive c
@@ -79,7 +75,7 @@
         ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc
     </select>
 
-    <select id="queryDirectiveIdByTagIds" resultType="com.nu.modules.servicedirective.entity.ConfigServiceDirective">
+    <select id="queryDirectiveIdByTagIds" resultType="com.nu.modules.serviceDirective.entity.ConfigServiceDirective">
         SELECT distinct directive_id as id FROM nu_directive_tag WHERE tag_id IN
         <foreach collection="tagIds.split(',')" item="tagId" open="(" separator="," close=")">
             #{tagId}

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java

@@ -1,10 +1,13 @@
-package com.nu.modules.servicedirective.service;
+package com.nu.modules.serviceDirective.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.common.system.query.QueryRuleEnum;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 服务指令

nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/serviceDirective/service/impl/ConfigServiceDirectiveServiceImpl.java

@@ -1,14 +1,22 @@
-package com.nu.modules.servicedirective.service.impl;
+package com.nu.modules.serviceDirective.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.nu.modules.directivetag.entity.DirectiveTag;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
-import com.nu.modules.servicedirective.mapper.ConfigServiceDirectiveMapper;
-import com.nu.modules.servicedirective.service.IConfigServiceDirectiveService;
+import com.nu.modules.directiveTag.entity.DirectiveTag;
+import com.nu.modules.serviceDirective.entity.ConfigServiceDirective;
+import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper;
+import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService;
+import org.apache.commons.compress.utils.Lists;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.query.QueryRuleEnum;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

nursing-unit-service-directive/pom.xml

@@ -9,12 +9,12 @@
     </parent>
     <description>服务指令</description>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>nursing-unit-services</artifactId>
+    <artifactId>nursing-unit-service-directive</artifactId>
     <packaging>pom</packaging>
 
     <modules>
-        <module>nu-services-api</module>
-        <module>nu-services-biz</module>
+        <module>nu-service-directive-api</module>
+        <module>nu-service-directive-biz</module>
     </modules>
 
 </project>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/controller/ServiceTagController.java

@@ -1,178 +0,0 @@
-package com.nu.modules.servicetag.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.nu.modules.servicetag.entity.ServiceTag;
-import com.nu.modules.servicetag.service.IServiceTagService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.query.QueryRuleEnum;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Description: 服务标签
- * @Author: 张明远
- * @Date: 2025-03-31
- * @Version: V1.0
- */
-@Api(tags = "服务标签")
-@RestController
-@RequestMapping("/serviceTag/serviceTag")
-@Slf4j
-public class ServiceTagController extends JeecgController<ServiceTag, IServiceTagService> {
-    @Autowired
-    private IServiceTagService serviceTagService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param serviceTag
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    //@AutoLog(value = "服务标签-分页列表查询")
-    @ApiOperation(value = "服务标签-分页列表查询", notes = "服务标签-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<ServiceTag>> queryPageList(ServiceTag serviceTag,
-                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                         HttpServletRequest req) {
-        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
-        // 自定义多选的查询规则为：LIKE_WITH_OR
-        customeRuleMap.put("tagName", QueryRuleEnum.LIKE_WITH_OR);
-        QueryWrapper<ServiceTag> queryWrapper = QueryGenerator.initQueryWrapper(serviceTag, req.getParameterMap(),customeRuleMap);
-        Page<ServiceTag> page = new Page<ServiceTag>(pageNo, pageSize);
-        queryWrapper.select("id");
-        IPage<ServiceTag> pageList = serviceTagService.page(page, queryWrapper);
-        if (pageList.getRecords() != null && !pageList.getRecords().isEmpty()) {
-            serviceTagService.queryList(serviceTag, pageList);
-        }
-        return Result.OK(pageList);
-    }
-
-    /**
-     * 添加
-     *
-     * @param serviceTag
-     * @return
-     */
-    @AutoLog(value = "服务标签-添加")
-    @ApiOperation(value = "服务标签-添加", notes = "服务标签-添加")
-    @RequiresPermissions("serviceTag:servtag_directive:add")
-    @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody ServiceTag serviceTag) {
-        serviceTagService.save(serviceTag);
-        if (serviceTag.getDirectives() != null && !serviceTag.getDirectives().isEmpty()) {
-            serviceTagService.saveDirectives(serviceTag);
-        }
-        return Result.OK("添加成功！");
-    }
-
-    /**
-     * 编辑
-     *
-     * @param serviceTag
-     * @return
-     */
-    @AutoLog(value = "服务标签-编辑")
-    @ApiOperation(value = "服务标签-编辑", notes = "服务标签-编辑")
-    @RequiresPermissions("serviceTag:servtag_directive:edit")
-    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
-    public Result<String> edit(@RequestBody ServiceTag serviceTag) {
-        serviceTagService.updateById(serviceTag);
-        if (serviceTag.getDirectives() != null && !serviceTag.getDirectives().isEmpty()) {
-            serviceTagService.saveDirectives(serviceTag);
-        }
-        return Result.OK("编辑成功!");
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "服务标签-通过id删除")
-    @ApiOperation(value = "服务标签-通过id删除", notes = "服务标签-通过id删除")
-    @RequiresPermissions("serviceTag:servtag_directive:delete")
-    @DeleteMapping(value = "/delete")
-    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        serviceTagService.removeById(id);
-        return Result.OK("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "服务标签-批量删除")
-    @ApiOperation(value = "服务标签-批量删除", notes = "服务标签-批量删除")
-    @RequiresPermissions("serviceTag:servtag_directive:deleteBatch")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.serviceTagService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.OK("批量删除成功!");
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    //@AutoLog(value = "服务标签-通过id查询")
-    @ApiOperation(value = "服务标签-通过id查询", notes = "服务标签-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<ServiceTag> queryById(@RequestParam(name = "id", required = true) String id) {
-        ServiceTag serviceTag = serviceTagService.queryById(id);
-        if (serviceTag == null) {
-            return Result.error("未找到对应数据");
-        }
-        return Result.OK(serviceTag);
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param serviceTag
-     */
-    @RequiresPermissions("serviceTag:servtag_directive:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ServiceTag serviceTag) {
-        return super.exportXls(request, serviceTag, ServiceTag.class, "服务标签");
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequiresPermissions("serviceTag:servtag_directive:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ServiceTag.class);
-    }
-
-}

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java

@@ -1,77 +0,0 @@
-package com.nu.modules.servicetag.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
-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.List;
-
-/**
- * @Description: 服务标签
- * @Author: 张明远
- * @Date:   2025-03-31
- * @Version: V1.0
- */
-@Data
-@TableName("nu_service_tag")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="nu_service_tag对象", description="服务标签")
-public class ServiceTag implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**id*/
-	@TableId(type = IdType.ASSIGN_ID)
-    @ApiModelProperty(value = "id")
-    private String id;
-	/**服务标签名称*/
-	@Excel(name = "服务标签名称", width = 15)
-    @ApiModelProperty(value = "服务标签名称")
-    private String tagName;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private String description;
-	/**排序*/
-	@Excel(name = "排序", width = 15)
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-	/**是否启用 0启用 1未启用*/
-	@Excel(name = "是否启用", width = 15, dicCode = "iz_enabled")
-	@Dict(dicCode = "iz_enabled")
-    @ApiModelProperty(value = "是否启用")
-    private String izEnabled;
-	/**是否删除 0未删除 1删除*/
-	@Excel(name = "是否删除", width = 15)
-    @ApiModelProperty(value = "是否删除")
-    @TableLogic
-    private String delFlag;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-
-    @TableField(exist = false)
-    private List<ConfigServiceDirective> directives;
-}

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/ServiceTagMapper.java

@@ -1,24 +0,0 @@
-package com.nu.modules.servicetag.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.nu.modules.servicetag.entity.ServiceTag;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @Description: 服务标签
- * @Author: 张明远
- * @Date: 2025-03-31
- * @Version: V1.0
- */
-public interface ServiceTagMapper extends BaseMapper<ServiceTag> {
-
-    int deleteDirectives(@Param("tag") ServiceTag serviceTag);
-
-    int saveDirectives(@Param("tag") ServiceTag serviceTag);
-
-    List<ServiceTag> queryList( @Param("serviceTag") ServiceTag serviceTag,@Param("ids") List<ServiceTag> ids);
-
-    Long queryTotal(@Param("serviceTag") ServiceTag serviceTag);
-}

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml

@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.nu.modules.servicetag.mapper.ServiceTagMapper">
-
-    <!-- 定义 resultMap -->
-    <resultMap id="ServiceTagResultMap" type="com.nu.modules.servicetag.entity.ServiceTag">
-        <id property="id" column="id" />
-        <result property="tagName" column="tag_name" />
-        <result property="description" column="description" />
-        <result property="sort" column="sort" />
-        <result property="izEnabled" column="iz_enabled" />
-        <result property="delFlag" column="del_flag" />
-        <result property="createBy" column="create_by" />
-        <result property="createTime" column="create_time" />
-        <result property="updateBy" column="update_by" />
-        <result property="updateTime" column="update_time" />
-        <!-- 关联的指令列表 -->
-        <collection property="directives" ofType="com.nu.modules.servicedirective.entity.ConfigServiceDirective">
-            <id property="id" column="directive_id" />
-            <result property="directiveName" column="directive_name" />
-            <result property="categoryId" column="category_id" />
-            <result property="typeId" column="type_id" />
-            <result property="instructionTagId" column="instruction_tag_id" />
-            <result property="tollPrice" column="toll_price" />
-            <result property="comPrice" column="com_price" />
-            <result property="izReimbursement" column="iz_reimbursement" />
-            <result property="izPreferential" column="iz_preferential" />
-            <result property="chargingFrequency" column="charging_frequency" />
-            <result property="cycleType" column="cycle_type" />
-            <result property="serviceContent" column="service_content" />
-            <result property="serviceDuration" column="service_duration" />
-            <result property="izEnabled" column="directive_iz_enabled" />
-            <result property="delFlag" column="directive_del_flag" />
-            <result property="createBy" column="directive_create_by" />
-            <result property="createTime" column="directive_create_time" />
-            <result property="updateBy" column="directive_update_by" />
-            <result property="updateTime" column="directive_update_time" />
-            <result property="sysOrgCode" column="directive_sys_org_code" />
-            <result property="mp3File" column="mp3_file" />
-            <result property="mp4File" column="mp4_file" />
-            <result property="categoryName" column="csc_category_name" />
-            <result property="typeName" column="cst_type_name" />
-            <result property="previewFile" column="preview_file"/>
-            <result property="immediateFile" column="immediate_file"/>
-            <!-- 关联的标签列表 -->
-            <collection property="tagList" ofType="com.nu.modules.directivetag.entity.DirectiveTag">
-                <id property="id" column="tag_id" />
-                <result property="tagName" column="tag_name" />
-                <result property="sort" column="tag_sort" />
-                <result property="izEnabled" column="tag_iz_enabled" />
-                <result property="delFlag" column="tag_del_flag" />
-                <result property="createBy" column="tag_create_by" />
-                <result property="createTime" column="tag_create_time" />
-                <result property="updateBy" column="tag_update_by" />
-                <result property="updateTime" column="tag_update_time" />
-                <result property="sysOrgCode" column="tag_sys_org_code" />
-            </collection>
-        </collection>
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="queryList" resultMap="ServiceTagResultMap">
-        SELECT
-        dp.id,
-        dp.tag_name,
-        dp.description,
-        dp.sort,
-        dp.iz_enabled,
-        dp.del_flag,
-        dp.create_by,
-        dp.create_time,
-        dp.update_by,
-        dp.update_time,
-        csd.id AS directive_id,
-        csd.directive_name,
-        csd.category_id,
-        csd.type_id,
-        csd.instruction_tag_id,
-        csd.toll_price,
-        csd.com_price,
-        csd.iz_reimbursement,
-        csd.iz_preferential,
-        csd.charging_frequency,
-        csd.cycle_type,
-        csd.service_content,
-        csd.service_duration,
-        csd.iz_enabled AS directive_iz_enabled,
-        csd.del_flag AS directive_del_flag,
-        csd.create_by AS directive_create_by,
-        csd.create_time AS directive_create_time,
-        csd.update_by AS directive_update_by,
-        csd.update_time AS directive_update_time,
-        csd.sys_org_code AS directive_sys_org_code,
-        csd.mp3_file,
-        csd.mp4_file,
-        csd.preview_file,
-        csd.immediate_file,
-        cdt.id AS tag_id,
-        cdt.tag_name,
-        cdt.sort AS tag_sort,
-        cdt.iz_enabled AS tag_iz_enabled,
-        cdt.del_flag AS tag_del_flag,
-        cdt.create_by AS tag_create_by,
-        cdt.create_time AS tag_create_time,
-        cdt.update_by AS tag_update_by,
-        cdt.update_time AS tag_update_time,
-        cdt.sys_org_code AS tag_sys_org_code,
-        csc.category_name AS csc_category_name,
-        cst.type_name AS cst_type_name
-        FROM
-        (SELECT * FROM nu_service_tag
-        <where>
-            del_flag = '0' and id in
-            <foreach collection="ids" item="item" open="(" separator="," close=")">
-                #{item.id}
-            </foreach>
-        </where>) dp
-        LEFT JOIN nu_servtag_directive sd ON dp.id = sd.tag_id
-        LEFT JOIN nu_config_service_directive csd ON sd.directive_id = csd.id
-        LEFT JOIN nu_directive_tag dt ON csd.id = dt.directive_id
-        LEFT JOIN nu_config_directive_tag cdt ON dt.tag_id = cdt.id
-        LEFT JOIN nu_config_service_category csc ON csd.category_id = csc.id
-        LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id
-        order by dp.create_time desc
-    </select>
-
-    <!-- 查询总记录数 -->
-    <select id="queryTotal" resultType="java.lang.Long">
-        SELECT COUNT(*)
-        FROM nu_service_tag
-        <where>
-            del_flag = '0'
-            <if test="serviceTag.tagName != null and serviceTag.tagName != ''">
-                AND tag_name LIKE CONCAT('%', #{serviceTag.tagName}, '%')
-            </if>
-            <if test="serviceTag.izEnabled != null and serviceTag.izEnabled != ''">
-                AND iz_enabled = #{serviceTag.izEnabled}
-            </if>
-        </where>
-    </select>
-
-    <delete id="deleteDirectives">
-        delete from nu_servtag_directive where tag_id = #{tag.id}
-    </delete>
-
-    <insert id="saveDirectives">
-        INSERT INTO nu_servtag_directive (tag_id, directive_id, sort)
-        VALUES
-        <foreach collection="tag.getDirectives()" item="directive" separator=",">
-            (#{tag.id}, #{directive.id}, #{directive.sort})
-        </foreach>
-    </insert>
-</mapper>

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/IServiceTagService.java

@@ -1,24 +0,0 @@
-package com.nu.modules.servicetag.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.nu.modules.servicetag.entity.ServiceTag;
-
-/**
- * @Description: 服务标签
- * @Author: 张明远
- * @Date:   2025-03-31
- * @Version: V1.0
- */
-public interface IServiceTagService extends IService<ServiceTag> {
-
-    /**
-     * 存储服务标签对应的服务指令
-     * @param serviceTag
-     */
-    void saveDirectives(ServiceTag serviceTag);
-
-    void queryList(ServiceTag serviceTag, IPage<ServiceTag> pageList);
-
-    ServiceTag queryById(String id);
-}

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java

@@ -1,43 +0,0 @@
-package com.nu.modules.servicetag.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
-import com.nu.modules.servicetag.entity.ServiceTag;
-import com.nu.modules.servicetag.mapper.ServiceTagMapper;
-import com.nu.modules.servicetag.service.IServiceTagService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description: 服务标签
- * @Author: 张明远
- * @Date: 2025-03-31
- * @Version: V1.0
- */
-@Service
-public class ServiceTagServiceImpl extends ServiceImpl<ServiceTagMapper, ServiceTag> implements IServiceTagService {
-
-    @Override
-    public void saveDirectives(ServiceTag serviceTag) {
-        baseMapper.deleteDirectives(serviceTag);
-        baseMapper.saveDirectives(serviceTag);
-    }
-
-    @Override
-    public void queryList(ServiceTag serviceTag, IPage<ServiceTag> pageList) {
-        List<ServiceTag> record = baseMapper.queryList(serviceTag,pageList.getRecords());
-        pageList.setRecords(record);
-    }
-
-    @Override
-    public ServiceTag queryById(String id) {
-        List<ServiceTag> query = Lists.newArrayList();
-        ServiceTag queryDto = new ServiceTag().setId(id);
-        query.add(queryDto);
-        List<ServiceTag> serviceTags = baseMapper.queryList(null, query);
-        return serviceTags.stream().findFirst().orElse(null);
-    }
-
-}

nursing-unit-system/nu-system-start/pom.xml

@@ -45,7 +45,7 @@
         <!-- 服务指令 模块 -->
         <dependency>
             <groupId>com.nursingunit.boot</groupId>
-            <artifactId>nu-services-biz</artifactId>
+            <artifactId>nu-service-directive-biz</artifactId>
             <version>${nursingunit.version}</version>
         </dependency>
         <!-- 接口 模块 -->

nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml

@@ -80,10 +80,9 @@ spring:
             class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
             tablePrefix: QRTZ_
-            isClustered: false
+            isClustered: true
             misfireThreshold: 12000
-            clusterCheckinInterval: 0 #心跳检查 之前是15000
-            acquireTriggersWithinLock: false  # 减少锁竞争
+            clusterCheckinInterval: 15000
           threadPool:
             class: org.quartz.simpl.SimpleThreadPool
             threadCount: 10

pom.xml

@@ -79,7 +79,7 @@
 		<!--	nu基础模块	-->
 		<module>nursing-unit-admin</module>
 		<!--	服务指令模块	-->
-		<module>nursing-unit-services</module>
+		<module>nursing-unit-service-directive</module>
 		<!--	接口 模块	-->
 		<module>nursing-unit-api</module>
 		<!--	系统模块	-->