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

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

@@ -1,54 +1,54 @@
-package com.diagbot.web;
-
-
-import com.diagbot.dto.DisScaleDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.ScaleIndexDTO;
-import com.diagbot.facade.DisScaleFacade;
-import com.diagbot.vo.DisScaleVO;
-import com.diagbot.vo.ScaleIndexVO;
-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.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * <p>
- * 诊断量表映射表 前端控制器
- * </p>
- *
- * @author zhoutg
- * @since 2019-05-05
- */
-@RestController
-@RequestMapping("/scale")
-@Api(value = "诊断量表API", tags = { "知识库标准化-诊断量表API" })
-@SuppressWarnings("unchecked")
-public class DisScaleController {
-
-    @Autowired
-    DisScaleFacade disScaleFacade;
-
-    @ApiOperation(value = "知识库标准化-返回诊断量表列表[by:zhoutg]",
-            notes = "")
-    @PostMapping("/getList")
-    public RespDTO<List<DisScaleDTO>> getList(@Valid @RequestBody DisScaleVO scaleVO) {
-        List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO);
-        return RespDTO.onSuc(data);
-    }
-
-
-    @ApiOperation(value = "知识库标准化-量表搜索[by:zhoutg]",
-            notes = "")
-    @PostMapping("/index")
-    public RespDTO<List<ScaleIndexDTO>> index(@Valid @RequestBody ScaleIndexVO scaleVO) {
-        List<ScaleIndexDTO> data = disScaleFacade.indexFac(scaleVO);
-        return RespDTO.onSuc(data);
-    }
-}
+//package com.diagbot.web;
+//
+//
+//import com.diagbot.dto.DisScaleDTO;
+//import com.diagbot.dto.RespDTO;
+//import com.diagbot.dto.ScaleIndexDTO;
+//import com.diagbot.facade.DisScaleFacade;
+//import com.diagbot.vo.DisScaleVO;
+//import com.diagbot.vo.ScaleIndexVO;
+//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.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import javax.validation.Valid;
+//import java.util.List;
+//
+///**
+// * <p>
+// * 诊断量表映射表 前端控制器
+// * </p>
+// *
+// * @author zhoutg
+// * @since 2019-05-05
+// */
+//@RestController
+//@RequestMapping("/scale")
+//@Api(value = "诊断量表API", tags = { "知识库标准化-诊断量表API" })
+//@SuppressWarnings("unchecked")
+//public class DisScaleController {
+//
+//    @Autowired
+//    DisScaleFacade disScaleFacade;
+//
+//    @ApiOperation(value = "知识库标准化-返回诊断量表列表[by:zhoutg]",
+//            notes = "")
+//    @PostMapping("/getList")
+//    public RespDTO<List<DisScaleDTO>> getList(@Valid @RequestBody DisScaleVO scaleVO) {
+//        List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO);
+//        return RespDTO.onSuc(data);
+//    }
+//
+//
+//    @ApiOperation(value = "知识库标准化-量表搜索[by:zhoutg]",
+//            notes = "")
+//    @PostMapping("/index")
+//    public RespDTO<List<ScaleIndexDTO>> index(@Valid @RequestBody ScaleIndexVO scaleVO) {
+//        List<ScaleIndexDTO> data = disScaleFacade.indexFac(scaleVO);
+//        return RespDTO.onSuc(data);
+//    }
+//}

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

@@ -96,14 +96,14 @@ public interface AiptServiceClient {
     @PostMapping("/concept/getStaticKnowledge")
     RespDTO<List<RetrievalDTO>> getStaticKnowledge(@RequestBody GetStaticKnowledgeVO getStaticKnowledgeVO);
 
-    /**
-     * 量表搜索
-     *
-     * @param scaleIndexVO
-     * @return
-     */
-    @PostMapping(value = "/scale/index")
-    RespDTO<List<ScaleIndexDTO>> index(@RequestBody ScaleIndexVO scaleIndexVO);
+//    /**
+//     * 量表搜索
+//     *
+//     * @param scaleIndexVO
+//     * @return
+//     */
+//    @PostMapping(value = "/scale/index")
+//    RespDTO<List<ScaleIndexDTO>> index(@RequestBody ScaleIndexVO scaleIndexVO);
 
     /**
      * 获取字典信息

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

@@ -120,17 +120,17 @@ public class AiptServiceHystrix implements AiptServiceClient {
         return null;
     }
 
-    /**
-     * 量表搜索
-     *
-     * @param scaleIndexVO
-     * @return
-     */
-    @Override
-    public RespDTO<List<ScaleIndexDTO>> index(@RequestBody ScaleIndexVO scaleIndexVO) {
-        log.error("【hystrix】调用{}异常", "index");
-        return null;
-    }
+//    /**
+//     * 量表搜索
+//     *
+//     * @param scaleIndexVO
+//     * @return
+//     */
+//    @Override
+//    public RespDTO<List<ScaleIndexDTO>> index(@RequestBody ScaleIndexVO scaleIndexVO) {
+//        log.error("【hystrix】调用{}异常", "index");
+//        return null;
+//    }
 
     /**
      * 获取字典信息

data-service/src/main/java/com/diagbot/web/SearchController.java

@@ -49,17 +49,17 @@ public class SearchController {
         return RespDTO.onSuc(searchFacade.getStaticKnowledge(getStaticVO));
     }
 
-    /**
-     * 量表搜索
-     *
-     * @param scaleIndexVO
-     * @return
-     */
-    @ApiOperation(value = "量表搜索[by:zhoutg]",
-            notes = "name：检索内容，必填<br>" +
-                    "filterName：需要过滤的名称")
-    @PostMapping(value = "/getScale")
-    public RespDTO<List<ScaleIndexDTO>> index(@Valid @RequestBody ScaleIndexVO scaleIndexVO){
-        return RespDTO.onSuc(searchFacade.index(scaleIndexVO));
-    }
+//    /**
+//     * 量表搜索
+//     *
+//     * @param scaleIndexVO
+//     * @return
+//     */
+//    @ApiOperation(value = "量表搜索[by:zhoutg]",
+//            notes = "name：检索内容，必填<br>" +
+//                    "filterName：需要过滤的名称")
+//    @PostMapping(value = "/getScale")
+//    public RespDTO<List<ScaleIndexDTO>> index(@Valid @RequestBody ScaleIndexVO scaleIndexVO){
+//        return RespDTO.onSuc(searchFacade.index(scaleIndexVO));
+//    }
 }

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

