From 03166fec064856cb14de837cedc8bb6c5a537212 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 Nov 2023 11:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 33 ++++++++++++++++
src/main/java/org/springblade/modules/district/controller/DistrictController.java | 2
src/main/java/org/springblade/modules/district/entity/DistrictEntity.java | 9 ++--
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java | 13 ++++++
src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java | 6 +++
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 35 +++++++++++++++++
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 9 ++++
src/main/java/org/springblade/common/config/MetaObjectConfig.java | 8 +++-
8 files changed, 108 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/MetaObjectConfig.java b/src/main/java/org/springblade/common/config/MetaObjectConfig.java
index 8feddc0..f466745 100644
--- a/src/main/java/org/springblade/common/config/MetaObjectConfig.java
+++ b/src/main/java/org/springblade/common/config/MetaObjectConfig.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Component;
import java.util.Date;
@@ -15,8 +16,10 @@
public void insertFill(MetaObject metaObject) {
//设置自动插入填充
this.setFieldValByName("createTime", new Date(), metaObject);
- this.setFieldValByName("updateTime", new Date(), metaObject);
- this.setFieldValByName("happenTime", new Date(), metaObject);
+ this.setFieldValByName("create_user", AuthUtil.getUserId(), metaObject);
+ this.setFieldValByName("updateTime", new Date(), metaObject);
+ this.setFieldValByName("update_user", AuthUtil.getUserId(), metaObject);
+ this.setFieldValByName("happenTime", new Date(), metaObject);
}
@@ -24,5 +27,6 @@
public void updateFill(MetaObject metaObject) {
//设置自动修改填充
this.setFieldValByName("updateTime", new Date(), metaObject);
+ this.setFieldValByName("update_user", AuthUtil.getUserId(), metaObject);
}
}
diff --git a/src/main/java/org/springblade/modules/district/controller/DistrictController.java b/src/main/java/org/springblade/modules/district/controller/DistrictController.java
index 7b97932..c4785d9 100644
--- a/src/main/java/org/springblade/modules/district/controller/DistrictController.java
+++ b/src/main/java/org/springblade/modules/district/controller/DistrictController.java
@@ -119,7 +119,7 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(districtService.removeByIds(Func.toLongList(ids)));
+ return R.status(districtService.removeByIds(Func.toStrList(ids)));
}
diff --git a/src/main/java/org/springblade/modules/district/entity/DistrictEntity.java b/src/main/java/org/springblade/modules/district/entity/DistrictEntity.java
index 1bdde69..8e6d973 100644
--- a/src/main/java/org/springblade/modules/district/entity/DistrictEntity.java
+++ b/src/main/java/org/springblade/modules/district/entity/DistrictEntity.java
@@ -16,10 +16,7 @@
*/
package org.springblade.modules.district.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;
@@ -101,6 +98,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("创建人")
+ @TableField(fill = FieldFill.INSERT)
private String createUser;
/**
@@ -109,6 +107,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;
/**
@@ -116,6 +115,7 @@
*/
@JsonSerialize(using = ToStringSerializer.class)
@ApiModelProperty("更新人")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateUser;
/**
@@ -124,6 +124,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;
/**
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
index 8fb5ba5..3e67593 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -208,4 +208,13 @@
return R.data(doorplateAddressService.dataHandle());
}
+ /**
+ * 小区数据处理
+ * @return
+ */
+ @GetMapping("/aoiDataHandle")
+ public R aoiDataHandle(){
+ return R.data(doorplateAddressService.aoiDataHandle());
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
index 3afad58..1f3767b 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
@@ -177,4 +177,17 @@
* @return
*/
List<FuncNode> getPlaceRelDetailList(@Param("houseParam") HouseParam houseParam);
+
+ /**
+ * 查询小区集合
+ * @param list
+ * @return
+ */
+ List<DoorplateAddressEntity> getAoiList(@Param("list") List<Long> list);
+
+ /**
+ * 查询所有的地址表id集合
+ * @return
+ */
+ List<Long> getAoiCodeList();
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index c54eeb4..12434f6 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -378,4 +378,37 @@
</if>
</select>
+ <!--查询小区集合-->
+ <select id="getAoiList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
+ select nei_code,aoi_code,ifnull(aoi_name,sub_aoi) as aoi_name,x,y,address_name from jczz_doorplate_address
+ where 1=1
+ <choose>
+ <when test="list != null and list.size()>0">
+ and id in
+ <foreach collection="list" item="id" separator ="," open="(" close=")">
+ #{id}
+ </foreach>
+ </when>
+ <otherwise>
+ and id in ('')
+ </otherwise>
+ </choose>
+ </select>
+
+ <!--查询所有的地址表id集合-->
+ <select id="getAoiCodeList" resultType="java.lang.Long">
+ select
+ max(id)
+ from jczz_doorplate_address
+ where aoi_code != "" and aoi_name !=""
+ GROUP BY aoi_code
+ union all
+ (
+ select
+ max(id)
+ from jczz_doorplate_address
+ where aoi_code != "" and sub_aoi != ""
+ group by aoi_code
+ )
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java b/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
index 2713696..e1ff962 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java
@@ -98,4 +98,10 @@
* @return
*/
Object dataHandle();
+
+ /**
+ * 小区数据处理
+ * @return
+ */
+ Object aoiDataHandle();
}
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 2957ec3..17b1d26 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -26,6 +26,8 @@
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.district.entity.DistrictEntity;
+import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
@@ -71,6 +73,9 @@
@Autowired
private IGridService gridService;
+
+ @Autowired
+ private IDistrictService districtService;
@Override
@@ -599,4 +604,34 @@
// 批量插入
houseService.saveBatch(houseList);
}
+
+ /**
+ * 小区数据处理
+ * @return
+ */
+ @Override
+ public Object aoiDataHandle() {
+ // 查询所有的地址表id集合
+ List<Long> aoiCodeList = baseMapper.getAoiCodeList();
+ // 查询小区集合
+ List<DoorplateAddressEntity> list = baseMapper.getAoiList(aoiCodeList);
+ // 创建小区集合对象
+ List<DistrictEntity> aoiList = new ArrayList<>();
+ // 将小区数据保存到小区表中
+ for (DoorplateAddressEntity addressEntity : list) {
+ DistrictEntity districtEntity = new DistrictEntity();
+ districtEntity.setCommunityCode(addressEntity.getNeiCode());
+ districtEntity.setAoiCode(addressEntity.getAoiCode());
+ districtEntity.setName(addressEntity.getAoiName());
+ districtEntity.setAddress(addressEntity.getAddressName());
+ districtEntity.setLng(addressEntity.getX());
+ districtEntity.setLat(addressEntity.getY());
+ // 加入集合
+ aoiList.add(districtEntity);
+ }
+ // 批量插入
+ districtService.saveBatch(aoiList);
+ // 返回
+ return null;
+ }
}
--
Gitblit v1.9.3