diff --git a/nursing-unit-api/pom.xml b/nursing-unit-api/pom.xml new file mode 100644 index 0000000..b1aafac --- /dev/null +++ b/nursing-unit-api/pom.xml @@ -0,0 +1,21 @@ + + + + com.nursingunit.boot + nursing-unit-parent + 2.0.0 + + 接口模块 + 4.0.0 + nursing-unit-api + + + + com.nursingunit.boot + nursing-unit-base-core + 2.0.0 + + + diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 5e22e34..78a1828 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/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"); diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/controller/DirectivePackageController.java b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/controller/DirectivePackageController.java index 0acf7fe..2b46077 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/controller/DirectivePackageController.java +++ b/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 queryWrapper = QueryGenerator.initQueryWrapper(directivePackage, req.getParameterMap()); + Map customeRuleMap = new HashMap<>(); + // 自定义多选的查询规则为：LIKE_WITH_OR + customeRuleMap.put("packageName", QueryRuleEnum.LIKE_WITH_OR); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(directivePackage, req.getParameterMap(),customeRuleMap); Page page = new Page(pageNo, pageSize); queryWrapper.select("id"); IPage pageList = directivePackageService.page(page, queryWrapper); diff --git a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml index 50a6625..25cf720 100644 --- a/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml +++ b/nursing-unit-service-directive/nu-service-directive-biz/src/main/java/com/nu/modules/directivePackage/mapper/xml/DirectivePackageMapper.xml @@ -38,6 +38,8 @@ + + @@ -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 @@ -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 diff --git a/nursing-unit-service-directive/nu-service-directive-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 index 92d2687..40c0a8a 100644 --- a/nursing-unit-service-directive/nu-service-directive-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 @@ -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) diff --git a/nursing-unit-system/nu-system-start/pom.xml b/nursing-unit-system/nu-system-start/pom.xml index bd875dc..458fcda 100644 --- a/nursing-unit-system/nu-system-start/pom.xml +++ b/nursing-unit-system/nu-system-start/pom.xml @@ -48,7 +48,12 @@ nu-service-directive-biz ${nursingunit.version} - + + + com.nursingunit.boot + nursing-unit-api + ${nursingunit.version} + org.flywaydb diff --git a/pom.xml b/pom.xml index 3457cf1..aceb15d 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,8 @@ nursing-unit-admin nursing-unit-service-directive + + nursing-unit-api nursing-unit-system