1、新增api接口模块

2、调整服务指令包相关代码

nursing-unit-api/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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-parent</artifactId>
+        <version>2.0.0</version>
+    </parent>
+    <description>接口模块</description>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>nursing-unit-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.nursingunit.boot</groupId>
+            <artifactId>nursing-unit-base-core</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+    </dependencies>
+</project>

nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -108,7 +108,6 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码
         filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码
         filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除
-        filterChainDefinitionMap.put("/dictType/dictType/abc", "anon");//TODO 待删除
 
         //update-begin--Author:scott Date:20221116 for：排除静态资源后缀
         filterChainDefinitionMap.put("/", "anon");

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

@@ -13,6 +13,7 @@ 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;
@@ -20,6 +21,8 @@ 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: 服务指令包
@@ -51,7 +54,10 @@ public class DirectivePackageController extends JeecgController<DirectivePackage
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                          HttpServletRequest req) {
-        QueryWrapper<DirectivePackage> queryWrapper = QueryGenerator.initQueryWrapper(directivePackage, req.getParameterMap());
+        Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
+        // 自定义多选的查询规则为：LIKE_WITH_OR
+        customeRuleMap.put("packageName", QueryRuleEnum.LIKE_WITH_OR);
+        QueryWrapper<DirectivePackage> queryWrapper = QueryGenerator.initQueryWrapper(directivePackage, req.getParameterMap(),customeRuleMap);
         Page<DirectivePackage> page = new Page<DirectivePackage>(pageNo, pageSize);
         queryWrapper.select("id");
         IPage<DirectivePackage> pageList = directivePackageService.page(page, queryWrapper);

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

@@ -38,6 +38,8 @@
             <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" />
             <!-- 关联的标签列表 -->
             <collection property="tagList" ofType="com.nu.modules.directiveTag.entity.DirectiveTag">
                 <id property="id" column="tag_id" />
@@ -98,7 +100,9 @@
         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
+        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_directive_package
         <where>
@@ -111,6 +115,8 @@
         LEFT JOIN nu_config_service_directive csd ON pd.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>
 

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

@@ -130,15 +130,24 @@ public class ConfigServiceDirective implements Serializable {
     @ApiModelProperty(value = "视频文件")
     private java.lang.String mp4File;
 
-
+    //合并单元格用：类别合并的行数
     @TableField(exist = false)
     private Integer categoryRowSpan;
+    //合并单元格用：类型合并的行数
     @TableField(exist = false)
     private Integer typeRowSpan;
+    //合并单元格用：分类标签合并的行数
     @TableField(exist = false)
     private Integer instructionRowSpan;
     @TableField(exist = false)
+    //指令标签id,id,id
     private String tags;
+    @TableField(exist = false)
+    //服务类别名称
+    private String categoryName;
+    //服务类型名称
+    @TableField(exist = false)
+    private String typeName;
 
     //服务指令标签
     @TableField(exist = false)

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

@@ -48,7 +48,12 @@
             <artifactId>nu-service-directive-biz</artifactId>
             <version>${nursingunit.version}</version>
         </dependency>
-
+        <!-- 接口 模块 -->
+        <dependency>
+            <groupId>com.nursingunit.boot</groupId>
+            <artifactId>nursing-unit-api</artifactId>
+            <version>${nursingunit.version}</version>
+        </dependency>
         <!-- flyway 数据库自动升级 -->
         <dependency>
             <groupId>org.flywaydb</groupId>

pom.xml

@@ -80,6 +80,8 @@
 		<module>nursing-unit-admin</module>
 		<!--	服务指令模块	-->
 		<module>nursing-unit-service-directive</module>
+		<!--	接口 模块	-->
+		<module>nursing-unit-api</module>
 		<!--	系统模块	-->
 		<module>nursing-unit-system</module>
     </modules>