Skip to content

S
site-project
Commit 975aecc7 by 梅存智
Options

管理端的需求优化

parent d60c6f81
Showing with 207 additions and 34 deletions
cloud-site-api/src/main/java/com/yizhi/site/application/vo/domain/InformationClassify.java 0 → 100644
package com.yizhi.site.application.vo.domain;
import java.io.Serializable;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ApiModel(value = "InformationClassify", description = "资讯分类")
@Data
@TableName("information_classify")
public class InformationClassify extends Model<InformationClassify> {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主鍵")
private Long id;
@ApiModelProperty(value = "资讯ID")
@TableField("information_id")
private Long informationId;
@ApiModelProperty(value = "文章父类型")
@TableField("type_one")
private Long typeOne;
@ApiModelProperty(value = "文章子类型（二级）")
@TableField("type_two")
private Long typeTwo;
@ApiModelProperty(value = "文章子类型（三级）")
@TableField("type_three")
private Long typeThree;
@Override
protected Serializable pkVal() {
return this.id;
}
}
\ No newline at end of file
cloud-site-api/src/main/java/com/yizhi/site/application/vo/domain/InformationVo.java
...@@ -7,6 +7,7 @@ import lombok.Data; ...@@ -7,6 +7,7 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* <p> * <p>
...@@ -96,6 +97,8 @@ public class InformationVo{ ...@@ -96,6 +97,8 @@ public class InformationVo{
@ApiModelProperty(value = "文章第三层类型") @ApiModelProperty(value = "文章第三层类型")
private Long typeThree; private Long typeThree;
@ApiModelProperty(value = "资讯分类")
private List<InformationClassify> informationClassify;
protected Serializable pkVal() { protected Serializable pkVal() {
return this.id; return this.id;
......
cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/BannerImageListVO.java
...@@ -49,4 +49,9 @@ public class BannerImageListVO { ...@@ -49,4 +49,9 @@ public class BannerImageListVO {
@ApiModelProperty(value = "用户名称") @ApiModelProperty(value = "用户名称")
private String accountName; private String accountName;
@ApiModelProperty(value = "副标题")
private String imgTitleSub;
@ApiModelProperty(value = "图片来源")
private String imgSource;
} }
cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/PortalBannerVo.java
...@@ -47,4 +47,9 @@ public class PortalBannerVo extends KindAndTypeVO { ...@@ -47,4 +47,9 @@ public class PortalBannerVo extends KindAndTypeVO {
@ApiModelProperty(value = "上架时间") @ApiModelProperty(value = "上架时间")
private Date addTime; private Date addTime;
@ApiModelProperty(value = "副标题")
private String imgTitleSub;
@ApiModelProperty(value = "图片来源")
private String imgSource;
} }
cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/PreviewImageVO.java
...@@ -49,4 +49,10 @@ public class PreviewImageVO extends KindAndTypeVO { ...@@ -49,4 +49,10 @@ public class PreviewImageVO extends KindAndTypeVO {
@ApiModelProperty(value = "轮播图Id") @ApiModelProperty(value = "轮播图Id")
private Long portImageId; private Long portImageId;
@ApiModelProperty(value = "副标题")
private String imgTitleSub;
@ApiModelProperty(value = "图片来源")
private String imgSource;
} }
cloud-site-service/src/main/java/com/yizhi/site/application/controller/BannerManageController.java
...@@ -95,6 +95,8 @@ public class BannerManageController { ...@@ -95,6 +95,8 @@ public class BannerManageController {
portalImage.setHomeType(vo.getHomeType()); portalImage.setHomeType(vo.getHomeType());
portalImage.setLinkUrl(vo.getLinkUrl()); portalImage.setLinkUrl(vo.getLinkUrl());
portalImage.setAddTime(vo.getAddTime()); portalImage.setAddTime(vo.getAddTime());
portalImage.setImgTitleSub(vo.getImgTitleSub());
portalImage.setImgSource(vo.getImgSource());
portalImage.setUpdateById(vo.getAccountId()); portalImage.setUpdateById(vo.getAccountId());
portalImage.setUpdateByName(vo.getAccountName()); portalImage.setUpdateByName(vo.getAccountName());
portalImage.setUpdateTime(new Date()); portalImage.setUpdateTime(new Date());
...@@ -111,22 +113,28 @@ public class BannerManageController { ...@@ -111,22 +113,28 @@ public class BannerManageController {
Calendar nowDate = Calendar.getInstance(); Calendar nowDate = Calendar.getInstance();
nowDate.setTime(new Date()); nowDate.setTime(new Date());
//输入新闻的发布时间 //输入新闻的发布时间
Calendar releaseTime = Calendar.getInstance(); if(vo.getAddTime() != null){
releaseTime.setTime(vo.getAddTime()); Calendar releaseTime = Calendar.getInstance();
if (releaseTime.after(nowDate)){ releaseTime.setTime(vo.getAddTime());
portalImage.setState(SiteConstant.TWO); if (releaseTime.after(nowDate)){
portalImageService.updateById(portalImage); portalImage.setState(SiteConstant.TWO);
try { portalImageService.updateById(portalImage);
// 新增job try {
portalBannerService.timeUpBanner(vo.getId()); // 新增job
} catch (Exception e) { portalBannerService.timeUpBanner(vo.getId());
e.printStackTrace(); } catch (Exception e) {
e.printStackTrace();
}
} else {
portalImage.setState(SiteConstant.FIRST);
portalImageService.updateById(portalImage);
} }
} else { } else {
portalImage.setState(SiteConstant.FIRST); portalImage.setState(SiteConstant.FIRST);
portalImageService.updateById(portalImage); portalImageService.updateById(portalImage);
} }
return vo.getId(); return vo.getId();
} }
......
cloud-site-service/src/main/java/com/yizhi/site/application/controller/api/PortalBlockController.java
...@@ -35,9 +35,9 @@ public class PortalBlockController { ...@@ -35,9 +35,9 @@ public class PortalBlockController {
public static final List<BottomMenuVO> defaultBottomMenu = Arrays.asList( public static final List<BottomMenuVO> defaultBottomMenu = Arrays.asList(
new BottomMenuVO(1L,"首页",true), new BottomMenuVO(1L,"首页",true),
new BottomMenuVO(2L,"活动",true), new BottomMenuVO(2L,"活动",true),
new BottomMenuVO(3L,"课程",true), /*new BottomMenuVO(3L,"课程",true),
new BottomMenuVO(4L,"营销",true), new BottomMenuVO(4L,"营销",true),
new BottomMenuVO(6L,"社群",false), new BottomMenuVO(6L,"社群",false),*/
new BottomMenuVO(5L,"我的",true)); new BottomMenuVO(5L,"我的",true));
public static List<BottomMenuVO> copyList(List<BottomMenuVO> src){ public static List<BottomMenuVO> copyList(List<BottomMenuVO> src){
......
cloud-site-service/src/main/java/com/yizhi/site/application/domain/Information.java
...@@ -3,12 +3,15 @@ package com.yizhi.site.application.domain; ...@@ -3,12 +3,15 @@ package com.yizhi.site.application.domain;
import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.yizhi.site.application.vo.domain.InformationClassify;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* <p> * <p>
...@@ -118,6 +121,10 @@ public class Information extends Model<Information> { ...@@ -118,6 +121,10 @@ public class Information extends Model<Information> {
@TableField("type_three") @TableField("type_three")
private Long typeThree; private Long typeThree;
@ApiModelProperty(value = "资讯分类")
@TableField(exist = false)
private List<InformationClassify> informationClassify;
@Override @Override
protected Serializable pkVal() { protected Serializable pkVal() {
return this.id; return this.id;
......
cloud-site-service/src/main/java/com/yizhi/site/application/domain/PortalImage.java
...@@ -83,6 +83,14 @@ public class PortalImage extends Model<PortalImage> { ...@@ -83,6 +83,14 @@ public class PortalImage extends Model<PortalImage> {
@ApiModelProperty(value = "修改人姓名") @ApiModelProperty(value = "修改人姓名")
@TableField("update_by_name") @TableField("update_by_name")
private String updateByName; private String updateByName;
@ApiModelProperty(value = "副标题")
@TableField("img_title_sub")
private String imgTitleSub;
@ApiModelProperty(value = "图片来源")
@TableField("img_source")
private String imgSource;
@Override @Override
protected Serializable pkVal() { protected Serializable pkVal() {
......
cloud-site-service/src/main/java/com/yizhi/site/application/mapper/InformationClassifyMapper.java 0 → 100644
package com.yizhi.site.application.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.yizhi.site.application.vo.domain.InformationClassify;
/**
* <p>
* Mapper 接口
* </p>
*
* @author bob123
* @since 2018-03-27
*/
public interface InformationClassifyMapper extends BaseMapper<InformationClassify> {
}
\ No newline at end of file
cloud-site-service/src/main/java/com/yizhi/site/application/service/InformationClassifyService.java 0 → 100644
package com.yizhi.site.application.service;
import com.baomidou.mybatisplus.service.IService;
import com.yizhi.site.application.vo.domain.InformationClassify;
/**
* <p>
* 服务类
* </p>
*
* @author bob123
* @since 2018-03-27
*/
public interface InformationClassifyService extends IService<InformationClassify> {
}
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/DataClassificationServiceImpl.java
...@@ -76,6 +76,7 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio ...@@ -76,6 +76,7 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio
// 防止并发添加数据 // 防止并发添加数据
List<ClassificationVO> list = dataClassificationMapper.selectSonClassification(siteId); List<ClassificationVO> list = dataClassificationMapper.selectSonClassification(siteId);
if (list == null || list.size() < 1) { if (list == null || list.size() < 1) {
/*//没有初始化的数据，2024-12-16注释
synchronized (this) { synchronized (this) {
DataClassification dataClassification = new DataClassification(); DataClassification dataClassification = new DataClassification();
...@@ -116,7 +117,7 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio ...@@ -116,7 +117,7 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio
BeanUtils.copyProperties(dataClassification, classificationVO); BeanUtils.copyProperties(dataClassification, classificationVO);
list.add(classificationVO); list.add(classificationVO);
} }*/
} else { } else {
Map<String, Object> map = null; Map<String, Object> map = null;
for(ClassificationVO vo : list){ for(ClassificationVO vo : list){
...@@ -128,19 +129,23 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio ...@@ -128,19 +129,23 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio
if (CollectionUtil.isNotEmpty(selectByMap)) { if (CollectionUtil.isNotEmpty(selectByMap)) {
for (DataClassification d : selectByMap) { for (DataClassification d : selectByMap) {
DataClassificationVo entityVo = new DataClassificationVo(); DataClassificationVo entityVo = new DataClassificationVo();
wrapper.eq("parent_id", entityVo.getId());
List<DataClassification> selectChildByMap = dataClassificationService.selectList(wrapper);
if(CollectionUtil.isNotEmpty(selectChildByMap)){
List<DataClassificationVo> selectChildVoByMap=new ArrayList<>();
for (DataClassification s : selectChildByMap) {
DataClassificationVo entityChildVo = new DataClassificationVo();
BeanUtils.copyProperties(s, entityChildVo);
selectChildVoByMap.add(entityVo);
}
entityVo.setChildClassifyNews(selectChildVoByMap);
}
BeanUtils.copyProperties(d, entityVo); BeanUtils.copyProperties(d, entityVo);
selectVoByMap.add(entityVo); selectVoByMap.add(entityVo);
//获取子节点
EntityWrapper<DataClassification> wrapperChild = new EntityWrapper<>();
wrapperChild.eq("state", 1);
wrapperChild.eq("parent_id", entityVo.getId());
List<DataClassification> classificationChild = dataClassificationService.selectList(wrapperChild);
List<DataClassificationVo> childClassifyNews = new ArrayList<>();
if (CollectionUtil.isNotEmpty(classificationChild)) {
for (DataClassification child : classificationChild) {
DataClassificationVo entityChild = new DataClassificationVo();
BeanUtils.copyProperties(child, entityChild);
childClassifyNews.add(entityChild);
}
entityVo.setChildClassifyNews(childClassifyNews);;
}
} }
} }
vo.setData(selectVoByMap); vo.setData(selectVoByMap);
......
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/InformationClassifyServiceImpl.java 0 → 100644
package com.yizhi.site.application.service.impl;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.yizhi.site.application.mapper.InformationClassifyMapper;
import com.yizhi.site.application.service.InformationClassifyService;
import com.yizhi.site.application.vo.domain.InformationClassify;
import lombok.extern.log4j.Log4j2;
/**
* <p>
* 服务实现类
* </p>
*
* @author bob123
* @since 2018-03-27
*/
@Log4j2
@Service
public class InformationClassifyServiceImpl extends ServiceImpl<InformationClassifyMapper, InformationClassify> implements InformationClassifyService {
}
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/InformationServiceImpl.java
...@@ -9,6 +9,7 @@ import com.yizhi.site.application.domain.Information; ...@@ -9,6 +9,7 @@ import com.yizhi.site.application.domain.Information;
import com.yizhi.site.application.domain.ProtalPlate; import com.yizhi.site.application.domain.ProtalPlate;
//import com.yizhi.application.job.remote.JobClient; //import com.yizhi.application.job.remote.JobClient;
import com.yizhi.site.application.mapper.HomeAnnouncementMapper; import com.yizhi.site.application.mapper.HomeAnnouncementMapper;
import com.yizhi.site.application.mapper.InformationClassifyMapper;
import com.yizhi.site.application.mapper.InformationMapper; import com.yizhi.site.application.mapper.InformationMapper;
import com.yizhi.site.application.mapper.PortalTerminalMapper; import com.yizhi.site.application.mapper.PortalTerminalMapper;
import com.yizhi.site.application.constant.SiteConstant; import com.yizhi.site.application.constant.SiteConstant;
...@@ -18,6 +19,7 @@ import com.yizhi.core.application.event.EventWrapper; ...@@ -18,6 +19,7 @@ import com.yizhi.core.application.event.EventWrapper;
import com.yizhi.core.application.publish.CloudEventPublisher; import com.yizhi.core.application.publish.CloudEventPublisher;
import com.yizhi.site.application.service.*; import com.yizhi.site.application.service.*;
import com.yizhi.site.application.vo.domain.DataClassificationVo; import com.yizhi.site.application.vo.domain.DataClassificationVo;
import com.yizhi.site.application.vo.domain.InformationClassify;
import com.yizhi.site.application.vo.site.*; import com.yizhi.site.application.vo.site.*;
import com.yizhi.core.application.context.ContextHolder; import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.core.application.context.RequestContext; import com.yizhi.core.application.context.RequestContext;
...@@ -77,6 +79,10 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor ...@@ -77,6 +79,10 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
private PdfPagesClient pdfPagesClient; private PdfPagesClient pdfPagesClient;
@Autowired @Autowired
private ITrInformationReadNumberService informationReadNumberService; private ITrInformationReadNumberService informationReadNumberService;
@Autowired
private InformationClassifyMapper informationClassifyMapper;
// @Autowired // @Autowired
// JobClient jobClient; // JobClient jobClient;
...@@ -998,6 +1004,14 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor ...@@ -998,6 +1004,14 @@ public class InformationServiceImpl extends ServiceImpl<InformationMapper, Infor
if (info.getTypeTwo() != null || info.getTypeTwo() != 0) { if (info.getTypeTwo() != null || info.getTypeTwo() != 0) {
info.setTypeTwoName(findNameById(info.getTypeTwo())); info.setTypeTwoName(findNameById(info.getTypeTwo()));
} }
//设置资讯分类
InformationClassify classify = new InformationClassify();
classify.setInformationId(id);
EntityWrapper<InformationClassify> wrapper = new EntityWrapper<InformationClassify>(classify);
List<InformationClassify> informationClassify = informationClassifyMapper.selectList(wrapper);
info.setInformationClassify(informationClassify);
return info; return info;
} }
......
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/PortalBannerServiceImpl.java
...@@ -380,6 +380,8 @@ public class PortalBannerServiceImpl extends ServiceImpl<PortalBannerMapper, Por ...@@ -380,6 +380,8 @@ public class PortalBannerServiceImpl extends ServiceImpl<PortalBannerMapper, Por
pi.setBannerPath(vo.getBannerPath()); pi.setBannerPath(vo.getBannerPath());
pi.setLinkUrl(vo.getLinkUrl()); pi.setLinkUrl(vo.getLinkUrl());
pi.setHomeType(vo.getHomeType()); pi.setHomeType(vo.getHomeType());
pi.setImgTitleSub(vo.getImgTitleSub());
pi.setImgSource(vo.getImgSource());
pi.setState(SiteConstant.TWO); pi.setState(SiteConstant.TWO);
pi.setCreateById(vo.getAccountId()); pi.setCreateById(vo.getAccountId());
pi.setCreateByName(vo.getAccountName()); pi.setCreateByName(vo.getAccountName());
......
cloud-site-service/src/main/resources/mapper/InformationMapper.xml
...@@ -95,7 +95,8 @@ ...@@ -95,7 +95,8 @@
WHERE WHERE
rn.information_id = a.id rn.information_id = a.id
) number, ) number,
a.author a.author,
a.info_source
FROM FROM
information AS a information AS a
LEFT JOIN data_classification c ON a.type_one = c.id LEFT JOIN data_classification c ON a.type_one = c.id
...@@ -129,7 +130,8 @@ ...@@ -129,7 +130,8 @@
WHERE WHERE
rn.information_id = a.id rn.information_id = a.id
) number, ) number,
a.author a.author,
a.info_source
FROM FROM
information AS a information AS a
LEFT JOIN data_classification c ON a.type_one = c.id LEFT JOIN data_classification c ON a.type_one = c.id
...@@ -161,7 +163,8 @@ ...@@ -161,7 +163,8 @@
WHERE WHERE
rn.information_id = a.id rn.information_id = a.id
) number, ) number,
a.author a.author,
a.info_source
FROM FROM
information AS a information AS a
LEFT JOIN data_classification c ON a.type_two = c.id LEFT JOIN data_classification c ON a.type_two = c.id
...@@ -238,7 +241,8 @@ ...@@ -238,7 +241,8 @@
WHERE WHERE
rn.information_id = a.id rn.information_id = a.id
) number, ) number,
a.author a.author,
a.info_source
FROM FROM
information AS a information AS a
LEFT JOIN data_classification c ON a.type_one = c.id LEFT JOIN data_classification c ON a.type_one = c.id
...@@ -278,7 +282,8 @@ ...@@ -278,7 +282,8 @@
WHERE WHERE
rn.information_id = a.id rn.information_id = a.id
) number, ) number,
a.author a.author,
a.info_source
FROM FROM
information AS a information AS a
LEFT JOIN data_classification c ON a.type_one = c.id LEFT JOIN data_classification c ON a.type_one = c.id
...@@ -363,7 +368,8 @@ ...@@ -363,7 +368,8 @@
WHERE WHERE
rn.information_id = a.id rn.information_id = a.id
) number, ) number,
a.author a.author,
a.info_source
FROM FROM
information AS a information AS a
LEFT JOIN data_classification c ON a.type_one = c.id LEFT JOIN data_classification c ON a.type_one = c.id
...@@ -396,7 +402,8 @@ ...@@ -396,7 +402,8 @@
WHERE WHERE
rn.information_id = a.id rn.information_id = a.id
) number, ) number,
a.author a.author,
a.info_source
FROM FROM
information AS a information AS a
LEFT JOIN data_classification c ON a.type_one = c.id LEFT JOIN data_classification c ON a.type_one = c.id
......
cloud-site-service/src/main/resources/mapper/PortalBannerMapper.xml
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<select id="selectPortalBanner" resultType="com.yizhi.site.application.vo.site.PortalBannerVo"> <select id="selectPortalBanner" resultType="com.yizhi.site.application.vo.site.PortalBannerVo">
select a.id, b.banner_name as bannerName, c.id as terminalId, c.terminal_name as terminalName, select a.id, b.banner_name as bannerName, c.id as terminalId, c.terminal_name as terminalName,
c.site_id as siteId, a.img_title as imgTitle, a.banner_path as bannerPath, a.link_url as linkUrl, c.site_id as siteId, a.img_title as imgTitle, a.banner_path as bannerPath, a.link_url as linkUrl,
a.add_time as addTime, a.home_type as homeType, a.sort, a.update_time as updateTime, a.state a.add_time as addTime, a.home_type as homeType, a.sort, a.update_time as updateTime, a.state , a.img_title_sub, a.img_source
from tr_portal_image a left join tr_portal_banner b on a.banner_id=b.id from tr_portal_image a left join tr_portal_banner b on a.banner_id=b.id
left join tr_portal_terminal c on b.terminal_id=c.id where 1=1 and c.company_id=#{companyId} left join tr_portal_terminal c on b.terminal_id=c.id where 1=1 and c.company_id=#{companyId}
and c.site_id=#{siteId} and c.site_id=#{siteId}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment