优化导入顺序

service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -867,7 +867,8 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
         long failCount = 0L;
         AssetImportLogDetailDto assetImportLogDetailDto = null;
         try {
-            for (ImportFloor importFloor : floors) {
+            for (int floorIndex = 0; floorIndex < floors.size(); floorIndex++) {
+                ImportFloor importFloor = floors.get(floorIndex);
                 paramIn = new JSONObject();
                 //先保存 楼栋信息
                 JSONObject savedFloorInfo = getExistsFloor(pd, result, importFloor);
@@ -879,6 +880,7 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
                     paramIn.put("userId", result.getUserId());
                     paramIn.put("name", importFloor.getFloorNum() + "栋");
                     paramIn.put("floorArea", 1.00);
+                    paramIn.put("seq",floorIndex+1);
 
                     responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
                     savedFloorInfo = getExistsFloor(pd, result, importFloor);

service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java

@@ -397,6 +397,10 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
         List<FloorDto> floorDtos = floorV1InnerServiceSMOImpl.queryFloors(floorDto);
         FloorPo floorPo = null;
         String floorId = "";
+        int seq = 1;
+        if(StringUtil.isNumber(importOwnerRoomDto.getFloorNum())){
+            seq = Integer.parseInt(importOwnerRoomDto.getFloorNum());
+        }
 
         int flag = 0;
         if (floorDtos == null || floorDtos.size() < 1) {
@@ -409,6 +413,7 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
             floorPo.setName(importOwnerRoomDto.getFloorNum()+"栋");
             floorPo.setRemark("房产导入");
             floorPo.setUserId(importOwnerRoomDto.getUserId());
+            floorPo.setSeq(seq);
             flag = floorV1InnerServiceSMOImpl.saveFloor(floorPo);
 
             if (flag < 1) {

springboot/src/main/java/com/java110/boot/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -867,7 +867,8 @@ public class AssetImportSMOImpl extends DefaultAbstractComponentSMO implements I
         long failCount = 0L;
         AssetImportLogDetailDto assetImportLogDetailDto = null;
         try {
-            for (ImportFloor importFloor : floors) {
+            for (int floorIndex = 0; floorIndex < floors.size(); floorIndex++) {
+                ImportFloor importFloor = floors.get(floorIndex);
                 paramIn = new JSONObject();
                 //先保存 楼栋信息
                 JSONObject savedFloorInfo = getExistsFloor(pd, result, importFloor);