Quellcode durchsuchen

新增系统 如有楼层和建筑,添加关联关系
space 入参格式调整,projectId 从header取

lvxianyun vor 3 Jahren
Ursprung
Commit
e09bc7f7b3

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

@@ -65,7 +65,7 @@ public class AdmSpaceController {
      * @throws Exception
      */
     @PostMapping("/create")
-    public AdmResponse create(@RequestBody AdmCreateRequest<AdmSpace> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmResponse create(@RequestBody AdmCreateRequest<AdmSpace> createRequest) throws Exception {
         List<AdmSpace> vos = CollUtil.newArrayList(createRequest.getContent());
         String msg = null;
         for (AdmSpace admSpace : vos) {
@@ -255,7 +255,7 @@ public class AdmSpaceController {
      * @throws Exception
      */
     @PostMapping("/update-outline")
-    public AdmResponse updateOutLine(@RequestBody AdmCreateRequest<AdmSpace> createRequest, @QueryParam("projectId") String projectId) throws Exception {
+    public AdmResponse updateOutLine(@RequestBody AdmCreateRequest<AdmSpace> createRequest) throws Exception {
         List<AdmSpace> vos = CollUtil.newArrayList(createRequest.getContent());
         vos = service.doUpdate( AdmContextUtil.toDmpContext(), AdmSpace.class, vos);
         //TODO 更新计算关系ZoneSpaceBaseService.upDateOutline
@@ -295,7 +295,7 @@ public class AdmSpaceController {
      * @throws Exception
      */
     @PostMapping("/space-type")
-    public List<JSONObject> querySpaceType(@QueryParam("projectId") String projectId) throws Exception {
+    public List<JSONObject> querySpaceType() throws Exception {
         return service.doQuerySpaceTypes( AdmContextUtil.toDmpContext());
     }
 

+ 3 - 6
src/main/java/com/persagy/proxy/adm/controller/AdmSystemController.java

@@ -32,10 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
 import javax.ws.rs.QueryParam;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Adm 系统 API
@@ -121,8 +118,8 @@ public class AdmSystemController {
                 String systemId = admSystems.get(0).getId();
                 List<RelationDTO> relationDTOS = new ArrayList<>(admSystem.getBuildingFloorInfoList().size());
                 admSystem.getBuildingFloorInfoList().forEach(info -> {
-                    String floorId = info.get("FloorID").textValue();
-                    String buildID = info.get("BuildID").textValue();
+                    String floorId = info.get("FloorID") == null ? null : info.get("FloorID").textValue();
+                    String buildID = info.get("BuildID") == null ? null : info.get("BuildID").textValue();
                     if(StrUtil.isNotEmpty(floorId)){
                         relationDTOS.add(new RelationDTO(null, "MechInArch", "Bd2Fl", null, systemId , floorId));
                     }