Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

aipt-service/src/main/java/com/diagbot/web/ClinicalController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -31,25 +32,24 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/clinicaldata")
-@Api(value = "临床数据处理API", tags = { "临床数据处理API" })
+@Api(value = "临床数据处理API", tags = { "知识库标准化-临床数据处理API" })
 @SuppressWarnings("unchecked")
 public class ClinicalController {
     @Autowired
     private ClinicalFacade clinicalFacade;
 
-    @ApiOperation(value = "临床数据处理", notes = "")
+    @ApiOperation(value = "知识库标准化-临床数据处理(只是用大数据推理)", notes = "")
     @PostMapping("/processData")
     @SysLogger("processData")
     public RespDTO<ResponseData> processData(@Valid @RequestBody SearchVo searchVo) {
-
         ResponseData data = clinicalFacade.processClinicalData(searchVo);
-
         return RespDTO.onSuc(data);
     }
 
     @ApiOperation(value = "获取量表", notes = "")
     @PostMapping("/scale")
     @SysLogger("scale")
+    @ApiIgnore
     public RespDTO<Map<String, Object>> scale(@RequestBody SearchVo searchVo) {
         Map<String, Object> data = clinicalFacade.scale(searchVo);
         return RespDTO.onSuc(data);
@@ -66,12 +66,13 @@ public class ClinicalController {
     @ApiOperation(value = "高危诊断", notes = "")
     @PostMapping("/highRisk")
     @SysLogger("highRisk")
+    @ApiIgnore
     public RespDTO<GdbResponse> highRisk(@RequestBody SearchVo searchVo) {
         GdbResponse data = clinicalFacade.highRiskPageData(searchVo);
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "计算接口", notes = "")
+    @ApiOperation(value = "知识库标准化-计算接口", notes = "")
     @PostMapping("/scaleCalc")
     @SysLogger("scaleCalc")
     public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {

aipt-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -43,7 +43,7 @@ public class ConceptDetailController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "知识库标准化-获取提示信息[by:zhaops]", notes = "")
+    @ApiOperation(value = "知识库标准化-获取提示信息存在性[by:zhaops]", notes = "")
     @PostMapping("/exist")
     @SysLogger("exist")
     public RespDTO<Bool> exist(@Valid @RequestBody ConceptBaseVO conceptBaseVO) {

aipt-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -22,20 +22,18 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/disclaimerInformation")
-@Api(value = "免责申明详情API[by:wangfeng]", tags = { "WF——免责申明详情API" })
+@Api(value = "免责申明详情API[by:wangfeng]", tags = { "知识库标准化-免责申明详情API" })
 @SuppressWarnings("unchecked")
 public class DisclaimerInformationController {
 
     @Autowired
     DisclaimerInformationFacade disclaimerInformationFacade;
 
-    @ApiOperation(value = "获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
+    @ApiOperation(value = "知识库标准化-获取免责申明详情[by:wangfeng]", notes = "获取免责申明详情")
     @PostMapping("/getDisclaimerInformations")
     @SysLogger("getDisclaimerInformations")
     public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
-
         List<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation();
-
         return RespDTO.onSuc(data);
     }
 }

aipt-service/src/main/java/com/diagbot/web/DiseaseIcdController.java

@@ -28,13 +28,13 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/diseaseIcd")
-@Api(value = "对应的诊断icd API", tags = { "对应的诊断icd API" })
+@Api(value = "对应的诊断icd API", tags = { "知识库标准化-对应的诊断icd API" })
 @SuppressWarnings("unchecked")
 public class DiseaseIcdController {
     @Autowired
     DiseaseIcdFacade diseaseIcdFacade;
 
-    @ApiOperation(value = "各医院对应的诊断icd——查询[by:wangyu]",
+    @ApiOperation(value = "知识库标准化-各医院对应的诊断icd——查询[by:wangyu]",
             notes = "questions：疾病id，必填<br>" +
                     "hospitalCode:医院编号，必填<br>")
     @PostMapping("/getDiseaseIcds")

aipt-service/src/main/java/com/diagbot/web/FeatureController.java

@@ -21,12 +21,12 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/feature")
-@Api(value = "文本特征词提取相关API", tags = { "文本特征词提取相关API" })
+@Api(value = "文本特征词提取相关API", tags = { "知识库标准化-文本特征词提取相关API" })
 public class FeatureController {
     @Autowired
     private FeatureFacade featureFacade;
 
-    @ApiOperation(value = "症状特征词提取", notes = "")
+    @ApiOperation(value = "知识库标准化-症状特征词提取", notes = "")
     @PostMapping("/symptomFeature")
     @SysLogger("symptomFeature")
     public RespDTO<List<FeatureConceptDTO>> getSymptomFeature(@RequestParam("text") String text) {

aipt-service/src/main/java/com/diagbot/web/IndexDataController.java

@@ -1,23 +1,21 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexConfigAndDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexDataFacade;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
 
 /**
  * <p>
@@ -33,27 +31,23 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class IndexDataController {
 
-	@Autowired
-	IndexDataFacade indexDataFacade;
-
-	@ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
-	@PostMapping("/getIndexDatas")
-	@SysLogger("getIndexDatas")
-	public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
-
-		IndexConfigAndDataDTO data = indexDataFacade.getIndexDataAll(indexDataFindVO);
-
-		return RespDTO.onSuc(data);
-	}
-
-	@ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
-	@PostMapping("/saveIndexDatas")
-	@SysLogger("saveIndexDatas")
-	@Transactional
-	public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
-
-		boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
-
-		return RespDTO.onSuc(res);
-	}
+    @Autowired
+    IndexDataFacade indexDataFacade;
+
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标数据[by:wangfeng]", notes = "diseaseName：疾病名  必填<br> patientId:患者id ,必填<br> startTime:开始时间 ,必填<br> endTime:结束时间 ,必填<br> ")
+    @PostMapping("/getIndexDatas")
+    @SysLogger("getIndexDatas")
+    public RespDTO<IndexConfigAndDataDTO> getIndexDatas(@Valid @RequestBody IndexDataFindVO indexDataFindVO) {
+        IndexConfigAndDataDTO data = indexDataFacade.getIndexDataAll(indexDataFindVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "知识库标准化-保存指标数据[by:wangfeng]", notes = "patientId : 患者id 必填<br> inquiryCode ：就诊号  必填<br> IndexData：{指标公表名 :indexUnique;指标值indexValue;指标单位 indexUnit;是否异常 isAbnormal;化验时间creatTime;}")
+    @PostMapping("/saveIndexDatas")
+    @SysLogger("saveIndexDatas")
+    @Transactional
+    public RespDTO<Boolean> saveIndexDatas(@Valid @RequestBody IndexDataSaveVO indexDataSaveVO) {
+        boolean res = indexDataFacade.saveIndexDatas(indexDataSaveVO);
+        return RespDTO.onSuc(res);
+    }
 }

aipt-service/src/main/java/com/diagbot/web/NLPController.java

@@ -1,37 +0,0 @@
-package com.diagbot.web;
-
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.facade.NLPFacade;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/4/2 11:31
- */
-@RestController
-@RequestMapping("/nlpService")
-@Api(value = "NLP相关API", tags = { "NLP相关API" })
-@SuppressWarnings("unchecked")
-public class NLPController {
-    @Autowired
-    NLPFacade nlpFacade;
-
-    @ApiOperation(value = "症状特征词提取", notes = "")
-    @PostMapping("/symptomFeature")
-    @SysLogger("symptomFeature")
-    public RespDTO<List<Map<String, Object>>> symptomFeaturePageData(@RequestParam("text") String text) {
-        List<Map<String, Object>> data = nlpFacade.symptomFeaturePageData(text);
-        return RespDTO.onSuc(data);
-    }
-}

aipt-service/src/main/java/com/diagbot/web/PushController.java

@@ -23,13 +23,13 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/push")
-@Api(value = "推理相关API", tags = { "推理相关API" })
+@Api(value = "推理相关API", tags = { "知识库标准化-推理相关API" })
 @SuppressWarnings("unchecked")
 public class PushController {
     @Autowired
     private PushFacade pushFacade;
 
-    @ApiOperation(value = "治疗方案[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-治疗方案[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，M：男，F：女<br>" +
                     "symptom：症状,String<br>" +
@@ -59,7 +59,7 @@ public class PushController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "推理接口[by:zhaops]",
+    @ApiOperation(value = "知识库标准化-推理接口[by:zhaops]",
             notes = "age： 年龄(必填)<br>" +
                     "sex：性别(必填)，M：男，F：女<br>" +
                     "symptom：症状,String<br>" +

icss-service/src/main/java/com/diagbot/client/AiptServiceClient.java

@@ -4,7 +4,6 @@ import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
 import com.diagbot.client.bean.DisTypeVO;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.client.hystrix.AiptServiceHystrix;
@@ -54,15 +53,9 @@ public interface AiptServiceClient {
     @PostMapping(value = "/clinicaldata/processData")
     RespDTO<ResponseData> aiptData(@RequestBody SearchData searchData);
 
-    @PostMapping(value = "/clinicaldata/scale")
-    RespDTO<Map<String, Object>> scale(@RequestBody SearchData searchData);
-
     @PostMapping(value = "/feature/symptomFeature")
     RespDTO<List<FeatureConceptDTO>> symptomFeature(@RequestParam("text") String text);
 
-    @PostMapping("/clinicaldata/highRisk")
-    RespDTO<GdbResponse> highRisk(@RequestBody SearchData searchData);
-
     @PostMapping(value = "/clinicaldata/scaleCalc")
     RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData);
 
@@ -121,7 +114,7 @@ public interface AiptServiceClient {
      * @return
      */
     @PostMapping("/indexConfig/getindexConfigs")
-    public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO);
+    RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO);
 
     /**
      * 根据概念Id列表获取概念列表Map
@@ -202,5 +195,4 @@ public interface AiptServiceClient {
 
     @PostMapping("/disclaimerInformation/getDisclaimerInformations")
     RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations();
-
 }

icss-service/src/main/java/com/diagbot/client/bean/GdbResponse.java

@@ -1,18 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 图形数据库数据返回结构
- * Created by Mark Huang on 2018/10/26.
- */
-@Getter
-@Setter
-public class GdbResponse {
-    private String status = "";
-    private Map<String, String> Result = new HashMap<>();
-}

icss-service/src/main/java/com/diagbot/client/bean/IndicationResult.java

@@ -1,16 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/3/18 15:14
- */
-@Getter
-@Setter
-public class IndicationResult {
-    private String name;
-    private String result;
-}

icss-service/src/main/java/com/diagbot/client/bean/ResponseTreatData.java

@@ -1,19 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/17 15:05
- */
-@Getter
-@Setter
-public class ResponseTreatData {
-    private String status;
-    private Map<String, Map<String, List<MedicitionClass>>> result;
-}

icss-service/src/main/java/com/diagbot/client/bean/TreatInput.java

@@ -1,16 +0,0 @@
-package com.diagbot.client.bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2018/12/18 10:53
- */
-@Getter
-@Setter
-public class TreatInput {
-    private String disease;
-    private String filds;
-}

icss-service/src/main/java/com/diagbot/client/hystrix/AiptServiceHystrix.java

@@ -5,7 +5,6 @@ import com.diagbot.client.bean.CalculateData;
 import com.diagbot.client.bean.ConceptBaseVO;
 import com.diagbot.client.bean.ConceptExistVO;
 import com.diagbot.client.bean.DisTypeVO;
-import com.diagbot.client.bean.GdbResponse;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.client.bean.SearchData;
 import com.diagbot.dto.ConceptBaseDTO;
@@ -58,24 +57,12 @@ public class AiptServiceHystrix implements AiptServiceClient {
         return null;
     }
 
-    @Override
-    public RespDTO<Map<String, Object>> scale(@RequestBody SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "scale");
-        return null;
-    }
-
     @Override
     public RespDTO<List<FeatureConceptDTO>> symptomFeature(@RequestParam("text") String text) {
         log.error("【hystrix】调用{}异常", "symptomFeaturePageData");
         return null;
     }
 
-    @Override
-    public RespDTO<GdbResponse> highRisk(@RequestBody SearchData searchData) {
-        log.error("【hystrix】调用{}异常", "highRisk");
-        return null;
-    }
-
     @Override
     public RespDTO<Map<String, Object>> scaleCalc(@RequestBody CalculateData calculateData) {
         log.error("【hystrix】调用{}异常", "scaleCalc");
@@ -263,7 +250,7 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
     @Override
-    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations(){
+    public RespDTO<List<DisclaimerInformationDTO>> getDisclaimerInformations() {
         log.error("【hystrix】调用{}异常", "getDisclaimerInformations");
         return null;
     }

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -99,18 +99,6 @@ public class PushFacade {
         return res.data;
     }
 
-    /**
-     * 获取量表
-     *
-     * @param searchData
-     * @return
-     */
-    public Map<String, Object> scale(SearchData searchData) {
-        RespDTO<Map<String, Object>> res = aiptServiceClient.scale(searchData);
-        RespDTOUtil.respNGDealCover(res, "量表数据暂无内容");
-        return res.data;
-    }
-
     /**
      * 推理接口
      *

icssman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -27,11 +27,10 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .csrf().disable()
                 .authorizeRequests()
                 .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
-                .antMatchers("/file/deleteRemoteFile").permitAll()
-                .antMatchers("/file/uploadImage").permitAll()
+//                .antMatchers("/icssfile/deleteRemoteFile").permitAll()
+//                .antMatchers("/icssfile/uploadImage").permitAll()
                 .antMatchers("/introduceInfo/saveIntroduce").permitAll()
                 .antMatchers("/dictionaryInfo/getList").permitAll()
-                .antMatchers("/deptInfo/getAllDepts").permitAll()
                 .antMatchers("/getIcssEnumsData").permitAll()
                 .antMatchers("/**").authenticated();
 //                        .antMatchers("/**").permitAll();

icssman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -89,11 +89,10 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/druid/**", request)
                 || matchers("/actuator/**", request)
                 || matchers("/hystrix/**", request)
-                || matchers("/file/deleteRemoteFile", request)
-                || matchers("/file/uploadImage", request)
+//                || matchers("/icssfile/deleteRemoteFile", request)
+//                || matchers("/icssfile/uploadImage", request)
                 || matchers("/getIcssEnumsData", request)
                 || matchers("/dictionaryInfo/getList", request)
-                || matchers("/deptInfo/getAllDepts", request)
                 || matchers("/", request)) {
             return true;
         }

icssman-service/src/main/java/com/diagbot/web/UploadController.java

@@ -1,48 +1,48 @@
-package com.diagbot.web;
-
-import com.diagbot.dto.FileDTO;
-import com.diagbot.facade.UploadFacade;
-import com.diagbot.util.FastJsonUtils;
-import com.diagbot.util.StringUtil;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@RestController
-@Api(value = "文件上传API", tags = { "文件上传API" })
-@RequestMapping(value = "/file")
-@SuppressWarnings("unchecked")
-public class UploadController {
-    @Autowired
-    private UploadFacade uploadFacade;
-
-    @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
-    @PostMapping(value = "/uploadImage", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public String singleFileUpload(@RequestParam("upfile") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
-        FileDTO fileDTO = uploadFacade.singleFileUpload(file);
-        String data = FastJsonUtils.getBeanToJson(fileDTO);
-        response.setContentType("text/plain;charset=UTF-8");
-
-        String callback = request.getParameter("callback");//客户端请求参数
-        if (callback != null && StringUtil.isNotBlank(callback)) {
-            data = callback + "(" + data + ")";
-        }
-        return data;
-    }
-
-    @PostMapping("/deleteRemoteFile")
-    public String deleteRemoteFile(@RequestParam("path") String path) {
-        String data = FastJsonUtils.getBeanToJson(uploadFacade.deleteRemoteFile(path));
-        return data;
-    }
-}
+//package com.diagbot.web;
+//
+//import com.diagbot.dto.FileDTO;
+//import com.diagbot.facade.UploadFacade;
+//import com.diagbot.util.FastJsonUtils;
+//import com.diagbot.util.StringUtil;
+//import io.swagger.annotations.Api;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.http.MediaType;
+//import org.springframework.web.bind.annotation.CrossOrigin;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestMethod;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//
+//@RestController
+//@Api(value = "文件上传API", tags = { "文件上传API" })
+//@RequestMapping(value = "/icssfile")
+//@SuppressWarnings("unchecked")
+//public class UploadController {
+//    @Autowired
+//    private UploadFacade uploadFacade;
+//
+//    @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", methods = { RequestMethod.POST }, origins = "*")
+//    @PostMapping(value = "/uploadImage", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+//    public String singleFileUpload(@RequestParam("upfile") MultipartFile file, HttpServletRequest request, HttpServletResponse response) {
+//        FileDTO fileDTO = uploadFacade.singleFileUpload(file);
+//        String data = FastJsonUtils.getBeanToJson(fileDTO);
+//        response.setContentType("text/plain;charset=UTF-8");
+//
+//        String callback = request.getParameter("callback");//客户端请求参数
+//        if (callback != null && StringUtil.isNotBlank(callback)) {
+//            data = callback + "(" + data + ")";
+//        }
+//        return data;
+//    }
+//
+//    @PostMapping("/deleteRemoteFile")
+//    public String deleteRemoteFile(@RequestParam("path") String path) {
+//        String data = FastJsonUtils.getBeanToJson(uploadFacade.deleteRemoteFile(path));
+//        return data;
+//    }
+//}

knowledgeman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -26,6 +26,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .csrf().disable()
                 .authorizeRequests()
                 .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
+                .antMatchers("/getIcssEnumsData").permitAll()
+                .antMatchers("/concept/getConceptMap").permitAll()
+                .antMatchers("/concept/getConceptListByType").permitAll()
                 .antMatchers("/**").authenticated();
 //                .antMatchers("/**").permitAll();
     }

knowledgeman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -89,6 +89,9 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/druid/**", request)
                 || matchers("/actuator/**", request)
                 || matchers("/hystrix/**", request)
+                || matchers("/getIcssEnumsData", request)
+                || matchers("/concept/getConceptMap", request)
+                || matchers("/concept/getConceptListByType", request)
                 || matchers("/", request)) {
             return true;
         }

knowledgeman-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -37,6 +37,7 @@ import com.diagbot.vo.RemoveConceptInfoVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import springfox.documentation.annotations.ApiIgnore;
 
 /**
  * <p>
@@ -123,6 +124,7 @@ public class ConceptController {
             notes = "conceptIds: 术语Id列表")
     @PostMapping("/getConceptMap")
     @SysLogger("getConceptMap")
+    @ApiIgnore
     public RespDTO<Map<String, Long>> getConceptMap(@RequestBody ConceptSearchVO conceptSearchVO) {
         return RespDTO.onSuc(conceptFacade.getConceptMap(conceptSearchVO));
     }
@@ -137,6 +139,7 @@ public class ConceptController {
             notes = "type: 1:科室、2:辅检、3:慢病")
     @PostMapping("/getConceptListByType")
     @SysLogger("getConceptListByType")
+    @ApiIgnore
     public RespDTO<List<ConceptBaseDTO>> getConceptListByType(@RequestBody ConceptTypeVO conceptTypeVO) {
         return RespDTO.onSuc(conceptFacade.getConceptListByType(conceptTypeVO));
     }