Skip to content

E
event
提交 218cc475 作者: 925993793@qq.com
操作

自定义专题-部分逻辑调整以及研究中心补充接口

上级 9488bd24
正在显示 包含 236 行增加 和 133 行删除
src/main/java/com/zzsn/event/config/MybatisInterceptor.java
package com.zzsn.event.config;
import com.zzsn.event.util.user.AuthUtil;
import com.zzsn.event.util.user.UserVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.binding.MapperMethod.ParamMap;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.mapping.MappedStatement;
......@@ -35,41 +35,33 @@ public class MybatisInterceptor implements Interceptor {
if (parameter == null) {
return invocation.proceed();
}
String loginUsername = this.getLoginUsername();
Date date = new Date();
if (SqlCommandType.INSERT == sqlCommandType) {
UserVo sysUser = this.getLoginUser();
Field[] fields = getAllFields(parameter);
for (Field field : fields) {
log.debug("------field.name------" + field.getName());
try {
if ("createBy".equals(field.getName())) {
String fieldName = field.getName();
log.debug("------field.name------" + fieldName);
if ("createBy".equals(fieldName)) {
field.setAccessible(true);
Object localCreateBy = field.get(parameter);
field.setAccessible(false);
if (localCreateBy == null || localCreateBy.equals("") && (sysUser != null)) {
// 登录人账号
field.setAccessible(true);
field.set(parameter, sysUser.getUsername());
field.setAccessible(false);
if ((localCreateBy == null || localCreateBy.equals("")) && StringUtils.isNotBlank(loginUsername)) {
changeData(field, parameter, loginUsername);
}
}
// 注入创建时间
if ("createTime".equals(field.getName())) {
if ("createTime".equals(fieldName)) {
field.setAccessible(true);
Object localCreateDate = field.get(parameter);
field.setAccessible(false);
if (localCreateDate == null || localCreateDate.equals("")) {
field.setAccessible(true);
field.set(parameter, new Date());
field.setAccessible(false);
changeData(field, parameter, date);
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
if (SqlCommandType.UPDATE == sqlCommandType) {
UserVo sysUser = this.getLoginUser();
Field[] fields;
if (parameter instanceof ParamMap) {
ParamMap<?> p = (ParamMap<?>) parameter;
......@@ -86,20 +78,13 @@ public class MybatisInterceptor implements Interceptor {
fields = getAllFields(parameter);
}
for (Field field : fields) {
log.debug("------field.name------" + field.getName());
try {
if ("updateBy".equals(field.getName()) && (sysUser != null)) {
field.setAccessible(true);
field.set(parameter, sysUser.getUsername());
field.setAccessible(false);
String fieldName = field.getName();
log.debug("------field.name------" + fieldName);
if ("updateBy".equals(fieldName) && StringUtils.isNotBlank(loginUsername)) {
changeData(field, parameter, loginUsername);
}
if ("updateTime".equals(field.getName())) {
field.setAccessible(true);
field.set(parameter, new Date());
field.setAccessible(false);
}
} catch (Exception e) {
e.printStackTrace();
if ("updateTime".equals(fieldName)) {
changeData(field, parameter, date);
}
}
}
......@@ -115,8 +100,19 @@ public class MybatisInterceptor implements Interceptor {
public void setProperties(Properties properties) {
}
private UserVo getLoginUser() {
return AuthUtil.getLoginUser();
private String getLoginUsername() {
return AuthUtil.getLoginUser().getUsername();
}
//修改对应字段的值
private void changeData(Field field, Object parameter,Object data){
try {
field.setAccessible(true);
field.set(parameter,data);
field.setAccessible(false);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
private Field[] getAllFields(Object object) {
......
src/main/java/com/zzsn/event/controller/FileController.java
......@@ -522,7 +522,7 @@ public class FileController {
* @date 2024/4/11
*/
private Map<String, Object> formatDocData(List<SpecialInformation> exportDataList, String searchWord, Integer type) {
String docTitle = "事件资讯";
String docTitle = "专题资讯";
//遍历取到的文章
List<Map<String, Object>> contents = new ArrayList<>();
//文档结构图
......
src/main/java/com/zzsn/event/controller/PlatEventManageController.java
......@@ -81,7 +81,6 @@ public class PlatEventManageController {
KeywordsVO keywordsVO = eventParam.getKeywordsVO();
if (keywordsVO != null) {
UserVo currentUser = UserUtil.getLoginUser();
eventParam.setCreateTime(new Date());
eventParam.setCreateBy(currentUser.getUsername());
Event event = eventService.saveMain(eventParam);
//新增关键词
......
src/main/java/com/zzsn/event/controller/SubjectManageController.java
......@@ -81,6 +81,8 @@ public class SubjectManageController {
private SubjectSampleFileService subjectSampleFileService;
@Autowired
private SubjectInfoSourceMiddleMapService subjectInfoSourceMiddleMapService;
@Autowired
private SysDictItemService sysDictItemService;
@Value("${hotWords.extractUrl}")
......@@ -98,24 +100,48 @@ public class SubjectManageController {
return Result.OK(list);
}
/**
* 数据字典下字典值信息列表
*
* @param dictCode 字典编码
* @author lkg
* @date 2025/1/7
*/
@GetMapping("/dictItemList")
public Result<?> dictItemList(@RequestParam(defaultValue = "Thematic_Library")String dictCode){
List<SysDictItem> dictItemList = sysDictItemService.listByDictCode(dictCode);
return Result.OK(dictItemList);
}
/**
* 分页列表查询-研究中心
*
* @param subjectCondition 搜索条件
* @param pageNo 当前页
* @param pageSize 每页返回条数
* @author lkg
* @date 2025/1/7
*/
@GetMapping(("/pageList"))
public Result<?> researchCenterPageList(SubjectCondition subjectCondition,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Page<SubjectPage> pageList = subjectService.researchCenterPageList(subjectCondition, pageNo, pageSize);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param subjectCondition
* @param pageNo
* @param pageSize
* @param subjectCondition 搜索条件
* @param pageNo 当前页
* @param pageSize 每页返回条数
* @return
*/
@GetMapping(value = "/listByTypeId")
public Result<?> queryPageListByTypeId(SubjectCondition subjectCondition,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
Integer facePublic = subjectCondition.getFacePublic();
if (facePublic == null) {
UserVo loginUser = AuthUtil.getLoginUser();
subjectCondition.setUsername(loginUser.getUsername());
}
IPage<SubjectPage> pageList = subjectService.pageList(subjectCondition, pageNo, pageSize);
return Result.OK(pageList);
}
......@@ -599,29 +625,32 @@ public class SubjectManageController {
if (StringUtils.isNotEmpty(subjectId)) {
return Result.FAIL("专题id不能为空");
}
List<String> labelCodes = subjectSourceTagVO.getLabelCodes();
List<String> labelItemCodes = subjectSourceTagVO.getLabelItemCodes();
if (CollectionUtils.isEmpty(labelCodes) && CollectionUtils.isEmpty(labelItemCodes)) {
return Result.FAIL("参数不全");
List<InfoSourceLabelVO> labelList = subjectSourceTagVO.getLabelList();
if (CollectionUtils.isEmpty(labelList)) {
return Result.FAIL("信息源标签数据不能为空");
}
List<SubjectInfoSourceMap> dataList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(labelCodes)) {
for (String labelCode : labelCodes) {
for (InfoSourceLabelVO infoSourceLabelVO : labelList) {
List<InfoSourceLabelItemVO> infoSourceLabelItemList = infoSourceLabelVO.getInfoSourceLabelItemList();
if (CollectionUtils.isEmpty(infoSourceLabelItemList)) {
continue;
}
String labelCode = infoSourceLabelVO.getLabelCode();
for (InfoSourceLabelItemVO infoSourceLabelItemVO : infoSourceLabelItemList) {
String labelItemCode = infoSourceLabelItemVO.getLabelItemCode();
SubjectInfoSourceMap subjectInfoSourceMap = new SubjectInfoSourceMap();
subjectInfoSourceMap.setSubjectId(subjectId);
subjectInfoSourceMap.setSourceId(labelCode);
subjectInfoSourceMap.setType(6);
subjectInfoSourceMap.setSourceItemId(labelItemCode);
subjectInfoSourceMap.setType(12);
dataList.add(subjectInfoSourceMap);
}
}
if (CollectionUtils.isNotEmpty(labelItemCodes)) {
for (String labelItemCode : labelItemCodes) {
SubjectInfoSourceMap subjectInfoSourceMap = new SubjectInfoSourceMap();
subjectInfoSourceMap.setSubjectId(subjectId);
subjectInfoSourceMap.setSourceId(labelItemCode);
subjectInfoSourceMap.setType(7);
dataList.add(subjectInfoSourceMap);
}
LambdaQueryWrapper<SubjectInfoSourceMap> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(SubjectInfoSourceMap::getSubjectId, subjectId).eq(SubjectInfoSourceMap::getType, 12);
int count = subjectInfoSourceMapService.count(queryWrapper);
if (count > 0) {
subjectInfoSourceMapService.remove(queryWrapper);
}
subjectInfoSourceMapService.saveBatch(dataList);
return Result.OK();
......
src/main/java/com/zzsn/event/controller/common/StatisticalAnalysisController.java
......@@ -241,7 +241,7 @@ public class StatisticalAnalysisController {
*/
private void changeKey(List<CountVO> dataList, String dictCode) {
if (CollectionUtils.isNotEmpty(dataList)) {
List<SysDictItem> dictItemList = sysDictItemService.listByDictCode("");
List<SysDictItem> dictItemList = sysDictItemService.listByDictCode(dictCode);
Map<String, List<SysDictItem>> map = dictItemList.stream().collect(Collectors.groupingBy(SysDictItem::getItemValue));
for (CountVO countVO : dataList) {
List<SysDictItem> sysDictItemList = map.get(countVO.getName());
......
src/main/java/com/zzsn/event/controller/common/SubjectTypeController.java
......@@ -39,7 +39,6 @@ public class SubjectTypeController {
*/
@GetMapping("/treeList")
public Result<?> typeList(@RequestParam Integer category) {
//获取当前登录用户
List<Node> nodes = subjectTypeService.enableList(category);
List<Node> tree = TreeUtil.tree(nodes, "0");
return Result.OK(tree);
......@@ -97,15 +96,21 @@ public class SubjectTypeController {
}
/**
* 专题和分类树型结构
* 专题和分类树型结构-研究中心专题页左侧树
*
* @param facePublic 是否公开(1-是;0-否)
* @author lkg
* @date 2024/4/29
* @date 2025/1/7
*/
@GetMapping("/subjectAndTypeTree")
public Result<?> subjectAndTypeTree(@RequestParam(required = false) Integer facePublic) {
List<SubjectTreeVO> tree = subjectTypeService.subjectAndTypeTree(facePublic);
return Result.OK(tree);
List<SubjectTreeVO> dataList = null;
if (facePublic == null) {
dataList = subjectTypeService.subjectAndTypeTree();
} else if (facePublic == 1) {
dataList = subjectTypeService.subjectsByFacePublic(facePublic);
}
return Result.OK(dataList);
}
/**
......
src/main/java/com/zzsn/event/controller/thirdApi/EventApi.java
......@@ -191,7 +191,6 @@ public class EventApi {
event.setUnit("2");
event.setSpace(1);
event.setCron(CronUtil.generateCron("2",1));
event.setCreateTime(new Date());
event.setCreateBy(addEventVO.getUsername());
eventService.save(event);
String eventId = event.getId();
......@@ -212,7 +211,6 @@ public class EventApi {
//专题和分类关系
SubjectTypeMap subjectTypeMap = new SubjectTypeMap();
subjectTypeMap.setSubjectId(eventId);
subjectTypeMap.setCreateTime(new Date());
//分类默认 研究中心
subjectTypeMap.setTypeId("1802619433932296193");
subjectTypeMapService.save(subjectTypeMap);
......@@ -235,7 +233,6 @@ public class EventApi {
eventRegionMap.setRegionId(regionVO.getId());
eventRegionMap.setTopRegionId(regionVO.getTopId());
eventRegionMap.setType(regionVO.getType());
eventRegionMap.setCreateTime(new Date());
dataList.add(eventRegionMap);
}
eventRegionMapService.saveBatch(dataList);
......
src/main/java/com/zzsn/event/controller/yjzx/EventManageController.java
......@@ -137,7 +137,6 @@ public class EventManageController {
KeywordsVO keywordsVO = eventParam.getKeywordsVO();
if (keywordsVO != null) {
UserVo currentUser = UserUtil.getLoginUser();
eventParam.setCreateTime(new Date());
eventParam.setCreateBy(currentUser.getUsername());
Event event = eventService.saveMain(eventParam);
//新增关键词
......
src/main/java/com/zzsn/event/entity/SubjectInfoSourceMap.java
......@@ -29,8 +29,10 @@ public class SubjectInfoSourceMap implements Serializable {
private String id;
/**专题id*/
private String subjectId;
/**信息源id或信息源组id*/
/**关联id*/
private String sourceId;
/**标签值编码(专题绑定信息源标签时特有的字段)*/
private String sourceItemId;
/**种类（1：信息源id 2：信息源组id）*/
private Integer type;
/**信息源组权重*/
......
src/main/java/com/zzsn/event/mapper/SubjectMapper.java
......@@ -28,6 +28,16 @@ public interface SubjectMapper extends BaseMapper<Subject> {
Page<SubjectPage> pageList(@Param("subjectCondition") SubjectCondition subjectCondition, Page<SubjectPage> page);
/**
* 专题分页列表-研究中心
*
* @param subjectCondition 查询条件
* @param page 分页参数
* @author lkg
* @date 2024/12/18
*/
Page<SubjectPage> researchCenterPageList(@Param("subjectCondition") SubjectCondition subjectCondition, Page<SubjectPage> page);
/**
* 专题详情
*
* @param subjectId 专题id
......
src/main/java/com/zzsn/event/mapper/SubjectTypeMapper.java
......@@ -23,10 +23,11 @@ public interface SubjectTypeMapper extends BaseMapper<SubjectType> {
* 可用的专题分类列表
*
* @param category 类别(1-专题;2-事件)
* @param createBy 创建人
* @author lkg
* @date 2024/4/29
*/
List<Node> enableList(@Param("category") Integer category);
List<Node> enableList(@Param("category") Integer category,@Param("username") String createBy);
/**
* 更新分类是否有子节点状态
......@@ -39,12 +40,21 @@ public interface SubjectTypeMapper extends BaseMapper<SubjectType> {
void updateTreeNodeStatus(@Param("id") String id, @Param("hasChild") String hasChild);
/**
* 根据是否公开获取专题列表
*
* @param facePublic 是否公开(1-是;0-否)
* @author lkg
* @date 2025/1/7
*/
List<SubjectTreeVO> subjectsByFacePublic(@Param("facePublic") Integer facePublic);
/**
* 可用的事件和分类列表
*
* @author lkg
* @date 2024/4/29
*/
List<SubjectTreeVO> subjectAndTypeTree(@Param("facePublic") Integer facePublic,@Param("username") String createBy);
List<SubjectTreeVO> subjectAndTypeTree(@Param("username") String createBy);
/**
* 可用的事件和分类列表
*
......
src/main/java/com/zzsn/event/mapper/xml/SubjectMapper.xml
......@@ -73,4 +73,38 @@
and n.subject_id = #{subjectId}
and m.source_id = #{sourceId}
</select>
<select id="researchCenterPageList" resultType="com.zzsn.event.vo.SubjectPage">
SELECT d.id,
d.subject_name,
d.remark,
d.create_time,
d.status c.type_name as subjectTypeName,
from subject d
LEFT JOIN subject_type_map b ON b.subject_id = d.id
LEFT JOIN subject_type c ON b.type_id = c.id
where 1 = 1
<if test="subjectCondition.typeIds!=null and subjectCondition.typeIds.size()>0">
and b.type_id in
<foreach collection="subjectCondition.typeIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="subjectCondition.id !=null and subjectCondition.id !=''">
and d.id =#{subjectCondition.id}
</if>
<if test="subjectCondition.subjectName!=null and subjectCondition.subjectName != ''">
and d.subject_name like CONCAT('%',#{subjectCondition.subjectName},'%')
</if>
<if test="subjectCondition.startTime != null and subjectCondition.startTime != ''">
and d.create_time >= #{subjectCondition.startTime}
</if>
<if test="subjectCondition.endTime != null and subjectCondition.endTime != ''">
and d.create_time <![CDATA[ <= ]]> #{subjectCondition.endTime}
</if>
<if test="subjectCondition.status!=null">
and d.status = #{subjectCondition.status}
</if>
order by d.create_time desc
</select>
</mapper>
src/main/java/com/zzsn/event/mapper/xml/SubjectTypeMapper.xml
......@@ -7,6 +7,9 @@
from subject_type s
where s.category = #{category}
and s.status = 1
<if test="username!=null and username != ''">
and s.create_by = #{username}
</if>
</select>
<update id="updateTreeNodeStatus" parameterType="java.lang.String">
......@@ -15,6 +18,18 @@
where id = #{id}
</update>
<select id="subjectsByFacePublic" resultType="com.zzsn.event.vo.SubjectTreeVO">
select s.id,
s.subject_name as name,
'true' as ynSubject,
s.time_enable as start_time,
s.time_disable as end_time
from subject s
where s.face_public = #{facePublic}
order by create_time
</select>
<select id="subjectAndTypeTree" resultType="com.zzsn.event.vo.SubjectTreeVO">
select x.*
from (
......@@ -52,9 +67,6 @@
s.create_time
from subject s
where 1 = 1
<if test="facePublic!=null">
and s.face_public = #{facePublic}
</if>
<if test="username!=null and username != ''">
and s.create_by = #{username}
</if>
......
src/main/java/com/zzsn/event/service/EventSimpleService.java
......@@ -73,7 +73,6 @@ public class EventSimpleService {
event.setUnit("2");
event.setSpace(1);
event.setCron(CronUtil.generateCron("2",1));
event.setCreateTime(new Date());
UserVo currentUser = UserUtil.getLoginUser();
event.setCreateBy(currentUser.getUsername());
eventService.save(event);
......@@ -107,7 +106,6 @@ public class EventSimpleService {
//专题和分类关系
SubjectTypeMap subjectTypeMap = new SubjectTypeMap();
subjectTypeMap.setSubjectId(eventId);
subjectTypeMap.setCreateTime(new Date());
//分类默认 研究中心
subjectTypeMap.setTypeId("1802619433932296193");
subjectTypeMapService.save(subjectTypeMap);
......@@ -130,7 +128,6 @@ public class EventSimpleService {
eventRegionMap.setRegionId(regionVO.getId());
eventRegionMap.setTopRegionId(regionVO.getTopId());
eventRegionMap.setType(regionVO.getType());
eventRegionMap.setCreateTime(new Date());
dataList.add(eventRegionMap);
}
eventRegionMapService.saveBatch(dataList);
......
src/main/java/com/zzsn/event/service/ISubjectTypeService.java
......@@ -63,13 +63,31 @@ public interface ISubjectTypeService extends IService<SubjectType> {
void delete(String typeId);
/**
* 专题和分类列表
* 根据是否公开获取专题列表-研究中心
*
* @param facePublic 是否公开(1-是;0-否)
* @author lkg
* @date 2025/1/7
*/
List<SubjectTreeVO> subjectsByFacePublic(Integer facePublic);
/**
* 专题和分类列表-研究中心
*
* @param facePublic 是否公开(0-未公开;1-已公开)
* @author lkg
* @date 2024/12/26
*/
List<SubjectTreeVO> subjectAndTypeTree(Integer facePublic);
List<SubjectTreeVO> subjectAndTypeTree();
/**
* 获取分类下的所有节点id集合-研究中心
*
* @param typeId 分类id
* @param category 类别(1-专题;2-事件)
* @author lkg
* @date 2024/4/29
*/
List<String> researchCenterBelowIdList(String typeId,Integer category);
List<SubjectTypeVo> subjectListByType(String parentId);
......
src/main/java/com/zzsn/event/service/SubjectService.java
......@@ -28,6 +28,17 @@ public interface SubjectService extends IService<Subject> {
Page<SubjectPage> pageList(SubjectCondition subjectCondition, Integer pageNo, Integer pageSize);
/**
* 分页列表-研究中心
*
* @param subjectCondition 查询条件
* @param pageNo 当前页
* @param pageSize 每页返回条数
* @author lkg
* @date 2024/12/18
*/
Page<SubjectPage> researchCenterPageList(SubjectCondition subjectCondition, Integer pageNo, Integer pageSize);
/**
* 新增专题
*
* @param subjectPage 参数
......
src/main/java/com/zzsn/event/service/impl/EventAnalysisReportServiceImpl.java
......@@ -40,7 +40,6 @@ public class EventAnalysisReportServiceImpl extends ServiceImpl<EventAnalysisRep
EventAnalysisReport report = new EventAnalysisReport();
report.setEventId(eventId);
report.setFilePath(filePath);
report.setCreateTime(new Date());
InputStream inputStream = obsUtil.getObjectStream(filePath);
String content = DocUtil.convertDocStream2Html(inputStream);
report.setContent(content);
......
src/main/java/com/zzsn/event/service/impl/EventServiceImpl.java
......@@ -420,7 +420,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
eventRegionMap.setRegionId(regionVO.getId());
eventRegionMap.setTopRegionId(regionVO.getTopId());
eventRegionMap.setType(regionVO.getType());
eventRegionMap.setCreateTime(new Date());
dataList.add(eventRegionMap);
}
eventRegionMapService.saveBatch(dataList);
......@@ -431,8 +430,6 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
if (StringUtils.isNotEmpty(addEventParam.getSubjectTypeId())) {
SubjectTypeMap subjectTypeMap = new SubjectTypeMap();
subjectTypeMap.setSubjectId(subject.getId());
subjectTypeMap.setCreateBy(subject.getCreateBy());
subjectTypeMap.setCreateTime(subject.getCreateTime());
subjectTypeMap.setUpdateBy(subject.getUpdateBy());
subjectTypeMap.setUpdateTime(subject.getUpdateTime());
subjectTypeMap.setTypeId(addEventParam.getSubjectTypeId());
......
src/main/java/com/zzsn/event/service/impl/InformationServiceImpl.java
......@@ -336,8 +336,6 @@ public class InformationServiceImpl implements InformationService {
attachmentInfo.setItemId(specialInformation.getId());
attachmentInfo.setStatus(1);
attachmentInfo.setOrderBy(0);
attachmentInfo.setCreateBy(operateUser);
attachmentInfo.setCreateTime(new Date());
attachmentInfo.setSource("");
attachmentInfo.setYear(cn.hutool.core.date.DateUtil.thisYear());
clbSysAttachmentService.save(attachmentInfo);
......@@ -563,7 +561,6 @@ public class InformationServiceImpl implements InformationService {
String type = collectionInfo.getType();
if ("1".equals(type)) {
collectionMap.setEsIndex(collectionInfo.getIndex());
collectionMap.setCreateTime(new Date());
collectionMapService.save(collectionMap);
} else {
QueryWrapper<CollectionMap> query = Wrappers.query();
......
src/main/java/com/zzsn/event/service/impl/KeyWordsServiceImpl.java
......@@ -217,7 +217,6 @@ public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> i
keyWords.setKeyWord(keyword);
keyWords.setExclusionWord(exclusionWord);
keyWords.setStatus("1");
keyWords.setCreateTime(new Date());
this.save(keyWords);
String keyWordsId = keyWords.getId();
//关键词和分类关系
......@@ -225,7 +224,6 @@ public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> i
keywordsTypeMap.setKeywordsId(keyWordsId);
//分类默认 事件专题
keywordsTypeMap.setTypeId("1802634369064525826");
keywordsTypeMap.setCreateTime(new Date());
keywordsTypeMapService.save(keywordsTypeMap);
//专题和关键词关系
SubjectKeywordsMap subjectKeywordsMap = new SubjectKeywordsMap();
......@@ -267,8 +265,6 @@ public class KeyWordsServiceImpl extends ServiceImpl<KeyWordsMapper, KeyWords> i
KeywordsTypeMap keywordsTypeMap = new KeywordsTypeMap();
keywordsTypeMap.setKeywordsId(keyWords.getId());
keywordsTypeMap.setTypeId(keyWordsTypeId);
keywordsTypeMap.setCreateBy(keyWords.getCreateBy());
keywordsTypeMap.setCreateTime(keyWords.getCreateTime());
keywordsTypeMap.setUpdateBy(keyWords.getUpdateBy());
keywordsTypeMap.setUpdateTime(keyWords.getUpdateTime());
keywordsTypeMap.setSysOrgCode(keyWords.getSysOrgCode());
......
src/main/java/com/zzsn/event/service/impl/SubjectServiceImpl.java
......@@ -140,6 +140,19 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
}
@Override
public Page<SubjectPage> researchCenterPageList(SubjectCondition subjectCondition, Integer pageNo, Integer pageSize) {
//查询类别id的所有明细id
List<String> typeIds = new ArrayList<>();
String subjectTypeId = subjectCondition.getSubjectTypeId();
if (StringUtils.isNotEmpty(subjectTypeId) && !"0".equals(subjectTypeId)) {
typeIds = subjectTypeService.researchCenterBelowIdList(subjectTypeId, 1);
}
subjectCondition.setTypeIds(typeIds);
Page<SubjectPage> page = new Page<>(pageNo, pageSize);
return baseMapper.researchCenterPageList(subjectCondition, page);
}
@Override
@Transactional
public Subject saveMain(SubjectPage subjectPage) {
Subject subject = new Subject();
......@@ -157,7 +170,7 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
baseMapper.insert(subject);
//插入专题-类别、项目的绑定关系
saveMapMain(subject, subjectPage);
return null;
return subject;
}
@Override
......@@ -604,10 +617,6 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
if (StringUtils.isNotEmpty(subjectPage.getSubjectTypeId())) {
SubjectTypeMap subjectTypeMap = new SubjectTypeMap();
subjectTypeMap.setSubjectId(subject.getId());
subjectTypeMap.setCreateBy(subject.getCreateBy());
subjectTypeMap.setCreateTime(subject.getCreateTime());
subjectTypeMap.setUpdateBy(subject.getUpdateBy());
subjectTypeMap.setUpdateTime(subject.getUpdateTime());
subjectTypeMap.setSysOrgCode(subject.getSysOrgCode());
subjectTypeMap.setTypeId(subjectPage.getSubjectTypeId());
subjectTypeMapService.save(subjectTypeMap);
......
src/main/java/com/zzsn/event/service/impl/SubjectTypeServiceImpl.java
......@@ -34,7 +34,7 @@ public class SubjectTypeServiceImpl extends ServiceImpl<SubjectTypeMapper, Subje
@Override
public List<Node> enableList(Integer category) {
return baseMapper.enableList(category);
return baseMapper.enableList(category,null);
}
@Override
......@@ -55,7 +55,6 @@ public class SubjectTypeServiceImpl extends ServiceImpl<SubjectTypeMapper, Subje
baseMapper.updateById(parent);
}
}
subjectType.setCreateTime(new Date());
baseMapper.insert(subjectType);
}
......@@ -91,28 +90,34 @@ public class SubjectTypeServiceImpl extends ServiceImpl<SubjectTypeMapper, Subje
}
@Override
public List<SubjectTreeVO> subjectAndTypeTree(Integer facePublic) {
String username = null;
if (facePublic == null) {
username = AuthUtil.getLoginUser().getUsername();
public List<SubjectTreeVO> subjectsByFacePublic(Integer facePublic) {
return baseMapper.subjectsByFacePublic(facePublic);
}
@Override
public List<SubjectTreeVO> subjectAndTypeTree() {
String username = AuthUtil.getLoginUser().getUsername();
List<SubjectTreeVO> tree = new ArrayList<>();
List<SubjectTreeVO> subjectTreeVOS = baseMapper.subjectAndTypeTree(facePublic,username);
List<SubjectTreeVO> subjectTreeVOS = baseMapper.subjectAndTypeTree(username);
if (CollectionUtils.isNotEmpty(subjectTreeVOS)) {
tree = TreeUtil.tree(subjectTreeVOS, "0");
tree.forEach(this::subjectNumCount);
tree.sort(Comparator.comparing(SubjectTreeVO::getCreateTime));
}
return tree;
}
@Override
public List<String> researchCenterBelowIdList(String typeId, Integer category) {
String username = AuthUtil.getLoginUser().getUsername();
List<Node> nodes = baseMapper.enableList(category,username);
return TreeUtil.belowList(nodes, typeId, true);
}
@Override
public List<SubjectTreeVO> eventAndTypeTree() {
List<SubjectTreeVO> tree = new ArrayList<>();
List<SubjectTreeVO> subjectTreeVOS = baseMapper.eventAndTypeTree();
if (CollectionUtils.isNotEmpty(subjectTreeVOS)) {
tree = TreeUtil.tree(subjectTreeVOS, "0");
tree.forEach(this::subjectNumCount);
tree.sort(Comparator.comparing(SubjectTreeVO::getCreateTime));
}
return tree;
}
......@@ -265,22 +270,6 @@ public class SubjectTypeServiceImpl extends ServiceImpl<SubjectTypeMapper, Subje
getFinalIdListInMap(nextGradeNotFinalList, pidMap, finalAllList);
}
private void subjectNumCount(SubjectTreeVO subjectTreeVO) {
Boolean ynSubject = subjectTreeVO.getYnSubject();
if (!ynSubject) {
int num = 0;
List<? extends Node> children = subjectTreeVO.getChildren();
if (CollectionUtils.isNotEmpty(children)) {
for (Node node : children) {
SubjectTreeVO subjectTreeNode = (SubjectTreeVO)node;
subjectNumCount(subjectTreeNode);
num = num + 1;
}
subjectTreeVO.setSubjectCount(num);
}
}
}
private void updateOldParentNode(String pid) {
if (!"0".equals(pid)) {
Integer count = baseMapper.selectCount(new QueryWrapper<SubjectType>().eq("pid", pid));
......
src/main/java/com/zzsn/event/util/user/AuthUtil.java
package com.zzsn.event.util.user;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson2.JSON;
import lombok.Data;
import org.springframework.web.context.request.RequestContextHolder;
......@@ -17,14 +18,14 @@ import javax.servlet.http.HttpServletRequest;
public class AuthUtil {
public static UserVo getLoginUser() {
UserVo userVo = new UserVo();
try {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String userInfo = request.getHeader("loginUser");
return JSON.parseObject(userInfo, UserVo.class);
userVo = JSON.parseObject(userInfo, UserVo.class);
}catch (Exception e){
return null;
return userVo;
}
return userVo;
}
}
src/main/java/com/zzsn/event/vo/SubjectSourceTagVO.java
......@@ -15,8 +15,6 @@ public class SubjectSourceTagVO {
/**专题id*/
private String subjectId;
/**标签编码集合*/
private List<String> labelCodes;
/**标签值编码集合*/
private List<String> labelItemCodes;
/**标签集合*/
private List<InfoSourceLabelVO> labelList;
}
src/main/java/com/zzsn/event/vo/SubjectTreeVO.java
......@@ -17,8 +17,6 @@ public class SubjectTreeVO extends Node {
private Boolean ynSubject;
private Integer subjectCount=0;
private String startTime;
private String endTime;
private String createTime;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论