From 700fe50d81969f8b2ba0fcbef10ccc5ca2e4558b Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 28 八月 2024 11:22:39 +0800
Subject: [PATCH] 修改了时间格式
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 14 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 f1e480a..5bd1645 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
@@ -6,23 +6,24 @@
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;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZfEventMapper;
import com.ruoyi.service.*;
-import com.ruoyi.util.ArraysUtil;
import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.action.delete.DeleteRequest;
+import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.io.IOException;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -51,7 +52,10 @@
ZAuthorityService zAuthorityService;
//鍔犲叆鍒癳s涓�
@Resource
- private esService esSer;
+ private EsService esSer;
+
+ @Resource
+ private RestHighLevelClient restHighLevelClient;
private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) {
LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfEvent::getCreateTime);
@@ -203,7 +207,10 @@
// String secondFamilyIds = listSecondFamilyIds();
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ System.out.println("================");
+
Long familyId = myself.getFamilyId();
+
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
@@ -260,12 +267,20 @@
public AjaxResult selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) {
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
+ System.out.println("++++++++++++++++");
+ System.out.println(familyId);
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ System.out.println(idList.size());
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds();
LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -276,6 +291,8 @@
List<ZfEvent> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
+ System.out.println(beanRecords);
+ System.out.println(beanRecords.size());
List<ZfEvent> dtoResult = markOwnData(familyId, beanRecords);
HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
@@ -343,20 +360,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.setCtTableName("tb_ajk");
- // esModel.setCtName("澶у");
- // esModel.setCtContent("澶у濂斤紝鎵嶆槸鐪熺殑濂�");//澶勪簨鐢�
+ esModel.setCtTableName("瀹跺ぇ浜嬭");
+ esModel.setBy1(zfEvent.getAddress());
+ esModel.setBy2(zfEvent.getPeople());
+ esModel.setBy3(zfEvent.getTitle());
+ esModel.setRemark(zfEvent.getRemark());
+ //杩欓噷瀛樺偍鏌ヨ璇︽儏鐨勮矾寰�
+ esModel.setBy5("/family/zfEvent");
+ esModel.setFid(familyId);
esSer.insertTable(esModel);
+
return AjaxResult.success();
} else {
return AjaxResult.error();
@@ -423,6 +441,7 @@
ZfLogService zfLogService;
@Override
+ @Transactional
public AjaxResult updateData(ZfEvent zfEvent) {
ZInfoUser myself = zInfoUserService.getMyself();
Long familyId = myself.getFamilyId();
@@ -445,7 +464,58 @@
zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
zfLogService.save(zfLog);
- if(updateById(zfEvent)){
+ if(zfEventService.updateById(zfEvent)){
+ //鍒版暟鎹簱涓煡璇㈠搴旂殑鏁版嵁
+ ZfEvent dataById = getById(zfEvent.getId());
+
+ //鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
+ EsModel esResult = esSer.findByCtId(dataById.getId(), "瀹跺ぇ浜嬭");
+
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
+ //鎿嶄綔es淇敼鏁版嵁
+ EsModel newModel = new EsModel();
+ if(zfEvent.getAddress()!=null){
+ newModel.setBy1(zfEvent.getAddress());
+ }else {
+ newModel.setBy1(dataById.getAddress());
+ }
+
+ if(zfEvent.getPeople()!=null){
+ newModel.setBy2(zfEvent.getPeople());
+ }else {
+ newModel.setBy2(dataById.getPeople());
+ }
+
+ if(zfEvent.getTitle()!=null){
+ newModel.setBy3(zfEvent.getTitle());
+ }else {
+ newModel.setBy3(dataById.getTitle());
+ }
+
+ if(zfEvent.getRemark()!=null){
+ newModel.setRemark(zfEvent.getRemark());
+ }else {
+ newModel.setRemark(dataById.getRemark());
+ }
+
+ UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
+ updateRequest.doc(
+ "by1",newModel.getBy1(),
+ "by2",newModel.getBy2(),
+ "by3",newModel.getBy3(),
+ "by4",newModel.getBy4(),
+ "remark",newModel.getRemark()
+ );
+
+ try {
+ restHighLevelClient.update(updateRequest, RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
return AjaxResult.success();
}else {
return AjaxResult.error();
@@ -470,7 +540,23 @@
}
}
+ List<ZfEvent> zfEvents = listByIds(Arrays.asList(ids));
+
if (zfEventService.removeByIds(Arrays.asList(ids))) {
+
+ //鍒犻櫎es涓殑鏁版嵁
+ zfEvents.stream().forEach(zfEvent -> {
+ EsModel esModel = esSer.findByCtId(zfEvent.getId(), "瀹跺ぇ浜嬭");
+ if (esModel != null){
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ try {
+ restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+
return AjaxResult.success();
}else {
return AjaxResult.error();
--
Gitblit v1.9.1