src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -217,4 +217,13 @@ return R.data(doorplateAddressService.aoiDataHandle()); } /** * 场所数据处理 * @return */ @GetMapping("/placeDataHandle") public R placeDataHandle(){ return R.data(doorplateAddressService.placeDataHandle()); } } src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
@@ -190,4 +190,10 @@ * @return */ List<Long> getAoiCodeList(); /** * 查询所有的地址表和场所表差集集合 * @return */ List<DoorplateAddressEntity> getPlaceList(); } src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -106,7 +106,7 @@ ) union all ( select '商超' as id,'商超' as name,4 as addressType from jczz_place_rel jpl select '企业商超' as id,'企业商超' as name,4 as addressType from jczz_place_rel jpl join jczz_place jp on jpl.place_id = jp.id and jp.is_deleted = 0 where jpl.is_deleted = 0 <if test="houseParam.communityName!=null and houseParam.communityName!=''"> @@ -114,6 +114,9 @@ </if> <if test="houseParam.gridName!=null and houseParam.gridName!=''"> and grid_name like concat('%',#{houseParam.gridName},'%') </if> <if test="houseParam.code != null and houseParam.code!=''"> and community_code = #{houseParam.code} </if> limit 1 ) @@ -411,4 +414,22 @@ group by aoi_code ) </select> <!--查询所有的地址表和场所表差集集合(小区和非小区的)--> <select id="getPlaceList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity"> select jda.* from jczz_doorplate_address jda left join jczz_place jp on jp.house_code = jda.address_code and jp.is_deleted =0 where 1=1 and jp.house_code is null and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1)) union all ( select jda.* from jczz_doorplate_address jda left join jczz_place jp on jp.house_code = jda.address_code and jp.is_deleted =0 where 1=1 and jp.house_code is null and aoi_code is null and doorplate_type='中门牌' ) </select> </mapper> src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
@@ -104,4 +104,10 @@ * @return */ Object aoiDataHandle(); /** * 场所数据处理 * @return */ Object placeDataHandle(); } src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -43,9 +43,11 @@ import org.springblade.modules.house.vo.HouseParam; import org.springblade.modules.house.vo.HouseRentalVO; import org.springblade.modules.house.vo.HouseholdVO; import org.springblade.modules.place.entity.PlaceEntity; import org.springblade.modules.place.service.IPlaceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; @@ -634,4 +636,33 @@ // 返回 return null; } /** * 场所数据处理 * @return */ @Override @Transactional(rollbackFor = Exception.class) public Object placeDataHandle() { // 查询所有的地址表和场所表差集集合 List<DoorplateAddressEntity> list = baseMapper.getPlaceList(); // 创建场所集合对象 List<PlaceEntity> placeList = new ArrayList<>(); // 将小区数据保存到小区表中 for (DoorplateAddressEntity addressEntity : list) { PlaceEntity placeEntity = new PlaceEntity(); placeEntity.setHouseCode(addressEntity.getAddressCode()); placeEntity.setPlaceName(addressEntity.getPoi()); placeEntity.setLng(addressEntity.getX()); placeEntity.setLat(addressEntity.getY()); placeEntity.setLocaltion(addressEntity.getAddressName()); placeEntity.setLat(addressEntity.getY()); // 加入集合 placeList.add(placeEntity); } // 批量插入 placeService.saveBatch(placeList); // 返回 return null; } } src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -16,10 +16,7 @@ */ package org.springblade.modules.place.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -80,12 +77,12 @@ * 经度 */ @ApiModelProperty(value = "经度") private BigDecimal lng; private String lng; /** * 纬度 */ @ApiModelProperty(value = "纬度") private BigDecimal lat; private String lat; /** * 位置 */ @@ -108,6 +105,7 @@ */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty("创建人") @TableField(fill = FieldFill.INSERT) private Long createUser; /** @@ -116,6 +114,7 @@ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("创建时间") @TableField(fill = FieldFill.INSERT) private Date createTime; /** @@ -123,6 +122,7 @@ */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty("更新人") @TableField(fill = FieldFill.INSERT_UPDATE) private Long updateUser; /** @@ -131,6 +131,7 @@ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("更新时间") @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** src/main/java/org/springblade/modules/place/entity/PlaceRelEntity.java
@@ -68,6 +68,11 @@ @ApiModelProperty(value = "社区名称") private String communityName; /** * 社区编号 */ @ApiModelProperty(value = "社区编号") private String communityCode; /** * 网格名称 */ @ApiModelProperty(value = "网格名称")
