Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -13,6 +13,7 @@ import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.*;
 import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -187,7 +188,7 @@ public class WaterResourceController extends BaseController {
         // 更新基本信息
         model.setSequenceNbr(sequenceNbr);
         //model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
-        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
+        //model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
         WaterResourceDto waterResourceDto = waterResourceServiceImpl.updateWithModel(model);
         // 更新属性信息
         String resourceType = model.getResourceType();

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AlertCalledServiceImpl.java

@@ -865,16 +865,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 	/* 2304 地址 联系人模糊查询缺失 陈召 2021-09-23 结束 */
 
 	public Set<Map<String, Object>> getLocationLike(String locationt) {
-//		Set<Map<String, Object>> set=new HashSet<Map<String, Object>>();	
-//		List<Map<String, Object>> orgUserLocation = alertCalledMapper.getOrgUserLocation(locationt);
-//		List<Map<String, Object>> alertCalledLocation = alertCalledMapper.getAlertCalledLocation(locationt);
-//		List<Map<String, Object>> keySiteLocation = alertCalledMapper.getKeySiteLocation(locationt);
-//		List<Map<String, Object>> airportLocation = alertCalledMapper.getAirportLocation(locationt);
-//		set.addAll(alertCalledLocation);
-//		set.addAll(keySiteLocation);
-//		set.addAll(airportLocation);
-//		set.addAll(orgUserLocation);
-//		set.remove(null);
-		return alertCalledMapper.getLocation();
+		Set<Map<String, Object>> set= alertCalledMapper.getLocation();	
+		set.remove(null);
+		return set;
 	}
 }