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

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -136,16 +136,16 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 //.antMatchers("/sys/plan/revStopPlans").permitAll()
                 .antMatchers("/sys/tokenHospital/getTokenHospital").permitAll()
                 .antMatchers("/demo/retrieval/index").permitAll()
-                .antMatchers("/graph/conceptInfo/staticKnowledgeIndex").permitAll()
-                .antMatchers("/graph/conceptInfo/staticKnowledgeIndexWithoutInfo").permitAll()
-                .antMatchers("/graph/conceptInfo/getStaticKnowledge").permitAll()
-                .antMatchers("/graph/conceptInfo/getStaticKnowledgeForHIS").permitAll()
-                .antMatchers("/graph/conceptInfo/getPage").permitAll()
-                //.antMatchers("/graph/conceptInfo/saveOrUpdateRecord").permitAll()
-                //.antMatchers("/graph/conceptInfo/changeStatus").permitAll()
-                .antMatchers("/graph/conceptInfo/isExist").permitAll()
-                .antMatchers("/graph/conceptInfo/getRecordById").permitAll()
-                .antMatchers("/graph/conceptInfo/updateHasInfoStatusBatch").permitAll()
+                .antMatchers("/kl/conceptInfo/staticKnowledgeIndex").permitAll()
+                .antMatchers("/kl/conceptInfo/staticKnowledgeIndexWithoutInfo").permitAll()
+                .antMatchers("/kl/conceptInfo/getStaticKnowledge").permitAll()
+                .antMatchers("/kl/conceptInfo/getStaticKnowledgeForHIS").permitAll()
+                .antMatchers("/kl/conceptInfo/getPage").permitAll()
+                //.antMatchers("/kl/conceptInfo/saveOrUpdateRecord").permitAll()
+                //.antMatchers("/kl/conceptInfo/changeStatus").permitAll()
+                .antMatchers("/kl/conceptInfo/isExist").permitAll()
+                .antMatchers("/kl/conceptInfo/getRecordById").permitAll()
+                .antMatchers("/kl/conceptInfo/updateHasInfoStatusBatch").permitAll()
                 .antMatchers("/sys/planDetail/getPlanDetailDatas").permitAll()
                 //.antMatchers("/sys/planDetail/savePlanDetails").permitAll()
                 //.antMatchers("/sys/planDetail/cancelPlanDetails").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -178,16 +178,16 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 //|| matchers("/sys/plan/revStopPlans", request)
                 || matchers("/sys/tokenHospital/getTokenHospital", request)
                 || matchers("/demo/retrieval/index", request)
-                || matchers("/graph/conceptInfo/staticKnowledgeIndex", request)
-                || matchers("/graph/conceptInfo/staticKnowledgeIndexWithoutInfo", request)
-                || matchers("/graph/conceptInfo/getStaticKnowledge", request)
-                || matchers("/graph/conceptInfo/getStaticKnowledgeForHIS", request)
-                || matchers("/graph/conceptInfo/getPage", request)
-                //|| matchers("/graph/conceptInfo/saveOrUpdateRecord", request)
-                //|| matchers("/graph/conceptInfo/changeStatus", request)
-                || matchers("/graph/conceptInfo/isExist", request)
-                || matchers("/graph/conceptInfo/getRecordById", request)
-                || matchers("/graph/conceptInfo/updateHasInfoStatusBatch", request)
+                || matchers("/kl/conceptInfo/staticKnowledgeIndex", request)
+                || matchers("/kl/conceptInfo/staticKnowledgeIndexWithoutInfo", request)
+                || matchers("/kl/conceptInfo/getStaticKnowledge", request)
+                || matchers("/kl/conceptInfo/getStaticKnowledgeForHIS", request)
+                || matchers("/kl/conceptInfo/getPage", request)
+                //|| matchers("/kl/conceptInfo/saveOrUpdateRecord", request)
+                //|| matchers("/kl/conceptInfo/changeStatus", request)
+                || matchers("/kl/conceptInfo/isExist", request)
+                || matchers("/kl/conceptInfo/getRecordById", request)
+                || matchers("/kl/conceptInfo/updateHasInfoStatusBatch", request)
                 || matchers("/sys/planDetail/getPlanDetailDatas", request)
                 /*|| matchers("/sys/planDetail/savePlanDetails", request)
                 || matchers("/sys/planDetail/cancelPlanDetails", request)

src/main/java/com/diagbot/web/ConceptInfoController.java

@@ -39,7 +39,7 @@ import java.util.List;
  * @since 2020-08-18
  */
 @RestController
