水源经纬度

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -88,6 +90,22 @@ 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){
+			String[]  data= model.getAddress().split("@address@");
+			model.setAddress(data[0]);
+			 if(data[1]!=null&&!"".equals(data[1])){
+				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
+				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+					 model.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
+				 }
+                 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+                	 model.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
+				 }
+			 }
+		 }
+         
         if (!StringUtils.isEmpty(resourceType)) {
             switch (resourceType) {
                 case "hydrant":
@@ -156,6 +174,21 @@ 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(model.getAddress()!=null){
+ 			String[]  data= model.getAddress().split("@address@");
+ 			model.setAddress(data[0]);
+ 			 if(data[1]!=null&&!"".equals(data[1])){
+ 				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
+ 				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+ 					 model.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
+ 				 }
+                  if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+                 	 model.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
+ 				 }
+ 			 }
+ 		 }    	  	
         // 更新基本信息
         model.setSequenceNbr(sequenceNbr);
         model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));