|
@@ -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);
|
|
|
}
|
|
|
|
|
|
/**
|