Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileRelationController.java

@@ -1,10 +1,12 @@
 package com.electromagnetic.industry.software.manage.controller;
 
+import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
 import com.electromagnetic.industry.software.manage.pojo.models.EdFileRelation;
 import com.electromagnetic.industry.software.manage.pojo.req.CheckNameUniqueRequest;
 import com.electromagnetic.industry.software.manage.service.EdFileRelationService;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -25,7 +27,12 @@ public class EdFileRelationController {
      */
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     public ElectromagneticResult<?> createRelation(@RequestBody EdFileRelation relation) {
-        return ElectromagneticResultUtil.success(edFileRelationService.createRelation(relation));
+        try {
+            Boolean res = edFileRelationService.createRelation(relation);
+            return ElectromagneticResultUtil.success(res);
+        } catch (BizException e) {
+            return ElectromagneticResultUtil.fail("500", e.getMsg());
+        }
     }
 
     /**

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java

@@ -51,7 +51,7 @@ public class EdFileRelationServiceImpl extends ServiceImpl<EdFileRelationMapper,
      * @return
      */
     @Override
-    public Boolean createRelation(EdFileRelation edFileRelation) {
+    public Boolean createRelation(EdFileRelation edFileRelation) throws BizException {
         // 无法建立已建立的关系
         String queryId1 = edFileRelation.getId1();
         String queryId2 = edFileRelation.getId2();