Browse Source

tip: http://common.ysbdtp.com/datacenter/rel/sh-contain-sp-base/unlink?type=GeneralZone

      [{"shaftId":"Sh88888888010f9456ac4f7b46cea30482e0a7f030fa","spaceId":"Sp88888888010ee4d21f585243eb89f9198a1fea70eb"}]

      {"result":"A0402","message":"无效的用户输入"}

      456ac4f7b46cea30482e0a7f030fa","spaceId":"Sp88888888010ee4d21f585243eb89f9198a1fea70eb"}]
lvxianyun 3 years ago
parent
commit
58e32e0a35

+ 16 - 22
src/main/java/com/persagy/proxy/relation/controller/RelationShContainSpBaseController.java

@@ -1,24 +1,14 @@
 package com.persagy.proxy.relation.controller;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.comparator.CompareUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.persagy.dmp.digital.client.DigitalRelationFacade;
-import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
-import org.checkerframework.checker.units.qual.C;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Sets;
@@ -27,11 +17,13 @@ import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.digital.client.DigitalObjectFacade;
+import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
 import com.persagy.proxy.adm.constant.AdmObjectType;
+import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmRelationService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
@@ -39,11 +31,13 @@ import com.persagy.proxy.common.client.DmpRwdClient;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.common.entity.RelationDTO;
 import com.persagy.proxy.report.service.IRelationReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @description:023、关系-竖井下的业务空间
@@ -102,7 +96,7 @@ public class RelationShContainSpBaseController {
      */
     @PostMapping("/unlink")
     public AdmResponse delete(@RequestParam(value = "type", required = false) String type,
-                              @RequestBody JSONObject param) throws Exception {
+                              @RequestBody List<JSONObject> param) throws Exception {
         if(CollUtil.isEmpty(param)) {
             return AdmResponse.success();
         }
@@ -110,8 +104,8 @@ public class RelationShContainSpBaseController {
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
         // 组装条件
         QueryCriteria criteria = new QueryCriteria();
-        String shaftId = param.getString("shaftId");
-        String spaceId = param.getString("spaceId");
+        String shaftId = param.get(0).getString("shaftId");
+        String spaceId = param.get(0).getString("spaceId");
         if(!StrUtil.isAllNotEmpty(shaftId,spaceId)) {
             return AdmResponse.failure("必填项:ShaftID(竖井id)、SpaceID(业务空间id)");
         }