一码通删除电梯同步至96333电梯es中

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/SuperviseInfoMapper.java

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EsElevator;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,5 +23,5 @@ public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> {
 
 	void deleteDataAll(@Param("records") List<String> records);
 
-	Map<String, Object> selectElevatorEsList(String record);
+	EsElevator selectElevatorEsList(String record);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/SupervisionInfoMapper.xml

@@ -110,7 +110,7 @@
     </delete>
 
 
-    <select id="selectElevatorEsList" resultType="java.util.Map">
+    <select id="selectElevatorEsList" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EsElevator">
         SELECT
             jui.RECORD AS sequenceNbr,
             ifnull ( jui.USE_INNER_CODE, null ) AS innerNum,

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -972,19 +972,25 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         Object recordList = map.get("recordList");
         List<String> records = new ArrayList<>();
         List<ESEquipmentCategoryDto> list = new ArrayList<>();
-
+        List<EsElevator> esElevatorList = new ArrayList<>();
         if (recordList.toString().contains("[")) {
             for (String record : (List<String>) recordList) {
                 records.add(record);
                 ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
                 esEquipmentCategoryDto.setSEQUENCE_NBR(record);
                 list.add(esEquipmentCategoryDto);
+                EsElevator esElevator = new EsElevator();
+                esElevator.setSequenceNbr(record);
+                esElevatorList.add(esElevator);
             }
         } else {
             records.add(recordList.toString());
             ESEquipmentCategoryDto esEquipmentCategoryDto = new ESEquipmentCategoryDto();
             esEquipmentCategoryDto.setSEQUENCE_NBR(recordList.toString());
             list.add(esEquipmentCategoryDto);
+            EsElevator esElevator = new EsElevator();
+            esElevator.setSequenceNbr(recordList.toString());
+            esElevatorList.add(esElevator);
         }
         //删除监管码表数据
         List<String> superviseCodeList = superviseInfoMapper.selectSuperviseCodeList(records);
@@ -999,7 +1005,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         if (!ObjectUtils.isEmpty(superviseCodeList)) {
             supervisoryCodeInfoMapper.updateStatus(superviseCodeList);
         }
-
+        //删除es中elev中的相关数据
+        esElavtorRepository.deleteAll(esElevatorList);
         //删除涉及的19张表的数据
         superviseInfoMapper.deleteDataAll(records);
         // 根据统一信用代码更新总览表
@@ -1158,36 +1165,16 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
 
     private void saveEsElevator2ES(String record) {
-        Map<String, Object> map = superviseInfoMapper.selectElevatorEsList(record);
-        List<EsElevator> esElevatorList = new ArrayList<>();
         List<String> recordList = new ArrayList<>();
-
-        EsElevator esElevator = new EsElevator();
-        if (!org.apache.commons.lang3.ObjectUtils.isEmpty(map.get("longitude"))) {
-            esElevator.setLongitude(Double.parseDouble(String.valueOf(map.get("longitude"))));
-        }
-        if (!org.apache.commons.lang3.ObjectUtils.isEmpty(map.get("latitude"))) {
-            esElevator.setLatitude(Double.parseDouble(String.valueOf(map.get("latitude"))));
-        }
-        esElevator.setAddress(String.valueOf(map.get("address")));
-        esElevator.setCity(String.valueOf(map.get("city")));
-        esElevator.setDistrict(String.valueOf(map.get("district")));
-        esElevator.setProvince(String.valueOf(map.get("province")));
-        esElevator.setRegionCode(String.valueOf(map.get("regionCode")));
-        esElevator.setRescueCode(String.valueOf(map.get("rescueCode")));
-        esElevator.setRegisterCode(String.valueOf(map.get("registerCode")));
-        esElevator.setSequenceNbr(String.valueOf(map.get("sequenceNbr")));
-        esElevator.setInnerNum(String.valueOf(map.get("latitude")));
-        if (!org.apache.commons.lang3.ObjectUtils.isEmpty(map.get("longitude")) && !org.apache.commons.lang3.ObjectUtils.isEmpty(map.get("latitude"))) {
-            Double lat = Double.parseDouble(String.valueOf(map.get("latitude")));
-            Double lon = Double.parseDouble(String.valueOf(map.get("latitude")));
+        recordList.add(record);
+        EsElevator esElevator = superviseInfoMapper.selectElevatorEsList(record);
+        if (!ObjectUtils.isEmpty(esElevator)) {
+            Double lat = esElevator.getLatitude();
+            Double lon = esElevator.getLongitude();
             esElevator.setLocation(new GeoPoint(lat, lon));
         }
-        esElevatorList.add(esElevator);
-        recordList.add(String.valueOf(map.get("sequenceNbr")));
-        esElavtorRepository.saveAll(esElevatorList);
+        esElavtorRepository.save(esElevator);
         superviseInfoMapper.updateRecordBatch(recordList);
-
     }