From a69aafe60ce001834b981778f12fd74d4af77e23 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 23 六月 2024 22:04:42 +0800
Subject: [PATCH] 小医生修改&下载分享数据
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 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 f575ebc..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
@@ -1,30 +1,23 @@
package com.ruoyi.service.impl;
-import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
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.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -214,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());
@@ -271,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);
@@ -287,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);
@@ -465,6 +471,10 @@
//鍏堝埌es涓煡璇㈠埌瀵瑰簲閭ｆ潯鏁版嵁鍦╡s鐨刬d
EsModel esResult = esSer.findByCtId(dataById.getId(), "瀹跺ぇ浜嬭");
+ if (esResult == null){
+ return AjaxResult.success();
+ }
+
//鎿嶄綔es淇敼鏁版嵁
EsModel newModel = new EsModel();
if(zfEvent.getAddress()!=null){
@@ -537,11 +547,13 @@
//鍒犻櫎es涓殑鏁版嵁
zfEvents.stream().forEach(zfEvent -> {
EsModel esModel = esSer.findByCtId(zfEvent.getId(), "瀹跺ぇ浜嬭");
- DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
- try {
- restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
- } catch (IOException e) {
- throw new RuntimeException(e);
+ if (esModel != null){
+ DeleteRequest deleteRequest = new DeleteRequest("allsearchdata", esModel.getId());
+ try {
+ restHighLevelClient.delete(deleteRequest,RequestOptions.DEFAULT);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
});
--
Gitblit v1.9.1