From 3cd5c749ca237103a5014e902ce21b7148b9b6e3 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 08 四月 2023 12:46:39 +0800
Subject: [PATCH] aaa
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index d4f9477..fb803c4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -9,13 +9,17 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfEventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.HashMap;
@@ -35,6 +39,9 @@
@Resource
ZInfoUserService zInfoUserService;
+
+ @Resource
+ ZfEventService zfEventService;
private String listFamilyIds(){
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -68,6 +75,48 @@
return list;
}
+ @Override
+ public int addEvent(ZfEvent zfEvent) {
+ String familyIds = listFamilyIds();
+ boolean flag = false;//鍒ゆ柇褰撳墠鐢ㄦ埛鐨刬d鏄惁鏈夋潈鍔犲叆褰撳墠瀹跺涵id鐨勫璞�
+ if (familyIds.contains(",")) {
+ String[] familyList = familyIds.split(",");
+ for (String familyId : familyList) {
+ if (familyId.equals(zfEvent.getFamilyId())) {
+ flag = true;
+ }
+ }
+ } else {
+ if (zfEvent.getFamilyId().equals(familyIds)) {
+ flag = true;
+ }
+ }
+ if (flag) {
+ boolean save = save(zfEvent);
+ return save ? 1 : 0;
+ } else {
+ throw new RuntimeException("浣犳病鏈夋搷浣滆瀹跺涵鍙蜂负" + zfEvent.getFamilyId() + "鏁版嵁鐨勬潈闄�");
+ }
+ }
+
+ @Override
+ public AjaxResult importExcel(MultipartFile file) {
+ ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
+ List<ZfEvent> eventList = null;
+ try {
+ eventList = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ log.info("璧勪骇鍒楄〃涓猴細{}", eventList);
+
+ for (ZfEvent zfEvent : eventList) {
+ zfEventService.addEvent(zfEvent);
+ }
+
+ return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+ }
+
private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent) {
LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
lqw.like(!StringUtils.isEmpty(zfEvent.getAddress()),ZfEvent::getAddress,zfEvent.getAddress());
@@ -82,9 +131,7 @@
LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent);
if (familyIds.contains(",")) {
String[] familyList = familyIds.split(",");
- for (String familyId : familyList) {
- lqw.or().eq(ZfEvent::getFamilyId,familyId);
- }
+ lqw.in(ZfEvent::getFamilyId,familyList);
}else {
lqw.eq(ZfEvent::getFamilyId,familyIds);
}
--
Gitblit v1.9.1