From 593b729580e950b92f10988ea2ad811627d8c114 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 15 九月 2023 15:25:52 +0800
Subject: [PATCH] 修改了测试文件
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 88b3cf2..8b5908f 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -14,9 +15,7 @@
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZfEventMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfEventService;
+import com.ruoyi.service.*;
import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -24,6 +23,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,7 +49,9 @@
@Resource
ZAuthorityService zAuthorityService;
-
+ //鍔犲叆鍒癳s涓�
+ @Resource
+ private esService esSer;
private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEvent::getCreateTime);
@@ -341,6 +343,21 @@
}
if (save(zfEvent)) {
+ // 椋� 鍔犲叆
+ EsModel esModel = new EsModel();
+ Integer inte = zfEvent.getId();
+ String uuid = UUID.randomUUID().toString().replace("-","");
+ esModel.setId(uuid);
+ esModel.setCtId(Long.valueOf(inte));
+ esModel.setCtName(zfEvent.getTitle());
+ esModel.setCtContent(zfEvent.getAddress());
+ esModel.setBy1(zfEvent.getRemark());
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esModel.setBy5("/family/zfEvent");
+ // esModel.setCtTableName("tb_ajk");
+ // esModel.setCtName("澶у");
+ // esModel.setCtContent("澶у濂斤紝鎵嶆槸鐪熺殑濂�");//澶勪簨鐢�
+ esSer.insertTable(esModel);
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -403,6 +420,9 @@
}
+ @Resource
+ ZfLogService zfLogService;
+
@Override
public AjaxResult updateData(ZfEvent zfEvent) {
ZInfoUser myself = zInfoUserService.getMyself();
@@ -419,6 +439,13 @@
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("瀹跺ぇ浜嬭");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
+
if(updateById(zfEvent)){
return AjaxResult.success();
}else {
--
Gitblit v1.9.1