优化多个停车场车位重复问题

java110-bean/src/main/java/com/java110/dto/basePrivilege/BasePrivilegeDto.java

@@ -19,6 +19,11 @@ import com.java110.dto.PageDto;
 
 import java.io.Serializable;
 
+/**
+ * <p>基础权限 对象</p>
+ * <p>
+ * add by wuxw 2020-12-13
+ */
 public class BasePrivilegeDto extends PageDto implements Serializable {
 
     private String userId;

java110-bean/src/main/java/com/java110/dto/package-info.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.dto;
+
+/**
+ * 存放项目中dto 实体信息
+ * add by wuxw 2020-12-13
+ **/

java110-bean/src/main/java/com/java110/entity/package-info.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.entity;
+
+/**
+ * 0.1 版本统一实体类
+ * add by wuxw 2020-12-13
+ */

java110-bean/src/main/java/com/java110/po/package-info.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.java110.po;
+
+/**
+ * 数据库模型对象存放类
+ * add by wuxw 2020-12-13
+ */

java110-bean/src/main/java/com/java110/vo/package-info.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2017-2020 吴学文 and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * 接口输出 协议定义对象
+ * <p>
+ * add by wuxw 2020-12-13
+ */
+package com.java110.vo;

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

@@ -238,22 +238,6 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
                 paramIn.put("cycles", "0");
             }
 
-//            String feeTypeCd = "1001".equals(parkingSpace.getTypeCd())
-//                    ? FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE;
-//            apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs?page=1&row=1&communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd + "&isDefault=T";
-//            responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-//
-//            if (responseEntity.getStatusCode() != HttpStatus.OK) {
-//                continue;
-//            }
-
-//            JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("feeConfigs").getJSONObject(0);
-//            if (!configInfo.containsKey("additionalAmount")) {
-//                continue;
-//            }
-
-//            paramIn.put("receivedAmount", configInfo.getString("additionalAmount"));
-
             apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace";
             responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
         }
@@ -378,7 +362,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
         String apiUrl = "";
         ResponseEntity<String> responseEntity = null;
         apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.queryParkingSpaces?page=1&row=1&communityId=" + result.getCommunityId()
-                + "&num=" + parkingSpace.getPsNum();
+                + "&num=" + parkingSpace.getPsNum()+"&areaNum="+parkingSpace.getPaNum();
         responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
 
         if (responseEntity.getStatusCode() != HttpStatus.OK) { //跳过 保存单元信息