提交 a59c2f71 作者: obcy

【默认绑定流程-默认绑定事件分类和项目】

上级 1d44721b
...@@ -10,13 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -10,13 +10,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zzsn.clb.common.model.task.dto.titr.KeyWordsDTO; import com.zzsn.clb.common.model.task.dto.titr.KeyWordsDTO;
import com.zzsn.event.constant.Constants; import com.zzsn.event.constant.Constants;
import com.zzsn.event.constant.Result; import com.zzsn.event.constant.Result;
import com.zzsn.event.entity.ClbModelArrangeSubjectMap;
import com.zzsn.event.entity.Event; import com.zzsn.event.entity.Event;
import com.zzsn.event.entity.KeyWords; import com.zzsn.event.entity.KeyWords;
import com.zzsn.event.entity.SubjectInfoSourceMap; import com.zzsn.event.entity.SubjectInfoSourceMap;
import com.zzsn.event.service.IEventService; import com.zzsn.event.service.*;
import com.zzsn.event.service.IKeyWordsService;
import com.zzsn.event.service.ISubjectInfoSourceMapService;
import com.zzsn.event.service.LabelEntityService;
import com.zzsn.event.service.impl.CaiJiCenterHttpService; import com.zzsn.event.service.impl.CaiJiCenterHttpService;
import com.zzsn.event.service.impl.ConfigurationMessageService; import com.zzsn.event.service.impl.ConfigurationMessageService;
import com.zzsn.event.util.HttpUtil; import com.zzsn.event.util.HttpUtil;
...@@ -64,6 +62,8 @@ public class EventManageController { ...@@ -64,6 +62,8 @@ public class EventManageController {
private ConfigurationMessageService configurationMessageService; private ConfigurationMessageService configurationMessageService;
@Autowired @Autowired
private IKeyWordsService keyWordsService; private IKeyWordsService keyWordsService;
@Autowired
private ClbModelArrangeSubjectMapService clbModelArrangeSubjectMapService;
@Autowired @Autowired
private RedisUtil redisUtil; private RedisUtil redisUtil;
...@@ -259,6 +259,8 @@ public class EventManageController { ...@@ -259,6 +259,8 @@ public class EventManageController {
iXxlJobInfoService.deleteByInfosourceCode(eventVO.getEventCode()); iXxlJobInfoService.deleteByInfosourceCode(eventVO.getEventCode());
//删除关键词 //删除关键词
keyWordsService.removeBaseAndMap(id); keyWordsService.removeBaseAndMap(id);
//删除流程绑定
clbModelArrangeSubjectMapService.remove(Wrappers.<ClbModelArrangeSubjectMap>lambdaQuery().eq(ClbModelArrangeSubjectMap::getSubjectId, id));
}); });
return Result.OK(); return Result.OK();
} }
......
package com.zzsn.event.entity; package com.zzsn.event.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.util.Date; import java.util.Date;
...@@ -53,6 +52,7 @@ public class ClbModelArrangeSubjectMap { ...@@ -53,6 +52,7 @@ public class ClbModelArrangeSubjectMap {
/** /**
* 删除标志 0-正常 1-删除 * 删除标志 0-正常 1-删除
*/ */
@TableLogic
@TableField("del_flag") @TableField("del_flag")
private Integer delFlag; private Integer delFlag;
...@@ -73,4 +73,7 @@ public class ClbModelArrangeSubjectMap { ...@@ -73,4 +73,7 @@ public class ClbModelArrangeSubjectMap {
*/ */
@TableField("update_time") @TableField("update_time")
private Date updateTime; private Date updateTime;
@Excel(name = "专题名称", width = 15)
@ApiModelProperty(value = "专题名称")
private String subjectName;
} }
...@@ -119,6 +119,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements ...@@ -119,6 +119,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
private EsOpUtil esOpUtil; private EsOpUtil esOpUtil;
@Autowired @Autowired
private IClbModelArrangeService clbModelArrangeService; private IClbModelArrangeService clbModelArrangeService;
@Autowired
private ClbModelArrangeSubjectMapService clbModelArrangeSubjectMapService;
@Value("${kafka.topic.event.run:}") @Value("${kafka.topic.event.run:}")
private String EVENT_MODEL_KAFKA_CHANNEL; private String EVENT_MODEL_KAFKA_CHANNEL;
...@@ -372,6 +374,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements ...@@ -372,6 +374,8 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
//插入专题-类别、项目的绑定关系 //插入专题-类别、项目的绑定关系
log.info("开始插入关系"); log.info("开始插入关系");
saveMapMain(event, addEventParam); saveMapMain(event, addEventParam);
log.info("开始绑定流程");
bindArrayModel(event);
//事件标签 //事件标签
log.info("开始插入事件标签"); log.info("开始插入事件标签");
eventTagService.save(EventTag.builder().eventId(eventId).build()); eventTagService.save(EventTag.builder().eventId(eventId).build());
...@@ -389,6 +393,18 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements ...@@ -389,6 +393,18 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
return event; return event;
} }
private void bindArrayModel(Event event) {
ClbModelArrangeSubjectMap m = new ClbModelArrangeSubjectMap();
m.setSubjectId(event.getId());
m.setType("baseDateToSubject");
m.setSubjectName(event.getEventName());
UserVo currentUser = UserUtil.getLoginUser();
m.setCreateBy(currentUser.getUsername());
m.setCreateTime(new Date());
m.setArrangeId("1945383263241506818");
clbModelArrangeSubjectMapService.save(m);
}
@Override @Override
@Transactional @Transactional
public void updateMain(AddEventParam addEventParam) { public void updateMain(AddEventParam addEventParam) {
...@@ -786,6 +802,14 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements ...@@ -786,6 +802,14 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
subjectTypeMap.setUpdateTime(subject.getUpdateTime()); subjectTypeMap.setUpdateTime(subject.getUpdateTime());
subjectTypeMap.setTypeId(addEventParam.getSubjectTypeId()); subjectTypeMap.setTypeId(addEventParam.getSubjectTypeId());
iSubjectTypeMapService.save(subjectTypeMap); iSubjectTypeMapService.save(subjectTypeMap);
}else {
log.info("事件专题类别id:{}-事件专题id:{}", addEventParam.getSubjectTypeId(),subject.getId());
SubjectTypeMap subjectTypeMap = new SubjectTypeMap();
subjectTypeMap.setSubjectId(subject.getId());
subjectTypeMap.setUpdateBy(subject.getUpdateBy());
subjectTypeMap.setUpdateTime(subject.getUpdateTime());
subjectTypeMap.setTypeId("1802619433932296193");
iSubjectTypeMapService.save(subjectTypeMap);
} }
if (StringUtils.isNotEmpty(addEventParam.getProjectId())) { if (StringUtils.isNotEmpty(addEventParam.getProjectId())) {
log.info("项目id:{}-事件专题id:{}", addEventParam.getProjectId(),subject.getId()); log.info("项目id:{}-事件专题id:{}", addEventParam.getProjectId(),subject.getId());
...@@ -793,6 +817,12 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements ...@@ -793,6 +817,12 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
projectSubjectMap.setProjectId(addEventParam.getProjectId()); projectSubjectMap.setProjectId(addEventParam.getProjectId());
projectSubjectMap.setSubjectId(subject.getId()); projectSubjectMap.setSubjectId(subject.getId());
iProjectSubjectMapService.save(projectSubjectMap); iProjectSubjectMapService.save(projectSubjectMap);
}else {
log.info("项目id:{}-事件专题id:{}", addEventParam.getProjectId(),subject.getId());
ProjectSubjectMap projectSubjectMap = new ProjectSubjectMap();
projectSubjectMap.setProjectId("1476527644425682945");
projectSubjectMap.setSubjectId(subject.getId());
iProjectSubjectMapService.save(projectSubjectMap);
} }
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论