Browse Source

fix controller 中 create 接口返回类型

lvxianyun 3 years ago
parent
commit
c9c3450aba

+ 3 - 2
src/main/java/com/persagy/proxy/object/controller/AdmBuildingController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
@@ -49,7 +50,7 @@ public class AdmBuildingController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmBuilding> createRequest) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmBuilding> createRequest) throws Exception {
         List<AdmBuilding> vos = CollUtil.newArrayList(createRequest.getContent());
         vos.stream().forEach(admBuilding -> {
             if (StrUtil.isEmpty(admBuilding.getName())){
@@ -62,7 +63,7 @@ public class AdmBuildingController {
             }
         });
         vos = service.doInsert(AdmContextUtil.toDmpContext(), AdmBuilding.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
     /**

+ 5 - 4
src/main/java/com/persagy/proxy/object/controller/AdmComponentController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
@@ -61,10 +62,10 @@ public class AdmComponentController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmComponent> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmComponent> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         List<AdmComponent> vos = CollUtil.newArrayList(createRequest.getContent());
         if(CollUtil.isEmpty(vos)){
-            return AdmResponse.success();
+            return AdmCreateResponse.success();
         }
         // 查询所有设备类型
         AdmDict dictCond = AdmDict.builder().type(AdmDictCategoryEnum.COMPONENT.getValue()).build();
@@ -107,10 +108,10 @@ public class AdmComponentController {
             }
         }
         if(CollUtil.isEmpty(filterVOs)){
-            return AdmResponse.success();
+            return AdmCreateResponse.success();
         }
         filterVOs = service.doInsert(AdmContextUtil.toDmpContext(), AdmComponent.class, filterVOs);
-        return AdmResponse.success(filterVOs);
+        return AdmCreateResponse.success(filterVOs);
     }
 
     /**

+ 5 - 4
src/main/java/com/persagy/proxy/object/controller/AdmDoorController.java

@@ -1,13 +1,14 @@
 package com.persagy.proxy.object.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.persagy.proxy.object.model.AdmDoor;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.object.service.IAdmDoorService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.object.model.AdmDoor;
+import com.persagy.proxy.object.service.IAdmDoorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,11 +39,11 @@ public class AdmDoorController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmDoor> createRequest) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmDoor> createRequest) throws Exception {
         // 组装上下文条件
         List<AdmDoor> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doInsert(AdmContextUtil.toDmpContext(), AdmDoor.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
     /**

+ 7 - 6
src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java

@@ -25,7 +25,6 @@ import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.entity.BaseEntity;
 import com.persagy.dmp.common.model.response.CommonResult;
 import com.persagy.dmp.define.client.DigitalDefineFacade;
-import com.persagy.dmp.define.client.DigitalObjectInfoFacade;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.digital.client.DigitalObjectFacade;
@@ -35,6 +34,7 @@ import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmRelationService;
@@ -50,7 +50,8 @@ import com.persagy.proxy.object.service.IAdmEquipmentService;
 import com.persagy.proxy.report.service.IRelationReportService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFColor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -103,10 +104,10 @@ public class AdmEquipmentController {
 	 * @throws Exception
 	 */
 	@PostMapping("/create")
-	public AdmResponse create(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
+	public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmEquipment> createRequest) throws Exception {
 		List<AdmEquipment> vos = CollUtil.newArrayList(createRequest.getContent());
 		if(CollUtil.isEmpty(vos)){
-			return AdmResponse.success();
+			return AdmCreateResponse.success();
 		}
 		// 查询所有设备类型
 		AdmDict dictCond = AdmDict.builder().type(AdmDictCategoryEnum.EQUIPMENT.getValue()).build();
@@ -149,10 +150,10 @@ public class AdmEquipmentController {
 			}
 		}
 		if(CollUtil.isEmpty(filterVOs)){
-			return AdmResponse.success();
+			return AdmCreateResponse.success();
 		}
 		filterVOs = service.doInsert(AdmContextUtil.toDmpContext(), AdmEquipment.class, filterVOs);
-		return AdmResponse.success(filterVOs);
+		return AdmCreateResponse.success(filterVOs);
 	}
 
 	/**

+ 10 - 9
src/main/java/com/persagy/proxy/object/controller/AdmFloorController.java

@@ -3,18 +3,19 @@ package com.persagy.proxy.object.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.persagy.dmp.common.model.entity.BaseEntity;
-import com.persagy.proxy.object.model.AdmEquipment;
-import com.persagy.proxy.object.model.AdmFloor;
-import com.persagy.proxy.object.model.AdmISpace;
-import com.persagy.proxy.object.model.AdmSpace;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.adm.service.*;
+import com.persagy.proxy.adm.service.IAdmRelationService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.adm.utils.ObjectNameUtil;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.RelationDTO;
+import com.persagy.proxy.object.model.AdmEquipment;
+import com.persagy.proxy.object.model.AdmFloor;
+import com.persagy.proxy.object.model.AdmISpace;
+import com.persagy.proxy.object.model.AdmSpace;
 import com.persagy.proxy.object.service.IAdmEquipmentService;
 import com.persagy.proxy.object.service.IAdmFloorService;
 import com.persagy.proxy.object.service.IAdmISpaceService;
@@ -57,7 +58,7 @@ public class AdmFloorController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmFloor> createRequest) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmFloor> createRequest) throws Exception {
         List<AdmFloor> vos = createRequest.getContent();
         service.ensureSpecialValues(AdmContextUtil.toDmpContext(), vos, AdmFloorServiceImpl.CREAT_UPDATE);
         for(AdmFloor floor : vos){
@@ -65,7 +66,7 @@ public class AdmFloorController {
                 floor.setName(ObjectNameUtil.objectName("楼层-"));
             }
             if(floor.getFloorSequenceID() == null){
-                return AdmResponse.failure("楼层顺序号不可以为空或类型错误");
+                return AdmCreateResponse.failure("楼层顺序号不可以为空或类型错误");
             }
         }
         Map<String, AdmFloor> admFloorMap = CollUtil.fieldValueMap(vos, "buildingId");
@@ -88,7 +89,7 @@ public class AdmFloorController {
                         AdmFloor admFloorNew = admFloorMap.get(admFloorOld.getBuildingId());
                         //楼层序列号相同
                         if(admFloorOld.getFloorSequenceID() !=null && admFloorNew.getFloorSequenceID().equals(admFloorOld.getFloorSequenceID())){
-                           return AdmResponse.failure("楼层顺序号不可以重复");
+                           return AdmCreateResponse.failure("楼层顺序号不可以重复");
                         }
                     }
                 }
@@ -108,7 +109,7 @@ public class AdmFloorController {
             relationService.doSave(AdmContextUtil.toDmpContext(), relationDTOS);
         }
 
-        return AdmResponse.success(admFloors);
+        return AdmCreateResponse.success(admFloors);
     }
 
     /**

+ 3 - 2
src/main/java/com/persagy/proxy/object/controller/AdmISpaceController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.persagy.dmp.common.utils.JsonHelper;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
@@ -54,11 +55,11 @@ public class AdmISpaceController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmISpace> AdmISpace) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmISpace> AdmISpace) throws Exception {
         List<AdmISpace> vos = CollUtil.newArrayList(AdmISpace.getContent());
         ensureDataInfos(vos);
         vos = service.doInsert(AdmContextUtil.toDmpContext(), AdmISpace.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
     /**

+ 6 - 6
src/main/java/com/persagy/proxy/object/controller/AdmLocationPointController.java

@@ -1,16 +1,16 @@
 package com.persagy.proxy.object.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.persagy.proxy.object.model.AdmLocationPoint;
-
-import com.persagy.proxy.object.model.AdmPointImage;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.object.service.IAdmLocationPointService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.object.model.AdmLocationPoint;
+import com.persagy.proxy.object.model.AdmPointImage;
+import com.persagy.proxy.object.service.IAdmLocationPointService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -85,13 +85,13 @@ public class AdmLocationPointController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmLocationPoint> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmLocationPoint> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmLocationPoint> vos = CollUtil.newArrayList(createRequest.getContent());
         log.info("创建条件"+vos.toString());
         vos = service.doInsert(context, AdmLocationPoint.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
 

+ 5 - 4
src/main/java/com/persagy/proxy/object/controller/AdmPropertyController.java

@@ -1,12 +1,13 @@
 package com.persagy.proxy.object.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.persagy.proxy.object.model.AdmProperty;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.object.service.IAdmPropertyService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
+import com.persagy.proxy.object.model.AdmProperty;
+import com.persagy.proxy.object.service.IAdmPropertyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -35,10 +36,10 @@ public class AdmPropertyController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmProperty> createRequest) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmProperty> createRequest) throws Exception {
         List<AdmProperty> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doInsert(AdmContextUtil.toDmpContext(), AdmProperty.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
     /**

+ 3 - 2
src/main/java/com/persagy/proxy/object/controller/AdmShaftController.java

@@ -17,6 +17,7 @@ import com.persagy.dmp.digital.client.DigitalObjectFacade;
 import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmRelationService;
@@ -74,7 +75,7 @@ public class AdmShaftController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmShaft> createRequest) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmShaft> createRequest) throws Exception {
         List<AdmShaft> vos = CollUtil.newArrayList(createRequest.getContent());
         List<AdmShaft> unRelationShaft = new ArrayList<>();
         List<AdmShaft> admShafts = new ArrayList<>(vos.size());
@@ -103,7 +104,7 @@ public class AdmShaftController {
             List shaftList = service.doInsert(AdmContextUtil.toDmpContext(), AdmShaft.class, unRelationShaft);
             admShafts.addAll(shaftList);
         }
-        return AdmResponse.success(admShafts);
+        return AdmCreateResponse.success(admShafts);
     }
 
     /**

+ 3 - 7
src/main/java/com/persagy/proxy/object/controller/AdmSpaceController.java

@@ -3,7 +3,6 @@ package com.persagy.proxy.object.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
@@ -71,7 +70,7 @@ public class AdmSpaceController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public ObjectNode create(@RequestBody AdmCreateRequest<AdmSpace> createRequest) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmSpace> createRequest) throws Exception {
         List<AdmSpace> vos = CollUtil.newArrayList(createRequest.getContent());
         String msg = null;
         for (AdmSpace admSpace : vos) {
@@ -85,13 +84,10 @@ public class AdmSpaceController {
         }
         if(StrUtil.isEmpty(msg)){
             vos = service.doInsertExt(AdmContextUtil.toDmpContext(), AdmSpace.class, vos);
-            AdmResponse admResponse = AdmResponse.success(vos);
-            ObjectNode admResponseObj = JsonNodeUtils.toObjectNode(admResponse, null,null);
-            ArrayNode arrayNode = JsonNodeUtils.toArrayNode(vos,null,null);
-            admResponseObj.putPOJO("entityList",arrayNode);
+            AdmCreateResponse admResponseObj = AdmCreateResponse.success(vos);
             return admResponseObj;
         }else{
-            return JsonNodeUtils.toObjectNode(AdmResponse.failure(msg), null,null);
+            return AdmCreateResponse.failure(msg);
         }
 
     }

+ 7 - 6
src/main/java/com/persagy/proxy/object/controller/AdmSystemController.java

@@ -17,6 +17,7 @@ import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmRelationService;
@@ -74,10 +75,10 @@ public class AdmSystemController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmSystem> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmSystem> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         List<AdmSystem> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doInsert(AdmContextUtil.toDmpContext(), AdmSystem.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
     /**
@@ -87,7 +88,7 @@ public class AdmSystemController {
      * @throws Exception
      */
     @PostMapping("/create-bd-fl")
-    public AdmResponse createBdFl(@RequestBody AdmCreateRequest<AdmSystem> createRequest) throws Exception {
+    public AdmCreateResponse createBdFl(@RequestBody AdmCreateRequest<AdmSystem> createRequest) throws Exception {
         List<AdmSystem> vos = CollUtil.newArrayList(createRequest.getContent());
 
         Map<String, AdmSystem> admSystemMap = CollUtil.fieldValueMap(vos, "classCode");
@@ -137,7 +138,7 @@ public class AdmSystemController {
             List<AdmSystem> systemList = service.doInsert(AdmContextUtil.toDmpContext(), AdmSystem.class, unRelationSys);
             admSystemList.addAll(systemList);
         }
-        return AdmResponse.success(admSystemList);
+        return AdmCreateResponse.success(admSystemList);
     }
 
     /**
@@ -183,7 +184,7 @@ public class AdmSystemController {
      * @throws Exception
      */
     @PostMapping("/link-equip")
-    public AdmResponse createRelateEquip(@RequestBody JsonObject createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmCreateResponse createRelateEquip(@RequestBody JsonObject createRequest, @QueryParam("projectId") String projectId) throws Exception {
         String sysId = createRequest.get("sysId").toString();
         List<String> equipIdList = (List<String>)createRequest.get("equipIdList");
         List<ObjectNode> relations = new ArrayList<>(equipIdList.size());
@@ -195,7 +196,7 @@ public class AdmSystemController {
             objectNode.put("objTo", euipId);
         });
         List<ObjectRelation> list = DigitalRelationFacade.create(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, relations);
-        return AdmResponse.success(list);
+        return AdmCreateResponse.success(list);
     }
 
     /**

+ 5 - 4
src/main/java/com/persagy/proxy/object/controller/AdmTenantController.java

@@ -2,13 +2,14 @@ package com.persagy.proxy.object.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.persagy.proxy.object.model.AdmTenant;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.object.service.IAdmTenantService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.adm.utils.ObjectNameUtil;
+import com.persagy.proxy.object.model.AdmTenant;
+import com.persagy.proxy.object.service.IAdmTenantService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -50,7 +51,7 @@ public class AdmTenantController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmTenant> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmTenant> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         List<AdmTenant> vos = CollUtil.newArrayList(createRequest.getContent());
         vos.stream().forEach(admTenant -> {
             if (StrUtil.isEmpty(admTenant.getName())){
@@ -58,7 +59,7 @@ public class AdmTenantController {
             }
         });
         vos = service.doInsert(AdmContextUtil.toDmpContext(), AdmTenant.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
     /**

+ 5 - 4
src/main/java/com/persagy/proxy/object/controller/AdmVirtualWallController.java

@@ -1,13 +1,14 @@
 package com.persagy.proxy.object.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.persagy.proxy.object.model.AdmVirtualWall;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.object.service.IAdmVirtualWallService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.object.model.AdmVirtualWall;
+import com.persagy.proxy.object.service.IAdmVirtualWallService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -54,13 +55,13 @@ public class AdmVirtualWallController {
      * @throws Exception
      */
     @PostMapping("/create_ignore")
-    public AdmResponse createIgnore(@RequestBody AdmCreateRequest<AdmVirtualWall> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmCreateResponse createIgnore(@RequestBody AdmCreateRequest<AdmVirtualWall> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
         createRequest.getContent().forEach(it->{
             //TODO
         });
-        return AdmResponse.success();
+        return AdmCreateResponse.success();
     }
 
     /**

+ 5 - 4
src/main/java/com/persagy/proxy/object/controller/AdmWindowController.java

@@ -1,13 +1,14 @@
 package com.persagy.proxy.object.controller;
 
 import cn.hutool.core.collection.CollUtil;
-import com.persagy.proxy.object.model.AdmWindow;
 import com.persagy.proxy.adm.request.AdmCreateRequest;
+import com.persagy.proxy.adm.request.AdmCreateResponse;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.object.service.IAdmWindowService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.object.model.AdmWindow;
+import com.persagy.proxy.object.service.IAdmWindowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -39,12 +40,12 @@ public class AdmWindowController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmWindow> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmCreateResponse create(@RequestBody AdmCreateRequest<AdmWindow> createRequest, @QueryParam("projectId") String projectId) throws Exception {
         // 组装上下文条件
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
         List<AdmWindow> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doInsert(context, AdmWindow.class, vos);
-        return AdmResponse.success(vos);
+        return AdmCreateResponse.success(vos);
     }
 
     /**