Merge remote-tracking branch 'origin/chenhao' into chenhao

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -31,6 +31,7 @@ import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourcePoolSer
 import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -92,13 +93,13 @@ public class WaterResourceController extends BaseController {
         model.setResourceTypeName(resourceTypeEnum.get().getName());
         model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
         model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
-        
-        if(model.getAddress()!=null){
+        /*2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取 陈召 屏蔽代码 97-102行*/
+       /* if(model.getAddress()!=null){
             JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(model.getAddress());
             model.setAddress(address.getString(BizConstant.ADDRESS));
             model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
             model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
-		 }
+		 }*/
          
         if (!StringUtils.isEmpty(resourceType)) {
             switch (resourceType) {
@@ -168,12 +169,14 @@ public class WaterResourceController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<WaterResourceDto> updateBySequenceNbrWaterResource(@RequestBody WaterResourceDto model,
                                                                             @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        if (StringUtils.isNotEmpty(model.getAddress())) {
+        /*2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取 陈召 屏蔽代码 173-178行*/
+      /*  if (StringUtils.isNotEmpty(model.getAddress())) {
             JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(model.getAddress());
             model.setAddress(address.getString(BizConstant.ADDRESS));
             model.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
             model.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
-        }
+        }*/
+      
 
         // 更新基本信息
         model.setSequenceNbr(sequenceNbr);