Merge branch 'dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/web/controller/QCController.java

@@ -9,6 +9,7 @@ import com.lantone.qc.pub.model.vo.QueryVo;
 import com.lantone.qc.pub.res.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -24,6 +25,7 @@ import java.util.Map;
  * @Author : 楼辉荣
  * @Date: 2020-03-03 19:57
  */
+@Slf4j
 @Api(value = "质控服务接口", tags = { "质控服务接口" })
 @RestController
 @RequestMapping(value = "analyse")
@@ -39,18 +41,26 @@ public class QCController {
         try {
             response.setData(qCAnalysis.anlysis(queryVo));
         } catch (AIException aie) {
+            log.error(aie.getMessage(),aie);
             response.setRet(-1);
             response.setMsg(aie.getMessage());
         } catch (TransException trae) {
+            log.error(trae.getMessage(),trae);
             response.setRet(-2);
             response.setMsg(trae.getMessage());
         } catch (CatalogueException ce) {
+            log.error(ce.getMessage(),ce);
             response.setRet(-3);
             response.setMsg(ce.getMessage());
         } catch (Exception e) {
+            log.error(e.getMessage(),e);
             response.setRet(-9);
             response.setMsg("质控出错：" + e.getMessage());
         }
+        if (response == null || response.getData() == null) {
+            log.error("------------------------------------远程质控接口没有返回数据!");
+        }
+
         return response;
     }