From 8819a6ba0a95c9e741730d7aebceacec497dc308 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 8 Apr 2025 09:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=9E=84=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/config/shiro/ShiroConfig.java | 3 +++ .../controller/SysDepartController.java | 25 +++++++++++++++++++ .../modules/system/entity/SysDepart.java | 3 +++ 3 files changed, 31 insertions(+) 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 e9d534f..8ae6d16 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 @@ -105,6 +105,9 @@ public class ShiroConfig { //filterChainDefinitionMap.put("/sys/common/download/**", "anon");//文件下载不限制token filterChainDefinitionMap.put("/generic/**", "anon");//pdf预览需要文件 + filterChainDefinitionMap.put("/sys/sysDepart/queryInstitutionsList", "anon");//pdf预览需要文件 + + filterChainDefinitionMap.put("/sys/getLoginQrcode/**", "anon"); //登录二维码 filterChainDefinitionMap.put("/sys/getQrcodeToken/**", "anon"); //监听扫码 filterChainDefinitionMap.put("/sys/checkAuth", "anon"); //授权接口排除 diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index e701c95..4a1ca7f 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -2,6 +2,7 @@ package org.jeecg.modules.system.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; @@ -683,4 +684,28 @@ public class SysDepartController { return Result.error("文件导入失败！"); } + + /** + * 人员入住可选择的机构 + * @return + */ + @RequestMapping(value = "/queryInstitutionsList", method = RequestMethod.GET) + public List> queryInstitutionsList() { + List> result = new ArrayList<>(); + QueryWrapper query = new QueryWrapper<>(); + query.eq("del_flag","0"); + query.eq("org_category","1"); + query.eq("org_type","1"); + query.isNotNull("server_url"); + List list = sysDepartService.list(query); + for(SysDepart depart : list){ + Map map = new HashMap<>(); + map.put("id",depart.getId()); + map.put("departName",depart.getDepartName()); + map.put("serverUrl",depart.getServerUrl()); + result.add(map); + } + return result; + } + } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index 35e4fc9..39f8ae7 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -94,6 +94,9 @@ public class SysDepart implements Serializable { /**是否有叶子节点: 1是0否*/ private Integer izLeaf; + /**各机构服务器后台接口地址*/ + private String serverUrl; + //update-begin---author:wangshuai ---date:20200308 for：[JTC-119]在部门管理菜单下设置部门负责人，新增字段负责人ids和旧的负责人ids /**部门负责人的ids*/ @TableField(exist = false)