Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/test/java/org/springblade/test/BladeTest.java

@@ -1,13 +1,26 @@
package org.springblade.test;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.logging.log4j.util.Strings;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.test.BladeBootTest;
import org.springblade.core.test.BladeSpringExtension;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.flow.engine.entity.FlowModel;
import org.springblade.flow.engine.service.FlowEngineService;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
import org.springblade.modules.task.service.ITaskReportForRepairsService;
import org.springframework.beans.factory.annotation.Autowired;

import java.util.List;
@@ -24,6 +37,52 @@
   @Autowired
   private FlowEngineService service;

   @Autowired
   private IPlaceService iPlaceService;

   @Autowired
   private IDoorplateAddressService iDoorplateAddressService;

   @Autowired
   private IHouseService iHouseService;

//   @Test
   public void test() {

      List<PlaceEntity> list = iPlaceService.list();
      for (PlaceEntity placeEntity : list) {
         DoorplateAddressEntity one = iDoorplateAddressService.getOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
            .eq(DoorplateAddressEntity::getAddressCode, placeEntity.getHouseCode()).last("limit 1"));
         if (one != null) {
            placeEntity.setAoiCode(one.getAoiCode());
            iPlaceService.updateById(placeEntity);
         }
      }

   }

//   @Test
   public void test2() {
      // 查询 警务网格为空的数据
      List<HouseEntity> list = iHouseService.list(Wrappers.<HouseEntity>lambdaQuery().eq(HouseEntity::getIsDeleted,0));
      // 遍历
      for (HouseEntity houseEntity : list) {
         if (!Strings.isBlank(houseEntity.getLng())) {
            // 空间分析
            //点坐标解析
            String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
            List<PoliceAffairsGridEntity> policeAffairsGridEntities
               = SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
            if (policeAffairsGridEntities.size() > 0) {
               PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntities.get(0);
               houseEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
               // 更新
               iHouseService.updateById(houseEntity);
            }
         }
      }
   }

   @Test
   public void contextLoads() {
      System.out.println("=====数据迁移启动=====");