@@ -97,11 +97,11 @@ public interface AiptServiceClient {
     RespDTO<PushDTO> pushInner(@RequestBody SearchVO searchVO);
 
 
-    @PostMapping(value = "/scale/getList")
-    RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO);
-
-    @PostMapping(value = "/scale/index")
-    RespDTO<List<ScaleIndexDTO>> index(@RequestBody ScaleIndexVO scaleIndexVO);
+//    @PostMapping(value = "/scale/getList")
+//    RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO);
+//
+//    @PostMapping(value = "/scale/index")
+//    RespDTO<List<ScaleIndexDTO>> index(@RequestBody ScaleIndexVO scaleIndexVO);
 
     @PostMapping(value = "/disType/getDisType")
     RespDTO<DisTypeDTO> getDisType();

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

@@ -109,17 +109,17 @@ public class AiptServiceHystrix implements AiptServiceClient {
     }
 
 
-    @Override
-    public RespDTO<List<DisScaleDTO>> getList(DisScaleVO scaleVO) {
-        log.error("【hystrix】调用{}异常", "getList");
-        return null;
-    }
-
-    @Override
-    public RespDTO<List<ScaleIndexDTO>> index(ScaleIndexVO scaleIndexVO) {
-        log.error("【hystrix】调用{}异常", "index");
-        return null;
-    }
+//    @Override
+//    public RespDTO<List<DisScaleDTO>> getList(DisScaleVO scaleVO) {
+//        log.error("【hystrix】调用{}异常", "getList");
+//        return null;
+//    }
+//
+//    @Override
+//    public RespDTO<List<ScaleIndexDTO>> index(ScaleIndexVO scaleIndexVO) {
+//        log.error("【hystrix】调用{}异常", "index");
+//        return null;
+//    }
 
 
     @Override

icss-service/src/main/java/com/diagbot/web/ScaleController.java

@@ -34,18 +34,18 @@ import java.util.List;
 @SuppressWarnings("unchecked")
 public class ScaleController {
 
-    @Autowired
-    DisScaleFacade disScaleFacade;
+//    @Autowired
+//    DisScaleFacade disScaleFacade;
     @Autowired
     ScaleContentFacade scaleContentFacade;
 
-    @ApiOperation(value = "知识库标准化-返回诊断量表列表[by:zhoutg]",
-            notes = "")
-    @PostMapping("/getList")
-    public RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO) {
-        List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO);
-        return RespDTO.onSuc(data);
-    }
+//    @ApiOperation(value = "知识库标准化-返回诊断量表列表[by:zhoutg]",
+//            notes = "")
+//    @PostMapping("/getList")
+//    public RespDTO<List<DisScaleDTO>> getList(@RequestBody DisScaleVO scaleVO) {
+//        List<DisScaleDTO> data = disScaleFacade.getDisScaleFac(scaleVO);
+//        return RespDTO.onSuc(data);
+//    }
 
 
     @ApiOperation(value = "知识库标准化-获取量表内容[by:zhoutg]", notes = "")
@@ -55,11 +55,11 @@ public class ScaleController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "ICSS三期-量表搜索[by:zhoutg]",
-            notes = "")
-    @PostMapping("/index")
-    public RespDTO<List<ScaleIndexDTO>> index(@Valid @RequestBody ScaleIndexVO scaleVO) {
-        List<ScaleIndexDTO> data = scaleContentFacade.indexFac(scaleVO);
-        return RespDTO.onSuc(data);
-    }
+//    @ApiOperation(value = "ICSS三期-量表搜索[by:zhoutg]",
+//            notes = "")
+//    @PostMapping("/index")
+//    public RespDTO<List<ScaleIndexDTO>> index(@Valid @RequestBody ScaleIndexVO scaleVO) {
+//        List<ScaleIndexDTO> data = scaleContentFacade.indexFac(scaleVO);
+//        return RespDTO.onSuc(data);
+//    }
 }