diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java index e520a63..fac0f4b 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/entity/OrgAllInfo.java @@ -39,6 +39,10 @@ public class OrgAllInfo implements Serializable { * 是否标准指令库 0是1否 */ private String izDirectiveMain; + /** + * 媒体资源访问地址 + */ + private String mediaUrl; /** * 省份 */ diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml index 26bd13d..39dca90 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/orgapplyinfo/mapper/xml/OrgApplyInfoMapper.xml @@ -10,6 +10,7 @@ d.url, d.plat_type, d.iz_directive_main, + d.media_url, o.open_id, o.wechat_name, o.tel, diff --git a/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java index 8fc39c1..0e48046 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java @@ -55,6 +55,20 @@ public class SysBaseInfoApi { return Result.ok(result); } + /** + * 根据机构编码获取机构媒体资源访问地址 + * + * @return + */ + @GetMapping("/getMediaUrlByOrgCode") + public Result getMediaUrlByOrgCode(@RequestParam("orgCode") String orgCode) { + JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode); + Map result = Maps.newHashMap(); + String mediaUrl = deptInfo.getString("mediaUrl"); + result.put("mediaUrl", mediaUrl.endsWith("/") ? mediaUrl : mediaUrl + "/"); + return Result.ok(result); + } + /** * 根据机构编码获取机构api接口前缀 * diff --git a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java index 1e973fd..56c8c10 100644 --- a/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java +++ b/nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/entity/SysDepartEntity.java @@ -68,6 +68,10 @@ public class SysDepartEntity implements Serializable { * 是否标准指令库 0是1否 */ private String izDirectiveMain; + /** + * 媒体资源访问地址 + */ + private String mediaUrl; /** * 省份 */ 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 316c16c..23efd55 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 @@ -88,6 +88,10 @@ public class SysDepart implements Serializable { * 是否标准指令库 0是1否 */ private String izDirectiveMain; + /** + * 媒体资源访问地址 + */ + private String mediaUrl; /** * 省份 */ @@ -256,6 +260,7 @@ public class SysDepart implements Serializable { Objects.equals(url, depart.url) && Objects.equals(contextPath, depart.contextPath) && Objects.equals(izDirectiveMain, depart.izDirectiveMain) && + Objects.equals(mediaUrl, depart.mediaUrl) && Objects.equals(province, depart.province) && Objects.equals(city, depart.city) && Objects.equals(district, depart.district) && @@ -284,7 +289,7 @@ public class SysDepart implements Serializable { public int hashCode() { return Objects.hash(super.hashCode(), id, parentId, departName, departNameEn, departNameAbbr, departOrder, description, orgCategory, - orgType, orgCode, url, contextPath, izDirectiveMain, province, city, district, operationStartTime, + orgType, orgCode, url, contextPath, izDirectiveMain,mediaUrl, province, city, district, operationStartTime, operationEndTime, contractStartTime, contractEndTime, mobile, fax, address, memo, status, delFlag, createBy, createTime, updateBy, updateTime, tenantId, payableAmount); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index fb2a123..e5a2e5d 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -71,6 +71,8 @@ public class SysDepartTreeModel implements Serializable { private String izDirectiveMain; + private String mediaUrl; + private String province; private String city; @@ -144,6 +146,7 @@ public class SysDepartTreeModel implements Serializable { this.url = sysDepart.getUrl(); this.contextPath = sysDepart.getContextPath(); this.izDirectiveMain = sysDepart.getIzDirectiveMain(); + this.mediaUrl = sysDepart.getMediaUrl(); this.province = sysDepart.getProvince(); this.city = sysDepart.getCity(); this.district = sysDepart.getDistrict(); @@ -508,6 +511,14 @@ public class SysDepartTreeModel implements Serializable { this.contextPath = contextPath; } + public String getMediaUrl() { + return mediaUrl; + } + + public void setMediaUrl(String mediaUrl) { + this.mediaUrl = mediaUrl; + } + /** * 重写equals方法 */ @@ -534,6 +545,7 @@ public class SysDepartTreeModel implements Serializable { Objects.equals(url, model.url) && Objects.equals(contextPath, model.contextPath) && Objects.equals(izDirectiveMain, model.izDirectiveMain) && + Objects.equals(mediaUrl, model.mediaUrl) && Objects.equals(province, model.province) && Objects.equals(city, model.city) && Objects.equals(district, model.district) && @@ -565,7 +577,7 @@ public class SysDepartTreeModel implements Serializable { return Objects.hash(id, parentId, platType, departName, departNameEn, departNameAbbr, departOrder, description, orgCategory, orgType, orgCode, url, contextPath, izDirectiveMain, province, city, district, - operationStartTime, operationEndTime, contractStartTime, contractEndTime, + mediaUrl, operationStartTime, operationEndTime, contractStartTime, contractEndTime, mobile, fax, address, memo, status, delFlag, qywxIdentifier, createBy, createTime, updateBy, updateTime, children, directorUserIds, payableAmount); } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index a47f2a3..619107c 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -1933,6 +1933,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { map.put("url",list.get(0).getUrl()); map.put("contextPath",list.get(0).getContextPath()); map.put("izDirectiveMain",list.get(0).getIzDirectiveMain()); + map.put("mediaUrl",list.get(0).getMediaUrl()); } return new JSONObject(map); }