准备推送第三波入湖数据

src/main/java/com/skyversation/poiaddr/controller/CorporateLibraryController.java

@@ -183,7 +183,7 @@ public class CorporateLibraryController {
     /**
      * 本地调用121入湖接口
      *
-     * @param startOidIndex 按照批次来讲的话，现在是第二批数据也就是2kw，同时也是固定值
+     * @param startOidIndex 按照批次来讲的话，现在是第二批数据也就是3kw，同时也是固定值
      * @param page          从0开始
      * @param pageSize      一次5000条
      * @return

src/main/java/com/skyversation/poiaddr/entity/TYyszAddressZhili.java

@@ -0,0 +1,230 @@
+package com.skyversation.poiaddr.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * @Description  
+ * @Author  LiuMengxiang
+ * @Date 2025-06-09 09:50:21 
+ */
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Entity
+@Table ( name ="t_yysz_address_zhili" , schema = "")
+public class TYyszAddressZhili  implements Serializable {
+
+	private static final long serialVersionUID =  4415828649562339206L;
+
+	@Id
+   	@Column(name = "oid" )
+	private Long oid;
+
+   	@Column(name = "code" )
+	private String code;
+
+   	@Column(name = "sourceaddress" )
+	private String sourceaddress;
+
+   	@Column(name = "city" )
+	private String city;
+
+   	@Column(name = "county" )
+	private String county;
+
+   	@Column(name = "town" )
+	private String town;
+
+   	@Column(name = "community" )
+	private String community;
+
+   	@Column(name = "village" )
+	private String village;
+
+   	@Column(name = "squad" )
+	private String squad;
+
+   	@Column(name = "szone" )
+	private String szone;
+
+   	@Column(name = "street" )
+	private String street;
+
+   	@Column(name = "door" )
+	private String door;
+
+   	@Column(name = "resregion" )
+	private String resregion;
+
+   	@Column(name = "building" )
+	private String building;
+
+   	@Column(name = "building_num" )
+	private String buildingNum;
+
+   	@Column(name = "unit" )
+	private String unit;
+
+   	@Column(name = "floor" )
+	private String floor;
+
+   	@Column(name = "room" )
+	private String room;
+
+   	@Column(name = "unique_code" )
+	private String uniqueCode;
+
+   	@Column(name = "room_of_floor" )
+	private Long roomOfFloor;
+
+   	@Column(name = "source" )
+	private String source;
+
+   	@Column(name = "lon" )
+	private BigDecimal lon;
+
+   	@Column(name = "lat" )
+	private BigDecimal lat;
+
+   	@Column(name = "shape" )
+	private String shape;
+
+   	@Column(name = "belong_building" )
+	private String belongBuilding;
+
+   	@Column(name = "address_type" )
+	private Long addressType;
+
+   	@Column(name = "lv" )
+	private Long lv;
+
+   	@Column(name = "is_delete" )
+	private Long isDelete;
+
+   	@Column(name = "is_multi" )
+	private Long isMulti;
+
+   	@Column(name = "createtime" )
+	private Date createtime;
+
+   	@Column(name = "updatetime" )
+	private Date updatetime;
+
+   	@Column(name = "alt" )
+	private BigDecimal alt;
+
+   	@Column(name = "model_type" )
+	private Long modelType;
+
+   	@Column(name = "full_place" )
+	private String fullPlace;
+
+   	@Column(name = "security_grade" )
+	private Long securityGrade;
+
+   	@Column(name = "city_code" )
+	private String cityCode;
+
+   	@Column(name = "county_code" )
+	private String countyCode;
+
+   	@Column(name = "town_code" )
+	private String townCode;
+
+   	@Column(name = "community_code" )
+	private String communityCode;
+
+   	@Column(name = "grid_name" )
+	private String gridName;
+
+   	@Column(name = "grid_code" )
+	private String gridCode;
+
+   	@Column(name = "data_type" )
+	private String dataType;
+
+   	@Column(name = "mphid" )
+	private String mphid;
+
+   	@Column(name = "address_code" )
+	private String addressCode;
+
+   	@Column(name = "systemid" )
+	private String systemid;
+
+   	@Column(name = "type" )
+	private String type;
+
+   	@Column(name = "x" )
+	private String X;
+
+   	@Column(name = "y" )
+	private String Y;
+
+   	@Column(name = "label" )
+	private String label;
+
+   	@Column(name = "addr_tag" )
+	private String addrTag;
+
+   	@Column(name = "multiple_unique" )
+	private String multipleUnique;
+
+   	@Column(name = "standardize_task_id" )
+	private String standardizeTaskId;
+
+   	@Column(name = "dlhh" )
+	private String dlhh;
+
+   	@Column(name = "signature_data" )
+	private String signatureData;
+
+   	@Column(name = "signature_check_state" )
+	private Long signatureCheckState;
+
+   	@Column(name = "signature_time" )
+	private Date signatureTime;
+
+   	@Column(name = "signature_check_time" )
+	private Date signatureCheckTime;
+
+   	@Column(name = "is_history" )
+	private Long isHistory;
+
+   	@Column(name = "ylmc" )
+	private String ylmc;
+
+   	@Column(name = "ylbm" )
+	private String ylbm;
+
+   	@Column(name = "address" )
+	private String address;
+
+   	@Column(name = "ybdd" )
+	private String ybdd;
+
+   	@Column(name = "location" )
+	private String location;
+
+   	@Column(name = "tydz_jc" )
+	private String tydzJc;
+
+   	@Column(name = "match_level" )
+	private String matchLevel;
+
+   	@Column(name = "no1" )
+	private String no1;
+
+   	@Column(name = "no2" )
+	private String no2;
+}

src/main/java/com/skyversation/poiaddr/service/AreaService.java

@@ -46,6 +46,9 @@ public class AreaService {
     @Autowired
     private YyszAddressV3Service yyszAddressV3Service;
 
+    @Autowired
+    private TYszAddressZhiliService tYszAddressZhiliService;
+
     @Autowired
     private YyszAddressV3AllService yyszAddressV3AllService;
 
@@ -145,6 +148,9 @@ public class AreaService {
     public Page<YyszAddressV3> getTyaData2ByPage(Integer page, Integer pageSize){
         return yyszAddressV3Service.getDataByPages(page,pageSize);
     }
+    public Page<TYyszAddressZhili> getZhiliDataByPage(Integer page, Integer pageSize){
+        return tYszAddressZhiliService.getDataByPages(page,pageSize);
+    }
 
     public Page<YyszAddressV3All> getTyaData3ByPage(Integer page, Integer pageSize){
         return yyszAddressV3AllService.getDataByPages(page,pageSize);

src/main/java/com/skyversation/poiaddr/service/TYyszAddressZhiliRepository.java

@@ -0,0 +1,10 @@
+package com.skyversation.poiaddr.service;
+
+import com.skyversation.poiaddr.entity.TYyszAddressZhili;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import javax.annotation.Resource;
+
+@Resource
+public interface TYyszAddressZhiliRepository extends JpaRepository<TYyszAddressZhili, String> {
+}

src/main/java/com/skyversation/poiaddr/service/impl/TYszAddressZhiliService.java

@@ -0,0 +1,23 @@
+package com.skyversation.poiaddr.service.impl;
+
+import com.skyversation.poiaddr.entity.TYyszAddressZhili;
+import com.skyversation.poiaddr.service.TYyszAddressZhiliRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class TYszAddressZhiliService {
+
+    @Autowired
+    private TYyszAddressZhiliRepository tYyszAddressZhiliRepository;
+
+    public Page<TYyszAddressZhili> getDataByPages(Integer page, Integer pageSize){
+        Pageable pageable = PageRequest.of(page,pageSize);
+        return tYyszAddressZhiliRepository.findAll(pageable);
+    }
+
+}

src/main/java/com/skyversation/poiaddr/service/impl/YyskAddressStandardizationServiceImpl.java

@@ -624,13 +624,13 @@ public class YyskAddressStandardizationServiceImpl {
     public void tyaToServer(Integer startOidIndex, Integer page, Integer pageSize) {
         System.out.println("page：" + page + "，pageSize:" + pageSize);
         long startTime = System.currentTimeMillis();
-        Page<YyszAddressV3> sqlDatas = AreaService.getInstance().getTyaData2ByPage(page, pageSize);
-        List<YyszAddressV3> tYyszAddressList = sqlDatas.getContent();
+        Page<TYyszAddressZhili> sqlDatas = AreaService.getInstance().getZhiliDataByPage(page, pageSize);
+        List<TYyszAddressZhili> tYyszAddressList = sqlDatas.getContent();
         JSONObject dataList = new JSONObject();
 //          操作类型 1:新增,2:更新3:删除
         dataList.put("optFlag", 1);
         JSONArray datas = new JSONArray();
-        for (YyszAddressV3 tYyszAddress : tYyszAddressList) {
+        for (TYyszAddressZhili tYyszAddress : tYyszAddressList) {
             JSONObject dataItem = new JSONObject();
             dataItem.put("oid", Long.valueOf(startOidIndex));
             startOidIndex++;
@@ -648,7 +648,7 @@ public class YyskAddressStandardizationServiceImpl {
             dataItem.put("address_type", tYyszAddress.getType());*/
 
 //            YyszAddressV3All表映射
-            dataItem.put("sourceaddress", tYyszAddress.getSourceaddress());
+            /*dataItem.put("sourceaddress", tYyszAddress.getSourceaddress());
             dataItem.put("address", initAddrMap.outAddrMapInAddr(tYyszAddress.getSourceaddress()).getAddress());
             dataItem.put("city", tYyszAddress.getCity());
             dataItem.put("county", tYyszAddress.getCounty());
@@ -658,7 +658,20 @@ public class YyskAddressStandardizationServiceImpl {
             dataItem.put("lat", tYyszAddress.getLat());
             dataItem.put("x",tYyszAddress.getX());
             dataItem.put("y",tYyszAddress.getY());
-            dataItem.put("address_type", tYyszAddress.getNo1());
+            dataItem.put("address_type", tYyszAddress.getNo1());*/
+
+//          zhili表映射
+            dataItem.put("sourceaddress", tYyszAddress.getSourceaddress());
+            dataItem.put("address", tYyszAddress.getAddress());
+            dataItem.put("city", tYyszAddress.getCity());
+            dataItem.put("county", tYyszAddress.getCounty());
+            dataItem.put("town", tYyszAddress.getTown());
+            dataItem.put("community", tYyszAddress.getCommunity());
+            dataItem.put("lon", tYyszAddress.getLon());
+            dataItem.put("lat", tYyszAddress.getLat());
+            dataItem.put("x",tYyszAddress.getX());
+            dataItem.put("y",tYyszAddress.getY());
+            dataItem.put("address_type", "zl_v3");
 
             dataItem.put("createtime", getCurrentDateTime());
             dataItem.put("updatetime", getCurrentDateTime());