-@RequestMapping("/graph/conceptInfo")
+@RequestMapping("/kl/conceptInfo")
 @Api(value = "静态知识标准术语相关API", tags = { "静态知识标准术语相关API" })
 @SuppressWarnings("unchecked")
 public class ConceptInfoController {
@@ -57,7 +57,6 @@ public class ConceptInfoController {
     @SysLogger("staticKnowledgeIndex")
     public RespDTO<List<StaticKnowledgeIndexDTO>> staticKnowledgeIndex(@Valid @RequestBody StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
         staticKnowledgeIndexVO.setHasInfo(1);
-        //List<StaticKnowledgeIndexDTO> data = conceptInfoFacade.staticKnowledgeIndexWithInfo(staticKnowledgeIndexVO);
         List<StaticKnowledgeIndexDTO> data = klConceptStaticFacade.staticKnowledgeIndex(staticKnowledgeIndexVO);
         return RespDTO.onSuc(data);
     }
@@ -70,7 +69,6 @@ public class ConceptInfoController {
     @Transactional
     public RespDTO<List<StaticKnowledgeIndexDTO>> staticKnowledgeIndexWithoutInfo(@Valid @RequestBody StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
         staticKnowledgeIndexVO.setHasInfo(0);
-        //List<StaticKnowledgeIndexDTO> data = conceptInfoFacade.staticKnowledgeIndexWithoutInfo(staticKnowledgeIndexVO);
         List<StaticKnowledgeIndexDTO> data = klConceptStaticFacade.staticKnowledgeIndex(staticKnowledgeIndexVO);
         return RespDTO.onSuc(data);
     }
@@ -82,7 +80,6 @@ public class ConceptInfoController {
     @PostMapping("/getStaticKnowledge")
     @SysLogger("getStaticKnowledge")
     public RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody StaticKnowledgeVO staticKnowledgeVO) {
-        //StaticKnowledgeDTO data = conceptInfoFacade.getStaticKnowledge(staticKnowledgeVO);
         StaticKnowledgeDTO data = klConceptStaticFacade.getStaticKnowledge(staticKnowledgeVO);
         return RespDTO.onSuc(data);
     }
@@ -95,7 +92,6 @@ public class ConceptInfoController {
     @PostMapping("/getStaticKnowledgeForHIS")
     @SysLogger("getStaticKnowledgeForHIS")
     public RespDTO<List<StaticKnowledgeHISDTO>> getStaticKnowledgeForHIS(@Valid @RequestBody StaticKnowledgeHISVO staticKnowledgeHISVO) {
-        //List<StaticKnowledgeHISDTO> data = conceptInfoFacade.getStaticKnowledgeForHIS(staticKnowledgeHISVO);
         List<StaticKnowledgeHISDTO> data = klConceptStaticFacade.getStaticKnowledgeForHIS(staticKnowledgeHISVO);
         return RespDTO.onSuc(data);
     }
@@ -108,7 +104,6 @@ public class ConceptInfoController {
     @SysLogger("getPage")
     @SuppressWarnings("unchecked")
     public RespDTO<IPage<KlConceptStaticDTO>> getPage(@Valid @RequestBody KlConceptStaticPageVO klConceptStaticPageVO) {
-        //IPage<ConceptInfoDTO> data = conceptInfoFacade.getPage(conceptInfoPageVO);
         IPage<KlConceptStaticDTO> data = klConceptStaticFacade.getPage(klConceptStaticPageVO);
         return RespDTO.onSuc(data);
     }
@@ -124,7 +119,6 @@ public class ConceptInfoController {
     @SysLogger("saveOrUpdateRecord")
     @Transactional
     public RespDTO<Boolean> saveOrUpdateRecord(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
-        //Boolean data = conceptInfoFacade.saveOrUpdateRecord(conceptInfoVO);
         Boolean data = klConceptStaticFacade.saveOrUpdateRecord(klConceptStaticVO);
         return RespDTO.onSuc(data);
     }
@@ -136,7 +130,6 @@ public class ConceptInfoController {
     @SysLogger("changeStatus")
     @Transactional
     public RespDTO<Boolean> changeStatus(@Valid @RequestBody ChangeStatusVO changeStatusVO) {
-        //Boolean data = conceptInfoFacade.changeStatus(changeStatusVO);
         Boolean data = klConceptStaticFacade.changeStatus(changeStatusVO);
         return RespDTO.onSuc(data);
     }
@@ -147,7 +140,6 @@ public class ConceptInfoController {
     @PostMapping("/isExist")
     @SysLogger("isExist")
     public RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
-        //Boolean data = conceptInfoFacade.isExist(conceptInfoVO);
         Boolean data = klConceptStaticFacade.isExist(klConceptStaticVO);
         return RespDTO.onSuc(data);
     }
@@ -157,7 +149,6 @@ public class ConceptInfoController {
     @PostMapping("/getRecordById")
     @SysLogger("getRecordById")
     public RespDTO<KlConceptStaticDTO> getRecordById(@Valid @RequestBody IdVO idVO) {
-        //ConceptInfoDTO data = conceptInfoFacade.getRecordById(idVO);
         KlConceptStaticDTO data = klConceptStaticFacade.getRecordById(idVO);
         return RespDTO.onSuc(data);
     }