Skip to content

E
event
提交 2a5c6544 作者: 布红亮
操作

事件分析-新增字段区分测试和正式

上级 5ed4dfea
正在显示 包含 86 行增加 和 52 行删除
src/main/java/com/zzsn/event/controller/EventDataController.java
......@@ -18,10 +18,7 @@ import com.zzsn.event.service.EventExtractService;
import com.zzsn.event.service.EventSimpleService;
import com.zzsn.event.service.IEventService;
import com.zzsn.event.service.IKeyWordsService;
import com.zzsn.event.util.EsOpUtil;
import com.zzsn.event.util.HttpUtil;
import com.zzsn.event.util.ObjectUtil;
import com.zzsn.event.util.RedisUtil;
import com.zzsn.event.util.*;
import com.zzsn.event.util.user.UserUtil;
import com.zzsn.event.util.user.UserVo;
import com.zzsn.event.vo.*;
......@@ -37,6 +34,7 @@ import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -108,14 +106,16 @@ public class EventDataController {
@RequestParam(name = "order", required = false) String order,
@RequestParam(name = "orderType", required = false) String orderType,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest request) {
IPage<EventFrontVO> pageList = new Page<>();
String tenant = RequestUtil.getTenantByRequest(request);
if (category == 1){
pageList = eventService.frontAllPageList(projectId, eventId,eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
pageList = eventService.frontAllPageList(projectId, eventId,eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize, tenant);
} else if (category == 2) {
pageList = eventExtractService.frontDigPageList(projectId,eventName,eventType,pageNo,pageSize);
} else if (category == 3) {
pageList = eventService.frontOwnerPageList(projectId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize);
pageList = eventService.frontOwnerPageList(projectId, eventName, eventType, labelField, labelName, order, orderType, pageNo, pageSize, tenant);
}
return Result.OK(pageList);
}
......@@ -128,8 +128,9 @@ public class EventDataController {
* @date 2024/7/22
*/
@PostMapping("/simpleSaveEvent")
public Result<?> addEvent(@RequestBody AddEventVO addEventVO) {
public Result<?> addEvent(HttpServletRequest request, @RequestBody AddEventVO addEventVO) {
KeywordsVO keywordsVO = addEventVO.getKeywordsVO();
addEventVO.setTenant(RequestUtil.getTenantByRequest(request));
if (keywordsVO != null) {
// 调用克虏宝事件新增接口
UserVo currentUser = UserUtil.getLoginUser();
......@@ -260,14 +261,16 @@ public class EventDataController {
@RequestParam(name = "column", defaultValue = "publishDate") String column,
@RequestParam(name = "order", defaultValue = "desc") String order,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest request) {
String tenant = RequestUtil.getTenantByRequest(request);
UserVo currentUser = UserUtil.getLoginUser();
String username = currentUser.getUsername();
List<String> subjectIdList = new ArrayList<>();
if (StringUtils.isNotEmpty(subjectId)) {
subjectIdList.add(subjectId);
} else {
List<EventExcelVO> frontList = eventService.frontAllList(projectId,username, null,null,null,null,null,null);
List<EventExcelVO> frontList = eventService.frontAllList(projectId,username, null,null,null,null,null,null, tenant);
frontList.forEach(e -> subjectIdList.add(e.getId()));
}
//获取数据
......
src/main/java/com/zzsn/event/controller/EventExportController.java
......@@ -7,6 +7,7 @@ import com.zzsn.event.es.EsService;
import com.zzsn.event.service.IEventService;
import com.zzsn.event.util.DateUtil;
import com.zzsn.event.util.ExcelExportUtil;
import com.zzsn.event.util.RequestUtil;
import com.zzsn.event.util.Utility;
import com.zzsn.event.util.user.UserUtil;
import com.zzsn.event.util.user.UserVo;
......@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.URLEncoder;
......@@ -52,11 +54,12 @@ public class EventExportController {
* @date 2024/4/10
*/
@PostMapping("/eventList")
public void exportEventList(@RequestBody ExportParam exportParam, HttpServletResponse response) {
public void exportEventList(@RequestBody ExportParam exportParam, HttpServletRequest request,
HttpServletResponse response) {
UserVo currentUser = UserUtil.getLoginUser();
String username = currentUser.getUsername();
String[] headers = new String[]{"id", "事件名称", "事件描述", "发布时间", "热度"};
List<EventExcelVO> eventList = getEventList(exportParam,username);
List<EventExcelVO> eventList = getEventList(exportParam,username, RequestUtil.getTenantByRequest(request));
if (CollectionUtils.isNotEmpty(eventList)) {
String name = "event.xlsx";
List<List<String>> dataList = new ArrayList<>();
......@@ -82,7 +85,7 @@ public class EventExportController {
* @date 2024/4/11
*/
@PostMapping("/dataList")
public void exportDataList(@RequestBody ExportParam exportParam, HttpServletResponse response) {
public void exportDataList(@RequestBody ExportParam exportParam,HttpServletRequest request, HttpServletResponse response) {
UserVo currentUser = UserUtil.getLoginUser();
String username = currentUser.getUsername();
OutputStream outputstream = null;
......@@ -90,7 +93,7 @@ public class EventExportController {
try {
List<String> eventIdList = exportParam.getEventIdList();
if (CollectionUtils.isEmpty(eventIdList)) {
List<EventExcelVO> frontList = getEventList(exportParam,username);
List<EventExcelVO> frontList = getEventList(exportParam,username, RequestUtil.getTenantByRequest(request));
frontList.forEach(e -> eventIdList.add(e.getId()));
}
List<SubjectDataVo> exportDataList = esService.exportDataList(eventIdList, exportParam.getSearchWord(), exportParam.getPosition(), exportParam.getCategory(),
......@@ -133,12 +136,12 @@ public class EventExportController {
}
private List<EventExcelVO> getEventList(ExportParam exportParam,String createBy){
private List<EventExcelVO> getEventList(ExportParam exportParam,String createBy, String tenant){
List<EventExcelVO> eventList = new ArrayList<>();
Integer category = exportParam.getClassify();
if (category == 1) {
eventList = eventService.frontAllList(exportParam.getProjectId(),createBy,exportParam.getEventIdList(),exportParam.getEventName()
,exportParam.getEventType(),exportParam.getLabelField(),exportParam.getLabelName(),exportParam.getSize());
,exportParam.getEventType(),exportParam.getLabelField(),exportParam.getLabelName(),exportParam.getSize(), tenant);
} else if (category == 3) {
eventList = eventService.frontOwnerList(exportParam.getProjectId(),createBy,exportParam.getEventIdList(),exportParam.getEventName()
,exportParam.getEventType(),exportParam.getLabelField(),exportParam.getLabelName(),exportParam.getSize());
......
src/main/java/com/zzsn/event/controller/EventHomeController.java
......@@ -3,6 +3,7 @@ package com.zzsn.event.controller;
import com.zzsn.event.constant.Result;
import com.zzsn.event.service.EsStatisticsService;
import com.zzsn.event.service.IEventService;
import com.zzsn.event.util.RequestUtil;
import com.zzsn.event.util.user.UserUtil;
import com.zzsn.event.util.user.UserVo;
import com.zzsn.event.vo.EventExcelVO;
......@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
......@@ -47,11 +49,13 @@ public class EventHomeController {
* @date 2024/9/18
*/
@GetMapping(value = "/eventData")
public Result<?> eventData(@RequestParam(defaultValue = "1476527644425682945") String projectId) {
public Result<?> eventData(@RequestParam(defaultValue = "1476527644425682945") String projectId,
HttpServletRequest request) {
String tenant = RequestUtil.getTenantByRequest(request);
UserVo loginUser = UserUtil.getLoginUser();
String username = loginUser.getUsername();
Map<String, Integer> map = new HashMap<>();
List<EventExcelVO> eventList = eventService.frontAllList(projectId, username, null, null,null,null,null,null);
List<EventExcelVO> eventList = eventService.frontAllList(projectId, username, null, null,null,null,null,null, tenant);
map.put("eventCount", eventList.size());
List<String> eventIdList = eventList.stream().map(EventExcelVO::getId).collect(Collectors.toList());
long total = esStatisticsService.totalCount(eventIdList, null, null);
......@@ -81,10 +85,12 @@ public class EventHomeController {
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam Integer type,
@RequestParam(defaultValue = "10") Integer size) {
@RequestParam(defaultValue = "10") Integer size,
HttpServletRequest request) {
String tenant = RequestUtil.getTenantByRequest(request);
UserVo loginUser = UserUtil.getLoginUser();
String username = loginUser.getUsername();
List<EventTopVO> list = eventService.topEventList(projectId, username, startTime, endTime, type, size);
List<EventTopVO> list = eventService.topEventList(projectId, username, startTime, endTime, type, size, tenant);
return Result.OK(list);
}
......@@ -101,11 +107,12 @@ public class EventHomeController {
@GetMapping("/region")
public Result<?> region(@RequestParam(defaultValue = "1476527644425682945") String projectId,
@RequestParam Integer type,
@RequestParam(required = false) String regionName) {
@RequestParam(required = false) String regionName, HttpServletRequest request) {
String tenant = RequestUtil.getTenantByRequest(request);
UserVo loginUser = UserUtil.getLoginUser();
String username = loginUser.getUsername();
List<Map<String, Object>> dataList = new ArrayList<>();
List<EventRegionVO> eventRegionVOList = eventService.listByRegion(projectId,username,type, regionName);
List<EventRegionVO> eventRegionVOList = eventService.listByRegion(projectId,username,type, regionName, tenant);
Map<String, List<EventRegionVO>> map = eventRegionVOList.stream().collect(Collectors.groupingBy(EventRegionVO::getRegionName));
for (Map.Entry<String, List<EventRegionVO>> entry : map.entrySet()) {
Map<String, Object> regionMap = new HashMap<>();
......
src/main/java/com/zzsn/event/entity/Event.java
......@@ -148,6 +148,10 @@ public class Event {
private Integer sortOrder;
/**事件创建方式(1-用户直接创建;2-基于挖掘的事件创建)*/
private Integer category;
/**
* 租户用于区分正式和测试数据 test prod
*/
private String tenant;
......
src/main/java/com/zzsn/event/mapper/EventMapper.java
......@@ -87,7 +87,8 @@ public interface EventMapper extends BaseMapper<Event> {
@Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
@Param("labelName") String labelName, @Param("type") Integer type,
@Param("order") String order, @Param("orderType") String orderType,
@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
@Param("offset") Integer offset, @Param("pageSize") Integer pageSize,
@Param("tenant") String tenant);
/**
* 总数量-门户(全部)
......@@ -106,7 +107,8 @@ public interface EventMapper extends BaseMapper<Event> {
Integer frontAllCount(@Param("projectId") String projectId, @Param("createBy") String createBy,
@Param("eventId") String eventId, @Param("eventName") String eventName,
@Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
@Param("labelName") String labelName, @Param("type") Integer type);
@Param("labelName") String labelName, @Param("type") Integer type,
@Param("tenant") String tenant);
/**
......@@ -206,7 +208,8 @@ public interface EventMapper extends BaseMapper<Event> {
List<EventTopVO> topEventList(@Param("projectId") String projectId, @Param("createBy") String createBy,
@Param("startTime") String startTime, @Param("endTime") String endTime,
@Param("type") Integer type,
@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
@Param("offset") Integer offset, @Param("pageSize") Integer pageSize,
@Param("tenant") String tenant);
List<SubjectKafkaVo> processList(@Param("disableDate") Date disableDate);
......@@ -217,7 +220,8 @@ public interface EventMapper extends BaseMapper<Event> {
* @author lkg
* @date 2024/4/10
*/
List<EventRegionVO> listByRegion(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("type") Integer type, @Param("name") String name);
List<EventRegionVO> listByRegion(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("type") Integer type, @Param("name") String name,
@Param("tenant") String tenant);
/**
* 公开且发布的事件信息集合
......@@ -231,7 +235,8 @@ public interface EventMapper extends BaseMapper<Event> {
*/
List<EventExcelVO> frontAllList(@Param("projectId") String projectId, @Param("createBy") String createBy, @Param("eventIdList") List<String> eventIdList,
@Param("eventName") String eventName,@Param("eventTypes") List<String> eventTypes, @Param("labelField") String labelField,
@Param("labelName") String labelName, @Param("type") Integer type,@Param("size") Integer size);
@Param("labelName") String labelName, @Param("type") Integer type,@Param("size") Integer size,
@Param("tenant") String tenant);
/**
* 默认创建的，公开且发布的事件信息集合
......
src/main/java/com/zzsn/event/mapper/xml/EventMapper.xml
......@@ -111,7 +111,7 @@
t3.extract_keywords_tag,t3.extract_time_tag,t3.extract_location_tag
from event t1 inner join event_category t2 on t1.event_type =t2.id
left join event_tag t3 on t1.id=t3.event_id
where t1.publish_status = 1 and t1.face_public = 1
where t1.publish_status = 1 and t1.face_public = 1 and t1.tenant = #{tenant}
union
select
t1.id,t1.event_name,t1.event_icon,t1.event_type,t1.start_time,t1.end_time,t1.publish_date,t1.event_describe,t1.event_label,
......@@ -121,7 +121,7 @@
t3.extract_keywords_tag,t3.extract_time_tag,t3.extract_location_tag
from event t1 inner join event_category t2 on t1.event_type =t2.id
left join event_tag t3 on t1.id=t3.event_id
where t1.publish_status = 1 and t1.create_by = #{createBy}
where t1.publish_status = 1 and t1.create_by = #{createBy} and t1.tenant = #{tenant}
) a inner join project_subject_map m on a.id = m.subject_id
where m.project_id = #{projectId}
<if test="eventId!=null and eventId != ''">
......@@ -169,7 +169,7 @@
t2.type_name,
t3.extract_industry_tag,t3.extract_company_tag,t3.extract_person_tag,t3.extract_sentiment_tag,
t3.extract_keywords_tag,t3.extract_time_tag,t3.extract_location_tag
from event t1 inner join event_category t2 on t1.event_type =t2.id
from event t1 inner join event_category t2 on t1.event_type =t2.id and t1.tenant = #{tenant}
left join event_tag t3 on t1.id=t3.event_id
where t1.publish_status = 1 and t1.face_public = 1
union
......@@ -181,7 +181,7 @@
t3.extract_keywords_tag,t3.extract_time_tag,t3.extract_location_tag
from event t1 inner join event_category t2 on t1.event_type =t2.id
left join event_tag t3 on t1.id=t3.event_id
where t1.publish_status = 1 and t1.create_by = #{createBy}) a
where t1.publish_status = 1 and t1.create_by = #{createBy} and t1.tenant = #{tenant}) a
inner join project_subject_map m on a.id = m.subject_id
) b
where b.project_id = #{projectId}
......@@ -497,11 +497,11 @@
select distinct a.* from(
select t.id,t.event_name,t.start_time,t.end_time,t.publish_date,t.total_hot,ec.type_name
from event t inner join event_category ec on t.event_type = ec.id
where t.publish_status = 1 and t.face_public = 1
where t.publish_status = 1 and t.face_public = 1 and t.tenant = #{tenant}
union
select e.id,e.event_name,e.start_time,e.end_time,e.publish_date,e.total_hot,ec.type_name
from event e inner join event_category ec on e.event_type = ec.id
where e.publish_status = 1 and e.create_by = #{createBy}
where e.publish_status = 1 and e.create_by = #{createBy} and e.tenant = #{tenant}
) a inner join project_subject_map m on a.id = m.subject_id
where m.project_id = #{projectId}
<if test="startTime!=null and startTime != ''">
......@@ -544,10 +544,10 @@
FROM
(
select distinct a.* from(
select t.id,t.event_name,t.start_time,t.end_time from event t where t.publish_status = 1 and t.face_public = 1
select t.id,t.event_name,t.start_time,t.end_time from event t where t.publish_status = 1 and t.face_public = 1 and t.tenant = #{tenant}
union
select e.id,e.event_name,e.start_time,e.end_time from event e where e.publish_status = 1 and e.create_by =
#{createBy}
#{createBy} and e.tenant = #{tenant}
) a inner join project_subject_map m on a.id = m.subject_id
where m.project_id = #{projectId}
) b
......@@ -562,10 +562,10 @@
<select id="frontAllList" resultType="com.zzsn.event.vo.EventExcelVO">
select distinct a.* from (
select e.id,e.event_name,e.event_type,e.event_describe,e.publish_date,e.total_hot from event e
where e.publish_status = 1 and e.face_public = 1
where e.publish_status = 1 and e.face_public = 1 and e.tenant = #{tenant}
union
select e.id,e.event_name,e.event_type,e.event_describe,e.publish_date,e.total_hot from event e
where e.publish_status = 1 and e.create_by = #{createBy}
where e.publish_status = 1 and e.create_by = #{createBy} and e.tenant = #{tenant}
) a inner join project_subject_map m on a.id = m.subject_id
left join event_tag t3 on a.id=t3.event_id
where m.project_id = #{projectId}
......
src/main/java/com/zzsn/event/service/IEventService.java
......@@ -63,7 +63,10 @@ public interface IEventService extends IService<Event> {
* @author lkg
* @date 2024/4/8
*/
IPage<EventFrontVO> frontAllPageList(String projectId, String eventId,String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
IPage<EventFrontVO> frontAllPageList(String projectId, String eventId,String eventName,
String eventType, String labelField, String labelName,
String order, String orderType, Integer pageNo,
Integer pageSize,String tenant);
/**
* 分页列表-门户(我的)
......@@ -80,7 +83,8 @@ public interface IEventService extends IService<Event> {
* @author lkg
* @date 2024/4/8
*/
IPage<EventFrontVO> frontOwnerPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize);
IPage<EventFrontVO> frontOwnerPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType,
Integer pageNo, Integer pageSize,String tenant);
/**
......@@ -115,7 +119,7 @@ public interface IEventService extends IService<Event> {
* @author lkg
* @date 2024/4/8
*/
List<EventTopVO> topEventList(String projectId, String createBy,String startTime, String endTime, Integer type, Integer pageSize);
List<EventTopVO> topEventList(String projectId, String createBy,String startTime, String endTime, Integer type, Integer pageSize,String tenant);
/**
* 根据地域获取事件信息列表
......@@ -125,7 +129,7 @@ public interface IEventService extends IService<Event> {
* @author lkg
* @date 2024/4/10
*/
List<EventRegionVO> listByRegion(String projectId, String createBy,Integer type, String name);
List<EventRegionVO> listByRegion(String projectId, String createBy,Integer type, String name,String tenant);
Event saveMain(AddEventParam addEventParam);
......@@ -148,7 +152,9 @@ public interface IEventService extends IService<Event> {
* @date 2024/4/10
*/
List<EventExcelVO> frontAllList(String projectId, String createBy, List<String> eventIdList,String searchWord,
String eventType, String labelField,String labelName, Integer size);
String eventType, String labelField,String labelName,
Integer size,
String tenant);
/**
* 默认创建的，公开且发布的事件信息集合
......
src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java
......@@ -142,7 +142,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
}
@Override
public IPage<EventFrontVO> frontAllPageList(String projectId,String eventId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize) {
public IPage<EventFrontVO> frontAllPageList(String projectId,String eventId, String eventName, String eventType, String labelField, String labelName, String order, String orderType,
Integer pageNo, Integer pageSize,String tenant) {
int offset = (pageNo - 1) * pageSize;
Integer type = null;
if (StringUtils.isNotEmpty(labelField) && labelField.equals("event_label")) {
......@@ -155,7 +156,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
}
//获取当前登录人信息
UserVo currentUser = UserUtil.getLoginUser();
List<EventFrontVO> pageList = baseMapper.frontAllPageList(projectId, currentUser.getUsername(), eventId,eventName, eventTypes, labelField, labelName, type, order, orderType, offset, pageSize);
List<EventFrontVO> pageList = baseMapper.frontAllPageList(projectId, currentUser.getUsername(), eventId,eventName, eventTypes, labelField, labelName, type, order, orderType,
offset, pageSize, tenant);
if (CollectionUtils.isNotEmpty(pageList)) {
Map<String, String> map = getFirstMap(pageList);
if (MapUtil.isNotEmpty(map)) {
......@@ -171,14 +173,15 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
}
}
//获取总条数
Integer count = baseMapper.frontAllCount(projectId, currentUser.getUsername(), eventId,eventName, eventTypes, labelField, labelName, type);
Integer count = baseMapper.frontAllCount(projectId, currentUser.getUsername(), eventId,eventName, eventTypes, labelField, labelName, type, tenant);
IPage<EventFrontVO> pageData = new Page<>(pageNo, pageSize, count);
pageData.setRecords(pageList);
return pageData;
}
@Override
public IPage<EventFrontVO> frontOwnerPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType, Integer pageNo, Integer pageSize) {
public IPage<EventFrontVO> frontOwnerPageList(String projectId, String eventName, String eventType, String labelField, String labelName, String order, String orderType,
Integer pageNo, Integer pageSize,String tenant) {
int offset = (pageNo - 1) * pageSize;
Integer type = null;
if (StringUtils.isNotEmpty(labelField) && labelField.equals("event_label")) {
......@@ -243,13 +246,13 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
}
@Override
public List<EventTopVO> topEventList(String projectId, String createBy,String startTime, String endTime, Integer type, Integer pageSize) {
return baseMapper.topEventList(projectId,createBy,startTime, endTime, type, 0, pageSize);
public List<EventTopVO> topEventList(String projectId, String createBy,String startTime, String endTime, Integer type, Integer pageSize,String tenant) {
return baseMapper.topEventList(projectId,createBy,startTime, endTime, type, 0, pageSize, tenant);
}
@Override
public List<EventRegionVO> listByRegion(String projectId, String createBy,Integer type, String name) {
return baseMapper.listByRegion(projectId,createBy,type, name);
public List<EventRegionVO> listByRegion(String projectId, String createBy,Integer type, String name,String tenant) {
return baseMapper.listByRegion(projectId,createBy,type, name, tenant);
}
private Map<String, String> getFirstMap(List<EventFrontVO> pageList) {
......@@ -430,7 +433,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
@Override
public List<EventExcelVO> frontAllList(String projectId, String createBy, List<String> eventIdList,String eventName,
String eventType, String labelField,String labelName, Integer size) {
String eventType, String labelField,String labelName, Integer size,String tenant) {
Integer type = null;
if (StringUtils.isNotEmpty(labelField) && labelField.equals("event_label")) {
type = 1;
......@@ -440,7 +443,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
List<Node> nodes = eventCategoryService.categoryList();
eventTypes = TreeUtil.belowList(nodes, eventType, true);
}
return baseMapper.frontAllList(projectId,createBy,eventIdList,eventName,eventTypes,labelField,labelName,type, size);
return baseMapper.frontAllList(projectId,createBy,eventIdList,eventName,eventTypes,labelField,labelName,type, size, tenant);
}
@Override
......
src/main/java/com/zzsn/event/vo/AddEventVO.java
......@@ -52,4 +52,7 @@ public class AddEventVO {
/**事件编码，这里研究中心部署调用克虏宝，直接使用clb中的事件编码*/
private String eventCode;
/**租户用于区分正式和测试数据*/
private String tenant = "prod";
}
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论