删除法人库的测试方法和类

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

@@ -3,9 +3,6 @@ package com.skyversation.poiaddr.controller;
 import com.skyversation.poiaddr.addquery.AddressQueryEngine;
 import com.skyversation.poiaddr.bean.AddressResult;
 import com.skyversation.poiaddr.entity.FileDataDto;
-import com.skyversation.poiaddr.entity.LegalPerson;
-import com.skyversation.poiaddr.entity.TestData;
-import com.skyversation.poiaddr.service.impl.LegalPersonServiceImpl;
 import com.skyversation.poiaddr.service.impl.TestDataServiceImpl;
 import com.skyversation.poiaddr.util.ExcelReaderUtils;
 import com.skyversation.poiaddr.util.RequestUtils;
@@ -18,7 +15,6 @@ import com.skyversation.poiaddr.util.status.AddressLevel;
 import com.skyversation.poiaddr.util.zipunit.DataExportUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.json.simple.JSONObject;
-import org.springframework.data.domain.Page;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -39,9 +35,6 @@ import java.util.concurrent.Future;
 @RequestMapping("/poiAddress")
 public class PoiAddressController {
 
-    @Resource
-    private LegalPersonServiceImpl legalPersonServiceimpl;
-
     @Resource
     private TestDataServiceImpl testDataService;
 

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

@@ -1,114 +0,0 @@
-package com.skyversation.poiaddr.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description
- * @Author LiuMengxiang
- * @Date 2025-03-04 14:59:13
- */
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Entity
-@Table(name = "legal_person")
-public class LegalPerson implements Serializable {
-
-    private static final long serialVersionUID = 5421387670374321021L;
-
-    @Id
-    @Column(name = "id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "addressdb67cf74")
-    private String addressdb67Cf74;
-
-    @Column(name = "real_address194a5246")
-    private String realAddress194A5246;
-
-    @Column(name = "uni_sc_id615fa8b2")
-    private String uniScId615Fa8B2;
-
-    @Column(name = "corp_name0498842c")
-    private String corpName0498842C;
-
-    @Column(name = "corp_info_id014e9273")
-    private String corpInfoId014E9273;
-
-    @Column(name = "organ_codeaff7da49")
-    private String organCodeaff7Da49;
-
-    @Column(name = "entity_idd3add11b")
-    private String entityIdd3Add11B;
-
-    @Column(name = "establish_date62322132")
-    private String establishDate62322132;
-
-    /**
-     * 街镇
-     */
-    @Column(name = "twon")
-    private String twon;
-
-    /**
-     * 经度
-     */
-    @Column(name = "lat")
-    private String lat;
-
-    /**
-     * 纬度
-     */
-    @Column(name = "lon")
-    private String lon;
-
-    /**
-     * 是否在松江区
-     */
-    @Column(name = "in_the_area")
-    private String inTheArea;
-
-    /**
-     * 村居
-     */
-    @Column(name = "residential_committee")
-    private String residentialCommittee;
-
-    /**
-     * 更新时间
-     */
-    @Column(name = "update_time")
-    private Date updateTime;
-
-    /**
-     * 区
-     */
-    @Column(name = "distinguish")
-    private String distinguish;
-
-    /**
-     * 网格
-     */
-    @Column(name = "grid")
-    private String grid;
-
-    /**
-     * 微格网
-     */
-    @Column(name = "microgrid_network")
-    private String microgridNetwork;
-
-    /**
-     * 返回地址
-     */
-    @Column(name = "result_addr_key")
-    private String resultAddrKey;
-}

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

@@ -1,44 +0,0 @@
-package com.skyversation.poiaddr.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @Description  
- * @Author  LiuMengxiang
- * @Date 2025-03-06 14:00:30 
- */
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Entity
-@Table ( name ="table_a" , schema = "")
-public class TableA  implements Serializable {
-
-	private static final long serialVersionUID =  709943805325871527L;
-
-	/**
-	 * 主键
-	 */
-	@Id
-   	@Column(name = "id" )
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-
-	/**
-	 * 统一社会信用代码
-	 */
-   	@Column(name = "uscc" )
-	private String uscc;
-
-	/**
-	 * 企业名称
-	 */
-   	@Column(name = "enterprise_name" )
-	private String enterpriseName;
-}

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

@@ -1,38 +0,0 @@
-package com.skyversation.poiaddr.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @Description  
- * @Author  LiuMengxiang
- * @Date 2025-03-06 14:00:38 
- */
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Entity
-@Table ( name ="table_b" , schema = "")
-public class TableB  implements Serializable {
-
-	private static final long serialVersionUID =  6596039390915216197L;
-
-	/**
-	 * 主键
-	 */
-	@Id
-   	@Column(name = "id" )
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-
-	/**
-	 * 地址
-	 */
-   	@Column(name = "address" )
-	private String address;
-}

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

@@ -1,50 +0,0 @@
-package com.skyversation.poiaddr.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-/**
- * @Description  
- * @Author  LiuMengxiang
- * @Date 2025-03-06 14:00:47 
- */
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Entity
-@Table ( name ="table_c" , schema = "")
-public class TableC  implements Serializable {
-
-	private static final long serialVersionUID =  6899664924464774463L;
-
-	/**
-	 * 主键
-	 */
-	@Id
-   	@Column(name = "id" )
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-
-	/**
-	 * 统一社会信用代码
-	 */
-   	@Column(name = "uscc" )
-	private String uscc;
-
-	/**
-	 * 企业名称
-	 */
-   	@Column(name = "enterprise_name" )
-	private String enterpriseName;
-
-	/**
-	 * 地址
-	 */
-   	@Column(name = "address" )
-	private String address;
-}

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

@@ -1,75 +0,0 @@
-package com.skyversation.poiaddr.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description  
- * @Author  LiuMengxiang
- * @Date 2025-03-06 14:00:53 
- */
-
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Entity
-@Table ( name ="table_d" , schema = "")
-public class TableD  implements Serializable {
-
-	private static final long serialVersionUID =  8617502787464716556L;
-
-	/**
-	 * 主键
-	 */
-	@Id
-   	@Column(name = "id" )
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private Long id;
-
-	/**
-	 * 统一社会信用代码
-	 */
-   	@Column(name = "uscc" )
-	private String uscc;
-
-	/**
-	 * 企业名称
-	 */
-   	@Column(name = "enterprise_name" )
-	private String enterpriseName;
-
-	/**
-	 * 地址
-	 */
-   	@Column(name = "address" )
-	private String address;
-
-	/**
-	 * 标准地址
-	 */
-   	@Column(name = "standard_address" )
-	private String standardAddress;
-
-	/**
-	 * 所属区划
-	 */
-   	@Column(name = "belonging_division" )
-	private String belongingDivision;
-
-	/**
-	 * 所属街镇
-	 */
-   	@Column(name = "belonging_street_town" )
-	private String belongingStreetTown;
-
-	/**
-	 * 更新时间
-	 */
-   	@Column(name = "update_time" )
-	private Date updateTime;
-}

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

@@ -9,8 +9,6 @@ import com.skyversation.poiaddr.bean.AddressResult;
 import com.skyversation.poiaddr.bean.GeoJsonBean;
 import com.skyversation.poiaddr.bean.Village;
 import com.skyversation.poiaddr.bean.Zerenwangluo;
-import com.skyversation.poiaddr.service.impl.LegalPersonServiceImpl;
-import com.skyversation.poiaddr.service.impl.TestTablesServiceImpl;
 import com.skyversation.poiaddr.util.CoordTransform;
 import com.skyversation.poiaddr.util.status.AddressLevel;
 import org.geotools.geojson.geom.GeometryJSON;
@@ -24,7 +22,6 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,12 +29,6 @@ import java.util.List;
 @Service
 public class AreaService {
 
-    @Resource
-    private LegalPersonServiceImpl legalPersonServiceimpl;
-
-    @Resource
-    private TestTablesServiceImpl testTablesService;
-
     private static AreaService instance;
 
     public static AreaService getInstance() {

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

@@ -1,17 +0,0 @@
-package com.skyversation.poiaddr.service;
-
-import com.skyversation.poiaddr.entity.LegalPerson;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface LegalPersonRepository extends JpaRepository<LegalPerson, Long> {
-
-    // 使用原生 SQL 进行模糊查询并分页
-    @Query(value = "SELECT * FROM legal_person WHERE addressdb67Cf74 LIKE %:keyword%", nativeQuery = true)
-    Page<LegalPerson> findByAddressdb67Cf74Containing(@Param("keyword") String keyword, Pageable pageable);
-}

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

@@ -1,9 +0,0 @@
-package com.skyversation.poiaddr.service;
-
-import com.skyversation.poiaddr.entity.TableA;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TableARepository extends JpaRepository<TableA,Long> {
-}

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

@@ -1,9 +0,0 @@
-package com.skyversation.poiaddr.service;
-
-import com.skyversation.poiaddr.entity.TableB;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TableBRepository extends JpaRepository<TableB,Long> {
-}

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

@@ -1,9 +0,0 @@
-package com.skyversation.poiaddr.service;
-
-import com.skyversation.poiaddr.entity.TableC;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TableCRepository extends JpaRepository<TableC,Long> {
-}

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

@@ -1,9 +0,0 @@
-package com.skyversation.poiaddr.service;
-
-import com.skyversation.poiaddr.entity.TableD;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TableDRepository extends JpaRepository<TableD,Long> {
-}

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

@@ -1,129 +0,0 @@
-package com.skyversation.poiaddr.service.impl;
-
-import com.skyversation.poiaddr.addquery.AddressQueryEngine;
-import com.skyversation.poiaddr.addquery.Constant;
-import com.skyversation.poiaddr.bean.AddressResult;
-import com.skyversation.poiaddr.entity.LegalPerson;
-import com.skyversation.poiaddr.service.LegalPersonRepository;
-import com.skyversation.poiaddr.util.ExcelReaderUtils;
-import com.skyversation.poiaddr.util.status.AddressLevel;
-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;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-/**
- * 法人库测试查询
- */
-@Service
-public class LegalPersonServiceImpl {
-
-    @Autowired
-    private LegalPersonRepository legalPersonRepository;
-
-    //    查询所有
-    @Transactional
-    public Page<LegalPerson> getAllData(int page, int size) {
-        Pageable pageable = PageRequest.of(page - 1, size);
-        return legalPersonRepository.findByAddressdb67Cf74Containing(Constant.getArea(), pageable);
-    }
-
-    //    批量修改数据库数据
-    public List<LegalPerson> updateDatas(List<LegalPerson> legalPerson) {
-        return legalPersonRepository.saveAll(legalPerson);
-    }
-
-
-    /**
-     * 首先要得到一个Page<T>对象，然后判断是否还有别的数据，有的话接着请求并返回新的Page<T>对象并迭代处理数据
-     */
-    @Transactional
-    public void iterativeProcessing(Integer pageNum, Integer pageSize, Integer level) {
-        System.out.println("<<<<<<<<------iterativeProcessing{pageNum:" + pageNum + ",pageSize:" + pageSize + "}");
-        Page<LegalPerson> outData = getAllData(pageNum, pageSize);
-        List<LegalPerson> listData = outData.getContent();
-        // 创建线程池
-        int threadCount = Runtime.getRuntime().availableProcessors();
-        ExecutorService executorService = Executors.newFixedThreadPool(threadCount);
-        List<Future<?>> futures = new ArrayList<>();
-        for (LegalPerson item : listData) {
-            futures.add(executorService.submit(() -> {
-                String addr = item.getAddressdb67Cf74();
-//              判断地址是否属于松江区
-                if ((!addr.isEmpty() && ExcelReaderUtils.isOtherDistrictThanSongJiang(addr))) {
-//                  开始查询（先去除干扰字和行政区划）
-                    addr = "上海市" + Constant.getArea() + "区" + AddressQueryEngine.addressReplaceAll(addr);
-                    List<String> addrs = new ArrayList<>();
-                    addrs.add(addr);
-                    AddressResult addressResult = AddressQueryEngine.getInstance().commonSearchByName(addrs, AddressLevel.values()[level - 1]);
-                    if (addressResult != null) {
-                        if (addressResult.getData() == null || addressResult.getData().size() < 1) {
-                            item.setInTheArea("异常");
-                            item.setResultAddrKey("未查询到结果！");
-                        } else {
-                            try {
-                                for (AddressResult.ContentBean contentBean : addressResult.getData()) {
-                                    String resultAddrKey = contentBean.getAddress();
-                                    if (resultAddrKey != null && contentBean.getLon() != null && contentBean.getLat() != null && ExcelReaderUtils.isOtherDistrictThanSongJiang(resultAddrKey)) {
-                                        String lng = contentBean.getLat() + "";
-                                        String lat = contentBean.getLon() + "";
-                                        item.setInTheArea("是");
-                                        if (contentBean.getCjJson() != null) {
-                                            item.setTwon(contentBean.getCjJson().getString("所属街道"));
-                                            item.setResidentialCommittee(contentBean.getCjJson().getString("所属居委"));
-                                        }
-                                        item.setLat(lat);
-                                        item.setLon(lng);
-                                        item.setResultAddrKey(resultAddrKey);
-                                        break;
-                                    } else {
-                                        item.setInTheArea("异常");
-                                        item.setResultAddrKey("未查询到符合条件的结果！");
-                                    }
-                                }
-                            } catch (Exception e) {
-                                item.setInTheArea("异常");
-                                System.err.println("查询结果处理异常：" + e);
-                            }
-                        }
-                    } else {
-                        item.setInTheArea("异常");
-                        item.setResultAddrKey("未查询到符合条件的结果！");
-                    }
-                } else {
-//                  更新时间，添加是否松江判断字段为否
-                    item.setInTheArea("否");
-                }
-                item.setUpdateTime(new Date());
-            }));
-        }
-
-        // 等待所有任务完成
-        for (Future<?> future : futures) {
-            try {
-                future.get();
-            } catch (InterruptedException | ExecutionException e) {
-                System.err.println("线程异常：" + e);
-            }
-        }
-        // 关闭线程池
-        executorService.shutdown();
-        updateDatas(listData);
-//      多线程处理完成后，判断是否有其他分页并迭代
-        if ((long) pageNum * pageSize < outData.getTotalElements()) {
-            iterativeProcessing(pageNum + 1, pageSize, level);
-        } else {
-            System.out.println("<<<<<<<<------任务处理完成！");
-        }
-    }
-}

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

@@ -1,60 +0,0 @@
-package com.skyversation.poiaddr.service.impl;
-
-import com.skyversation.poiaddr.entity.LegalPerson;
-import com.skyversation.poiaddr.entity.TableA;
-import com.skyversation.poiaddr.entity.TableB;
-import com.skyversation.poiaddr.service.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 法人库处理流程
- * 1、根据tableA（统一社会信用代码、企业名称）和tableB（地址）得到tableC（统一社会信用代码、企业名称、地址）
- * 2、根据tableC调用地名地址接口得到tableD（统一社会信用代码、企业名称、地址、标准地址、所属区划、所属街镇）
- */
-@Service
-public class TestTablesServiceImpl {
-    @Autowired
-    private LegalPersonRepository legalPersonRepository;
-    @Autowired
-    private TableARepository tableARepository;
-    @Autowired
-    private TableBRepository tableBRepository;
-    @Autowired
-    private TableCRepository tableCRepository;
-    @Autowired
-    private TableDRepository tableDRepository;
-
-
-    /**
-     * 模拟数据，首先得到所有的LegalPerson表中的数据，然后得到：统一社会信用代码和企业名称，录入到TableA表中
-     * 然后根据LegalPerson表中的地址字段，保存到TableB表中
-     */
-    @Transactional
-    public void testData() {
-        List<LegalPerson> lpDataList = legalPersonRepository.findAll();
-        List<TableA> tableADataList = new ArrayList<>();
-        List<TableB> tableBDataList = new ArrayList<>();
-        for(LegalPerson item: lpDataList){
-            if(item.getUniScId615Fa8B2() != null && item.getCorpName0498842C() != null){
-                TableA tableA = new TableA();
-                tableA.setUscc(item.getUniScId615Fa8B2());
-                tableA.setEnterpriseName(item.getCorpName0498842C());
-                tableADataList.add(tableA);
-            };
-            if(item.getAddressdb67Cf74() != null){
-                TableB tableB = new TableB();
-                tableB.setAddress(item.getAddressdb67Cf74());
-                tableBDataList.add(tableB);
-            }
-        }
-        tableARepository.saveAll(tableADataList);
-        tableBRepository.saveAll(tableBDataList);
-        System.out.println("初始化模拟表tableA、tableB结束！");
-    }
-
-}