From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java b/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
index 71bb2db..602241d 100644
--- a/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
+++ b/src/main/java/org/springblade/modules/community/service/impl/CommunityServiceImpl.java
@@ -16,10 +16,12 @@
*/
package org.springblade.modules.community.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.community.entity.CommunityEntity;
+import org.springblade.modules.community.excel.CommunityExcel;
import org.springblade.modules.community.vo.CommunityVO;
import org.springblade.modules.community.mapper.CommunityMapper;
import org.springblade.modules.community.service.ICommunityService;
@@ -56,4 +58,48 @@
public List<String> getCommunityCodeListByUserId(Long userId) {
return baseMapper.getCommunityCodeListByUserId(userId);
}
+
+ /**
+ * 导入社区数据
+ * @param data
+ * @param isCovered
+ */
+ @Override
+ public void importCommunity(List<CommunityExcel> data, Boolean isCovered) {
+ for (CommunityExcel communityExcel : data) {
+ // 查询是否存在，存在即更新，否则新增
+ QueryWrapper<CommunityEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("code",communityExcel.getCommunityCode());
+ CommunityEntity one = getOne(wrapper);
+ if (null!=one){
+ // 更新
+ one.setGeom(communityExcel.getGeom());
+ // 更新
+ updateById(one);
+ }else {
+ // 新增
+ CommunityEntity communityEntity = new CommunityEntity();
+ communityEntity.setCode(communityExcel.getCommunityCode());
+ communityEntity.setName(communityExcel.getCommunityName());
+ communityEntity.setGeom(communityExcel.getGeom());
+ save(communityEntity);
+ }
+ }
+ }
+
+ /**
+ * 社区表 自定义新增或修改
+ */
+ @Override
+ public boolean saveOrUpdateCommunityEntity(CommunityEntity community) {
+ return false;
+ }
+
+ /**
+ * 社区表 自定义详情
+ */
+ @Override
+ public CommunityVO getDetail(CommunityEntity community) {
+ return baseMapper.getDetail(community);
+ }
}
--
Gitblit v1.9.3