纬度字段取值错误修改

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/CylinderInfo.java

@@ -179,6 +179,6 @@ public class CylinderInfo  {
 	/**
 	 * 纬度
 	 */
-	@TableField("longitude")
+	@TableField("latitude")
 	private String latitude;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/ESCylinderServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.tzs.api.dto.EsSpecialEquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.api.dto.SpecialEquipmentDto;
 import com.yeejoin.amos.boot.module.tzs.api.entity.EsCylinder;
@@ -48,27 +49,33 @@ public class ESCylinderServiceImpl {
 	 * 保存气瓶信息
 	 * </pre>
 	 *
-	 * @param cylinderInfo 保存气瓶信息
+	 * @param cylinderInfoList 保存气瓶信息
 	 */
-	public EsCylinder saveEsCylinderToES(CylinderInfo cylinderInfo) {
-		EsCylinder esCylinder = new EsCylinder();
-		if (StringUtils.isNotEmpty(cylinderInfo.getLongitude())) {
-			esCylinder.setLongitude(Double.parseDouble(cylinderInfo.getLongitude()));
-		}
-		if (StringUtils.isNotEmpty(cylinderInfo.getLatitude())) {
-			esCylinder.setLatitude(Double.parseDouble(cylinderInfo.getLatitude()));
-		}
-		esCylinder.setSequenceNbr(cylinderInfo.getSequenceNbr());
+	public boolean saveEsCylinderToES(List<CylinderInfo> cylinderInfoList) {
+		List<EsCylinder> esCylinderList = Lists.newArrayList();
+		if (!ValidationUtil.isEmpty(cylinderInfoList)) {
+			cylinderInfoList.forEach(cylinderInfo -> {
+				EsCylinder esCylinder = new EsCylinder();
+				if (StringUtils.isNotEmpty(cylinderInfo.getLongitude())) {
+					esCylinder.setLongitude(Double.parseDouble(cylinderInfo.getLongitude()));
+				}
+				if (StringUtils.isNotEmpty(cylinderInfo.getLatitude())) {
+					esCylinder.setLatitude(Double.parseDouble(cylinderInfo.getLatitude()));
+				}
+				esCylinder.setSequenceNbr(cylinderInfo.getSequenceNbr());
 //        esCylinder.setAddress(cylinder.getAddress());
-		esCylinder.setFactoryNum(cylinderInfo.getFactoryNum());
-		esCylinder.setUnitName(cylinderInfo.getUnitName());
-		if (StringUtils.isNotBlank(cylinderInfo.getLatitude()) && StringUtils.isNotBlank(cylinderInfo.getLongitude())) {
-			Double lat = Double.parseDouble(cylinderInfo.getLatitude());
-			Double lon = Double.parseDouble(cylinderInfo.getLongitude());
-			esCylinder.setLocation(new GeoPoint(lat, lon));
+				esCylinder.setFactoryNum(cylinderInfo.getFactoryNum());
+				esCylinder.setUnitName(cylinderInfo.getUnitName());
+				if (StringUtils.isNotBlank(cylinderInfo.getLatitude()) && StringUtils.isNotBlank(cylinderInfo.getLongitude())) {
+					double lat = Double.parseDouble(cylinderInfo.getLatitude());
+					double lon = Double.parseDouble(cylinderInfo.getLongitude());
+					esCylinder.setLocation(new GeoPoint(lat, lon));
+				}
+				esCylinderList.add(esCylinder);
+			});
 		}
-		esCylinderRepository.save(esCylinder);
-		return esCylinder;
+		esCylinderRepository.saveAll(esCylinderList);
+		return true;
 	}
 
 	public Page<SpecialEquipmentDto> queryPageByDto(EsSpecialEquipmentDto esSpecialEquipmentDto, int current, int size) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/CylinderInfoController.java

@@ -927,10 +927,7 @@ public class CylinderInfoController extends BaseController {
             cylinderInfoPage.setCurrent(i);
             cylinderInfoPage.setSize(500);
             cylinderInfoPage = cylinderInfoServiceImpl.page(cylinderInfoPage);
-            for (CylinderInfo el : cylinderInfoPage.getRecords()
-            ) {
-                esCylinderService.saveEsCylinderToES(el);
-            }
+            esCylinderService.saveEsCylinderToES(cylinderInfoPage.getRecords());
         }
     }