From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/meterWaterImport/impl/MeterWaterImportSMOImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/meterWaterImport/impl/MeterWaterImportSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/meterWaterImport/impl/MeterWaterImportSMOImpl.java
index eb0a4b0..6c4a6b9 100644
--- a/service-api/src/main/java/com/java110/api/smo/meterWaterImport/impl/MeterWaterImportSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/meterWaterImport/impl/MeterWaterImportSMOImpl.java
@@ -2,21 +2,19 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
-import com.java110.entity.assetImport.ImportFloor;
-import com.java110.entity.assetImport.ImportOwner;
-import com.java110.entity.component.ComponentValidateResult;
-import com.java110.entity.meterImport.ImportMeter;
+import com.java110.dto.importData.ImportFloor;
+import com.java110.dto.importData.ImportOwner;
+import com.java110.dto.system.ComponentValidateResult;
+import com.java110.dto.meter.ImportMeter;
import com.java110.api.smo.meterWaterImport.IMeterWaterImportSMO;
-import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -115,7 +113,7 @@
ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
for (ImportMeter meter : meters) {
paramIn = new JSONObject();
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater.saveMeterWater";
+ apiUrl = "meterWater.saveMeterWater";
paramIn.put("communityId", communityId);
paramIn.put("meterType", meterType);
paramIn.put("objType",meter.getObjType());
@@ -145,7 +143,7 @@
private JSONObject getExistsOwner(IPageData pd, ComponentValidateResult result, ImportOwner importOwner) {
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/owner.queryOwners?page=1&row=1&communityId=" + result.getCommunityId()
+ apiUrl = "owner.queryOwners?page=1&row=1&communityId=" + result.getCommunityId()
+ "&ownerTypeCd=1001&name=" + importOwner.getOwnerName() + "&link=" + importOwner.getTel();
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
--
Gitblit v1.8.0