资产批量导入开发测试完成

wuxw

2019-09-25 15005d6339e7b5c7969f90054fb682e001372a3b

 WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -134,7 +134,7 @@
    private ResponseEntity<String> savedParkingSpaceInfo(IPageData pd, List<ImportParkingSpace> parkingSpaces, ComponentValidateResult result) {
        String apiUrl = "";
        JSONObject paramIn = null;
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功",HttpStatus.OK);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功", HttpStatus.OK);
        ImportOwner owner = null;
        for (ImportParkingSpace parkingSpace : parkingSpaces) {
            JSONObject savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
@@ -147,6 +147,7 @@
            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.saveParkingSpace";

            paramIn.put("communityId", result.getCommunityId());
            paramIn.put("userId", result.getUserId());
            paramIn.put("num", parkingSpace.getPsNum());
            paramIn.put("area", parkingSpace.getArea());
            paramIn.put("typeCd", parkingSpace.getTypeCd());
@@ -157,7 +158,7 @@
            }

            savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
            if (savedParkingSpaceInfo != null) {
            if (savedParkingSpaceInfo == null) {
                continue;
            }

@@ -170,6 +171,7 @@

            paramIn.put("communityId", result.getCommunityId());
            paramIn.put("ownerId", parkingSpace.getImportOwner().getOwnerId());
            paramIn.put("userId", result.getUserId());
            paramIn.put("carNum", parkingSpace.getCarNum());
            paramIn.put("carBrand", parkingSpace.getCarBrand());
            paramIn.put("carType", parkingSpace.getCarType());
@@ -177,6 +179,10 @@
            paramIn.put("psId", savedParkingSpaceInfo.getString("psId"));
            paramIn.put("storeId", result.getStoreId());
            paramIn.put("sellOrHire", parkingSpace.getSellOrHire());

            if("H".equals(parkingSpace.getSellOrHire())){
                paramIn.put("cycles", "0");
            }

            String feeTypeCd = "1001".equals(parkingSpace.getTypeCd())
                    ? FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE;
@@ -187,8 +193,8 @@
                continue;
            }

            JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody());
            if(!configInfo.containsKey("additionalAmount")){
            JSONObject configInfo = JSONArray.parseArray(responseEntity.getBody()).getJSONObject(0);
            if (!configInfo.containsKey("additionalAmount")) {
                continue;
            }

@@ -213,7 +219,7 @@
    private ResponseEntity<String> savedRoomInfo(IPageData pd, List<ImportRoom> rooms, ComponentValidateResult result) {
        String apiUrl = "";
        JSONObject paramIn = null;
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功",HttpStatus.OK);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功", HttpStatus.OK);
        ImportOwner owner = null;
        for (ImportRoom room : rooms) {
            JSONObject savedRoomInfo = getExistsRoom(pd, result, room);
@@ -343,7 +349,7 @@
    private ResponseEntity<String> savedOwnerInfo(IPageData pd, List<ImportOwner> owners, ComponentValidateResult result) {
        String apiUrl = "";
        JSONObject paramIn = null;
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功",HttpStatus.OK);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功", HttpStatus.OK);

        for (ImportOwner owner : owners) {
            JSONObject savedOwnerInfo = getExistsOwner(pd, result, owner);
@@ -384,7 +390,7 @@
    private ResponseEntity<String> savedFloorAndUnitInfo(IPageData pd, List<ImportFloor> floors, ComponentValidateResult result) {
        String apiUrl = "";
        JSONObject paramIn = null;
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功",HttpStatus.OK);
        ResponseEntity<String> responseEntity = new ResponseEntity<String>("成功", HttpStatus.OK);
        for (ImportFloor importFloor : floors) {
            paramIn = new JSONObject();
            //先保存 楼栋信息
@@ -411,7 +417,7 @@
            paramIn.clear();
            //判断单元信息是否已经存在，如果存在则不保存数据unit.queryUnits
            JSONObject savedUnitInfo = getExistsUnit(pd, result, importFloor);
            if ( savedUnitInfo != null) {
            if (savedUnitInfo != null) {
                importFloor.setUnitId(savedUnitInfo.getString("unitId"));
                continue;
            }
@@ -426,7 +432,7 @@
            responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);

            //将unitId 刷入ImportFloor对象
             savedUnitInfo = getExistsUnit(pd, result, importFloor);
            savedUnitInfo = getExistsUnit(pd, result, importFloor);
            importFloor.setUnitId(savedUnitInfo.getString("unitId"));

        }
@@ -533,14 +539,14 @@
            if (osIndex == 0) { // 第一行是 头部信息 直接跳过
                continue;
            }
            if(StringUtil.isNullOrNone(os[0])){
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }
            importParkingSpace = new ImportParkingSpace();
            importParkingSpace.setPsNum(os[0].toString());
            importParkingSpace.setTypeCd(os[1].toString());
            importParkingSpace.setArea(Double.parseDouble(os[2].toString()));
            if(StringUtil.isNullOrNone(os[3])){
            if (StringUtil.isNullOrNone(os[3])) {
                parkingSpaces.add(importParkingSpace);
                continue;
            }
@@ -575,7 +581,7 @@
            if (osIndex == 0) { // 第一行是 头部信息 直接跳过
                continue;
            }
            if(StringUtil.isNullOrNone(os[0])){
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }
            importRoom = new ImportRoom();
@@ -584,7 +590,7 @@
            importRoom.setLayer(Integer.parseInt(os[3].toString()));
            importRoom.setSection(os[4].toString());
            importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
            if(StringUtil.isNullOrNone(os[6])){
            if (StringUtil.isNullOrNone(os[6])) {
                rooms.add(importRoom);
                continue;
            }
@@ -643,7 +649,7 @@
            if (osIndex == 0) { // 第一行是 头部信息 直接跳过
                continue;
            }
            if(StringUtil.isNullOrNone(os[0])){
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }
            importOwner = new ImportOwner();
@@ -673,7 +679,7 @@
                continue;
            }

            if(StringUtil.isNullOrNone(os[0])){
            if (StringUtil.isNullOrNone(os[0])) {
                continue;
            }
            importFloor = new ImportFloor();