一码通认领电梯同步至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/entity/EsElevator.java

@@ -21,7 +21,7 @@ public class EsElevator {
 
     /** 主键 */
     @Id
-    private Long sequenceNbr;
+    private String sequenceNbr;
 
     /**
      * 注册编码

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

@@ -21,4 +21,6 @@ public interface SuperviseInfoMapper extends BaseMapper<SuperviseInfo> {
 	List<String> selectSuperviseCodeList(@Param("records") List<String> records);
 
 	void deleteDataAll(@Param("records") List<String> records);
+
+	Map<String, Object> selectElevatorEsList(String record);
 }

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper">
 
     <update id="updateRecordBatch">
-        UPDATE idx_biz_jg_use_info SET "IS_NOT_ES" = 1 WHERE "RECORD" IN
+        UPDATE idx_biz_jg_use_info SET "IS_NOT_ELEV" = 1 WHERE "RECORD" IN
         <foreach collection="recordList" separator="," item="record" open="(" close=")">
             #{record}
         </foreach>
@@ -108,4 +108,28 @@
             #{record}
         </foreach>
     </delete>
+
+
+    <select id="selectElevatorEsList" resultType="java.util.Map">
+        SELECT
+            jui.RECORD AS sequenceNbr,
+            ifnull ( jui.USE_INNER_CODE, null ) AS innerNum,
+            ifnull ( joi.CODE96333, null ) AS rescueCode,
+            ifnull ( joi.SUPERVISORY_CODE, null ) AS registerCode,
+            ifnull ( jui.ADDRESS, null ) AS address,
+            ifnull ( jui.PROVINCE_NAME, null ) AS province,
+            ifnull ( jui.CITY_NAME, null ) AS city,
+            ifnull ( jui.COUNTY_NAME, null ) AS district,
+            ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'latitude', null ) AS latitude,
+            ifnull ( jui."LONGITUDE_LATITUDE"::json->> 'longitude', null ) AS longitude,
+            concat(jui.PROVINCE, '#',jui.CITY, '#',jui.COUNTY) AS regionCode
+        FROM
+            idx_biz_jg_use_info jui
+                LEFT JOIN idx_biz_jg_other_info joi ON jui.RECORD = joi.RECORD
+                LEFT JOIN idx_biz_jg_register_info jri ON jri.RECORD = jui.RECORD
+        WHERE jri.EQU_LIST = '3000'
+          AND joi.CLAIM_STATUS = '已认领'
+          AND jui.RECORD = #{record}
+        ORDER BY jui.REC_DATE
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/ElevatorController.java

@@ -422,7 +422,7 @@ public class ElevatorController extends BaseController {
             elevatorPage =  elevatorService.page(elevatorPage);
             for (Elevator el:elevatorPage.getRecords()
                  ) {
-                esElevatorService.saveEsElevatorToES(el);
+//                esElevatorService.saveEsElevatorToES(el);
             }
         }
     }

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/ESElevatorServiceImpl.java

@@ -92,32 +92,32 @@ public class ESElevatorServiceImpl {
      *
      * @param elevator 电梯信息
      */
-    public EsElevator saveEsElevatorToES(Elevator elevator)
-    {
-		EsElevator esElevator = new EsElevator();
-        if(StringUtils.isNotEmpty(elevator.getLongitude())) {
-            esElevator.setLongitude(Double.parseDouble(elevator.getLongitude()));
-        }
-        if(StringUtils.isNotEmpty(elevator.getLatitude())) {
-            esElevator.setLatitude(Double.parseDouble(elevator.getLatitude()));
-        }
-        esElevator.setAddress(elevator.getAddress());
-        esElevator.setCity(elevator.getCity());
-        esElevator.setDistrict(elevator.getDistrict());
-        esElevator.setProvince(elevator.getProvince());
-        esElevator.setRegionCode(elevator.getRegionCode());
-        esElevator.setRescueCode(elevator.getRescueCode().toString());
-        esElevator.setRegisterCode(elevator.getRegisterCode());
-        esElevator.setSequenceNbr(elevator.getSequenceNbr());
-        esElevator.setInnerNum(elevator.getInnerNum());
-        if(StringUtils.isNotBlank(elevator.getLatitude()) && StringUtils.isNotBlank(elevator.getLongitude())) {
-            Double lat = Double.parseDouble(elevator.getLatitude());
-            Double lon = Double.parseDouble(elevator.getLongitude());
-            esElevator.setLocation(new GeoPoint(lat,lon));
-        }
-		esElavtorRepository.save(esElevator);
-    	return esElevator;
-    }
+//    public EsElevator saveEsElevatorToES(Elevator elevator)
+//    {
+//		EsElevator esElevator = new EsElevator();
+//        if(StringUtils.isNotEmpty(elevator.getLongitude())) {
+//            esElevator.setLongitude(Double.parseDouble(elevator.getLongitude()));
+//        }
+//        if(StringUtils.isNotEmpty(elevator.getLatitude())) {
+//            esElevator.setLatitude(Double.parseDouble(elevator.getLatitude()));
+//        }
+//        esElevator.setAddress(elevator.getAddress());
+//        esElevator.setCity(elevator.getCity());
+//        esElevator.setDistrict(elevator.getDistrict());
+//        esElevator.setProvince(elevator.getProvince());
+//        esElevator.setRegionCode(elevator.getRegionCode());
+//        esElevator.setRescueCode(elevator.getRescueCode().toString());
+//        esElevator.setRegisterCode(elevator.getRegisterCode());
+//        esElevator.setSequenceNbr(elevator.getSequenceNbr());
+//        esElevator.setInnerNum(elevator.getInnerNum());
+//        if(StringUtils.isNotBlank(elevator.getLatitude()) && StringUtils.isNotBlank(elevator.getLongitude())) {
+//            Double lat = Double.parseDouble(elevator.getLatitude());
+//            Double lon = Double.parseDouble(elevator.getLongitude());
+//            esElevator.setLocation(new GeoPoint(lat,lon));
+//        }
+//		esElavtorRepository.save(esElevator);
+//    	return esElevator;
+//    }
 
 
     /**

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

@@ -18,6 +18,7 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
+import com.yeejoin.amos.boot.module.ymt.biz.dao.ESElavtorRepository;
 import com.yeejoin.amos.boot.module.ymt.biz.dao.ESEquipmentCategory;
 
 import com.yeejoin.amos.boot.module.ymt.biz.utils.JsonUtils;
@@ -31,6 +32,7 @@ import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.geo.GeoPoint;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -115,7 +117,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
     @Autowired
     private static final String TABLENAME = "tableName";
-
+    @Autowired
+    private ESElavtorRepository esElavtorRepository;
     @Value("${regulator.unit.code}")
     private String code;
 
@@ -1028,7 +1031,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         useInfoFrom.put("REC_DATE", dateFormat.format(calendar.getTime()));
         String unitCode = String.valueOf(useInfoFrom.get("USE_UNIT_CREDIT_CODE"));
         LinkedHashMap supervisionMap = (LinkedHashMap) map.get(SUPERVISION_FROM_ID);
-        String orgBranchCode = String.valueOf(supervisionMap.get("ORG_BRANCH_CODE"));
+        String record = null;
         try {
             LinkedHashMap superviseMap = (LinkedHashMap) map.get("data");
             String claimStatus = String.valueOf(superviseMap.get("claimStatus"));
@@ -1103,7 +1106,8 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             stopWatch4.start();
             if (!ObjectUtils.isEmpty(responseModel) && "200".equals(String.valueOf(responseModel.getStatus()))) {
                 log.info("responseModel.getResult().toString()->>>>>>>>>>>>>> {}",responseModel.getResult());
-                checkEsData(String.valueOf(responseModel.getResult()));
+                record = String.valueOf(responseModel.getResult());
+                checkEsData(record);
             }
             stopWatch4.stop();
             if (log.isInfoEnabled()) {
@@ -1116,6 +1120,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             StopWatch stopWatch5 = new StopWatch();
             stopWatch5.start();
             ExecutorService threadPool = Executors.newCachedThreadPool();
+            String finalRecord = record;
             threadPool.submit(new Runnable() {
                 @Override
                 public void run() {
@@ -1124,6 +1129,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
                     supervisoryCodeInfoMapper.update(supervisoryCodeInfo, new QueryWrapper<SupervisoryCodeInfo>().eq("supervisory_code", supervisionMap.get("SUPERVISORY_CODE")));
                     log.info("unitCode-------->>>>>>>>>>{}", unitCode);
                     updateEquipmentCategoryData(unitCode);
+                    saveEsElevator2ES(finalRecord);
                 }
             });
             stopWatch5.stop();
@@ -1151,6 +1157,41 @@ 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")));
+            esElevator.setLocation(new GeoPoint(lat, lon));
+        }
+        esElevatorList.add(esElevator);
+        recordList.add(String.valueOf(map.get("sequenceNbr")));
+        esElavtorRepository.saveAll(esElevatorList);
+        superviseInfoMapper.updateRecordBatch(recordList);
+
+    }
+
+
+
     //分页查询所有数据
     public Page<Map<String, Object>> getAll(Map<String, Object> map) {
         String tableName = map.get(TABLENAME).toString();