diff --git a/nursing-unit-api/src/main/java/com/nu/modules/services/directive/api/DirectiveExportApi.java b/nursing-unit-api/src/main/java/com/nu/modules/services/directive/api/DirectiveExportApi.java index 198e160..21f61f8 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/services/directive/api/DirectiveExportApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/services/directive/api/DirectiveExportApi.java @@ -3,6 +3,7 @@ package com.nu.modules.services.directive.api; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.nu.modules.directive.api.DirectiveApi; +import com.nu.modules.directive.api.IDirectiveSyncCodeApi; import com.nu.modules.directive.entity.DirectiveExportApiEntity; import com.nu.modules.services.directive.entity.DirectiveExportDto; import org.jeecg.common.api.vo.Result; @@ -10,7 +11,10 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; +import java.util.Random; /** * 服务指令 !【暴露】! 接口 @@ -21,6 +25,8 @@ public class DirectiveExportApi { @Autowired private DirectiveApi directiveApi; + @Autowired + private IDirectiveSyncCodeApi directiveSyncCodeApi; @GetMapping("/queryCompareDirectives") public Result queryCompareDirectives(@RequestParam("orgCode") String orgCode) { @@ -37,4 +43,40 @@ public class DirectiveExportApi { resultData.put("list", list); return Result.ok(resultData); } + + /** + * 生成指令镜像码 需要机构编码 + * @param orgCode + * @return + */ + @GetMapping("/generateDirectiveSyncCode") + public Result generateDirectiveSyncCode(@RequestParam("createBy") String createBy,@RequestParam("orgCode") String orgCode) { + JSONObject resultData = new JSONObject(); + resultData.put("directiveSyncCode", directiveSyncCodeApi.generateDirectiveSyncCode(createBy,orgCode)); + return Result.ok(resultData); + } + + /** + * 根据镜像码获取机构编码 + * @param syncCode + * @return + */ + @GetMapping("/getOrgCodeBySyncCode") + public Result getOrgCodeBySyncCode(@RequestParam("syncCode") String syncCode) { + JSONObject resultData = new JSONObject(); + resultData.put("orgCode", directiveSyncCodeApi.getOrgCodeBySyncCode(syncCode)); + return Result.ok(resultData); + } + + /** + * 根据机构编码获取镜像码 + * @param orgCode + * @return + */ + @GetMapping("/getSyncCodeByOrgCode") + public Result getSyncCodeByOrgCode(@RequestParam("orgCode") String orgCode) { + JSONObject resultData = new JSONObject(); + resultData.put("orgCode", directiveSyncCodeApi.getSyncCodeByOrgCode(orgCode)); + return Result.ok(resultData); + } } 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 6b9a861..5877806 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 @@ -131,8 +131,11 @@ public class ShiroConfig { filterChainDefinitionMap.put("/api/proxy/**", "anon");//代理请求 filterChainDefinitionMap.put("/api/baseInfo/**", "anon");//获取系统中信息 filterChainDefinitionMap.put("/api/services/directive/queryCompareDirectives", "anon");//服务指令暴露接口 - filterChainDefinitionMap.put("/api/services/elderTag/queryCompareElderTag", "anon");//长者标签暴露接口 + filterChainDefinitionMap.put("/api/services/directive/generateDirectiveSyncCode", "anon");//服务指令暴露接口 + filterChainDefinitionMap.put("/api/services/directive/getOrgCodeBySyncCode", "anon");//服务指令暴露接口 + filterChainDefinitionMap.put("/api/services/directive/getSyncCodeByOrgCode", "anon");//服务指令暴露接口 + filterChainDefinitionMap.put("/api/services/elderTag/queryCompareElderTag", "anon");//长者标签暴露接口 //update-begin--Author:scott Date:20221116 for:排除静态资源后缀 filterChainDefinitionMap.put("/", "anon");