术语关联导入

cdssman-service/src/main/java/com/diagbot/client/CdssClient.java

@@ -39,12 +39,13 @@ public interface CdssClient {
 
     /**
      * 预匹配导入术语校验
+     *
      * @param file
      * @param type
      */
     @PostMapping(value = "/tran/mappingConfig/dataVerify", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     RespDTO<Boolean> dataVerify(@RequestPart("file") MultipartFile file,
-                           @RequestParam("type") Integer type);
+                                @RequestParam("type") Integer type);
 
     /**
      * 预匹配
@@ -77,11 +78,11 @@ public interface CdssClient {
      * @param type
      * @param userId
      */
-    @PostMapping(value ="/tran/mappingConfig/importExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    void importExcel(@RequestPart("file") MultipartFile file,
-                     @RequestParam("hospitalId") Long hospitalId,
-                     @RequestParam("type") Integer type,
-                     @RequestParam("uesrId") String userId);
+    @PostMapping(value = "/tran/mappingConfig/importExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    RespDTO<Boolean> importExcel(@RequestPart("file") MultipartFile file,
+                                 @RequestParam("hospitalId") Long hospitalId,
+                                 @RequestParam("type") Integer type,
+                                 @RequestParam("uesrId") String userId);
 
 
     /**

cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssHystrix.java

@@ -54,11 +54,12 @@ public class CdssHystrix implements CdssClient {
     }
 
     @Override
-    public void importExcel(@RequestPart("file") MultipartFile file,
-                            @RequestParam("hospitalId") Long hospitalId,
-                            @RequestParam("type") Integer type,
-                            @RequestParam("uesrId") String userId) {
+    public RespDTO<Boolean> importExcel(@RequestPart("file") MultipartFile file,
+                                        @RequestParam("hospitalId") Long hospitalId,
+                                        @RequestParam("type") Integer type,
+                                        @RequestParam("uesrId") String userId) {
         log.error("【hystrix】调用{}异常", "importExcel");
+        return null;
     }
 
     @Override

cdssman-service/src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -246,11 +246,16 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      * @param hospitalId
      * @param type
      */
-    public void importExcel(MultipartFile file, Long hospitalId, Integer type, String userId) {
+    public Boolean importExcel(MultipartFile file, Long hospitalId, Integer type, String userId) {
         if (StringUtil.isBlank(userId)) {
             userId = UserUtils.getCurrentPrincipleID();
         }
-        cdssClient.importExcel(file, hospitalId, type, userId);
+        RespDTO<Boolean> respDTO = cdssClient.importExcel(file, hospitalId, type, userId);
+        if (RespDTOUtil.respIsOK(respDTO)) {
+            return respDTO.data;
+        } else {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
+        }
     }
 
 

cdssman-service/src/main/java/com/diagbot/web/MappingConfigController.java

@@ -80,11 +80,12 @@ public class MappingConfigController {
     @PostMapping(value = "/importExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @SysLogger("importExcel")
     @Transactional
-    public void importExcel(@RequestParam("file") MultipartFile file,
+    public RespDTO<Boolean> importExcel(@RequestParam("file") MultipartFile file,
                             @RequestParam("hospitalId") Long hospitalId,
                             @RequestParam("type") Integer type,
                             @RequestParam("uesrId") String userId) {
-        mappingConfigFacade.importExcel(file, hospitalId, type, userId);
+        Boolean data = mappingConfigFacade.importExcel(file, hospitalId, type, userId);
+        return RespDTO.onSuc(data);
     }