Просмотр исходного кода

修复bean转map 时 数据类型改变问题

wuxw лет назад: 7
Родитель
Сommit
a97a310c9a

+ 8 - 2
WebService/src/main/java/com/java110/web/smo/impl/FloorServiceSMOImpl.java

@@ -6,6 +6,7 @@ import com.java110.common.constant.ResponseConstant;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.exception.SMOException;
 import com.java110.common.exception.SMOException;
 import com.java110.common.util.Assert;
 import com.java110.common.util.Assert;
+import com.java110.common.util.StringUtil;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.IPageData;
 import com.java110.web.core.BaseComponentSMO;
 import com.java110.web.core.BaseComponentSMO;
 import com.java110.web.smo.IFloorServiceSMO;
 import com.java110.web.smo.IFloorServiceSMO;
@@ -68,10 +69,15 @@ public class FloorServiceSMOImpl extends BaseComponentSMO implements IFloorServi
         String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
         String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
         //数据校验是否 商户是否入驻该小区
         //数据校验是否 商户是否入驻该小区
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId="
+                + communityId;
+
+        if (!StringUtil.isEmpty(floorNum)) {
+            apiUrl += "&floorNum=" + floorNum;
+        }
 
 
         responseEntity = this.callCenterService(restTemplate, pd, "",
         responseEntity = this.callCenterService(restTemplate, pd, "",
-                ServiceConstant.SERVICE_API_URL + "/api/floor.queryFloors?row=" + rows + "&page=" + page + "&communityId="
-                        + communityId + "&floorNum=" + floorNum,
+                apiUrl,
                 HttpMethod.GET);
                 HttpMethod.GET);
 
 
         if (responseEntity.getStatusCode() != HttpStatus.OK) {
         if (responseEntity.getStatusCode() != HttpStatus.OK) {

+ 2 - 2
java110-common/src/main/java/com/java110/common/util/BeanConvertUtil.java

@@ -2,9 +2,9 @@ package com.java110.common.util;
 
 
 
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -93,7 +93,7 @@ public final class BeanConvertUtil {
         Map newMap = null;
         Map newMap = null;
 
 
         try {
         try {
-            newMap = BeanUtils.describe(orgBean);
+            newMap = PropertyUtils.describe(orgBean);
         } catch (Exception e) {
         } catch (Exception e) {
             throw new RuntimeException("bean转换Map失败", e);
             throw new RuntimeException("bean转换Map失败", e);
         }
         }