提交 e373fec3 作者: 925993793@qq.com

增加推送python数据接口

上级 fb5c2bef
......@@ -20,6 +20,7 @@ public class WebConfigure implements WebMvcConfigurer {
//服务部署环境 clb:克虏宝 yjzx:研究中心
@Value("${server.profiles:clb}")
private String profiles;
@Bean
public LoginInterceptor loginInterceptor() {
return new LoginInterceptor(profiles);
......@@ -28,7 +29,8 @@ public class WebConfigure implements WebMvcConfigurer {
@Override
public void addInterceptors(InterceptorRegistry registry) {
//用户登录拦截
registry.addInterceptor(loginInterceptor()).addPathPatterns("/**").excludePathPatterns(ALLOW_URL.split(","));
registry.addInterceptor(loginInterceptor()).addPathPatterns("/**")
.excludePathPatterns("/python/**").excludePathPatterns(ALLOW_URL.split(","));
}
......
......@@ -162,10 +162,10 @@ public class EventAnalysisController {
@GetMapping("/eventContext")
public Result<?> eventContext(@RequestParam String eventId,
@RequestParam(required = false) String versionId) {
if (StringUtils.isNotEmpty(versionId)) {
String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.EVENT_CONTEXT.getCode());
return Result.OK(JSON.parseArray(versionData,JSONObject.class));
}
//if (StringUtils.isNotEmpty(versionId)) {
// String versionData = eventAnalysisVersionRecordService.getVersionData(versionId, AnalysisColumnEnum.EVENT_CONTEXT.getCode());
// return Result.OK(JSON.parseArray(versionData,JSONObject.class));
//}
List<Map<String, Object>> versionData = eventContextService.eventContext(eventId);
return Result.OK(versionData);
}
......
package com.zzsn.event.controller.python;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zzsn.event.constant.Result;
import com.zzsn.event.entity.EventContext;
import com.zzsn.event.service.EventContextService;
import jdk.internal.org.objectweb.asm.Handle;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* python推送数据
*
* @author lkg
* @date 2025/8/5
*/
@RestController
@RequestMapping("/python/send")
public class AnalysisDataController {
@Autowired
private EventContextService eventContextService;
@Value("${scheduling.yjzxEnable:false}")
Boolean yjzxEnable;
@GetMapping("/eventContext")
public Result<?> sendEventContext(@RequestParam String eventId) {
Map<String, Object> map = new HashMap<>();
map.put("ynYjzx",yjzxEnable);
LambdaQueryWrapper<EventContext> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(EventContext::getEventId, eventId).orderByDesc(EventContext::getSortNumber);
List<EventContext> eventContexts = eventContextService.list(queryWrapper);
map.put("data", eventContexts);
return Result.OK(map);
}
}
......@@ -376,12 +376,12 @@ public class AnalysisServiceImpl implements AnalysisService {
records.add(coreSummaryRecord);
log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.CORE_SUMMARY.getName());
//事件脉络
List<Map<String, Object>> eventContext = eventContextService.eventContext(eventId);
if (CollectionUtils.isNotEmpty(eventContext)) {
EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.EVENT_CONTEXT, JSON.toJSONString(eventContext));
records.add(record);
log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.EVENT_CONTEXT.getName());
}
//List<Map<String, Object>> eventContext = eventContextService.eventContext(eventId);
//if (CollectionUtils.isNotEmpty(eventContext)) {
// EventAnalysisVersionRecord record = EventAnalysisVersionRecord.of(versionId, AnalysisColumnEnum.EVENT_CONTEXT, JSON.toJSONString(eventContext));
// records.add(record);
// log.info("{}-事件分析【{}】重新生成逻辑完成。", eventName, AnalysisColumnEnum.EVENT_CONTEXT.getName());
//}
//关键词趋势分析
List<CountVO> wordTrend = this.wordTrend(eventId, null, null);
if (CollectionUtils.isNotEmpty(wordTrend)) {
......
......@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zzsn.event.entity.EventContext;
import com.zzsn.event.mapper.EventContextMapper;
import com.zzsn.event.service.EventContextService;
import com.zzsn.event.util.CodeGenerateUtil;
import com.zzsn.event.vo.EventContextModifyVO;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -27,6 +29,9 @@ import java.util.stream.Collectors;
@Service
public class EventContextServiceImpl extends ServiceImpl<EventContextMapper, EventContext> implements EventContextService{
@Autowired
private CodeGenerateUtil codeGenerateUtil;
@Override
public List<Map<String, Object>> eventContext(String eventId) {
List<Map<String, Object>> dataList = new ArrayList<>();
......@@ -63,6 +68,7 @@ public class EventContextServiceImpl extends ServiceImpl<EventContextMapper, Eve
keyNode.setParentId("0");
keyNode.setEventId(eventId);
keyNode.setYnKeyNode(1);
keyNode.setUniqueCode(codeGenerateUtil.geneCodeNo("CONTEXT_KEY_NODE"));
baseMapper.insert(keyNode);
parentId = keyNode.getId();
} else {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论