diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index cd152c1c..eebd6c72 100644 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -27,7 +27,7 @@ import cn.hutool.core.io.FileUtil; import net.mingsoft.basic.biz.IModelBiz; import net.mingsoft.basic.entity.AppEntity; import net.mingsoft.basic.util.BasicUtil; -import net.mingsoft.cms.bean.ContentBean; +import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.cms.biz.ICategoryBiz; import net.mingsoft.cms.biz.IContentBiz; import net.mingsoft.cms.entity.CategoryEntity; @@ -163,7 +163,7 @@ public class GeneraterAction extends BaseAction { categoryEntity.setAppId(app.getAppId()); columns = categoryBiz.query(categoryEntity); } - List articleIdList = null; + List articleIdList = null; try { // 1、设置模板文件夹路径 // 获取栏目列表模版 @@ -182,7 +182,7 @@ public class GeneraterAction extends BaseAction { break; case "2":// 单页 if(articleIdList.size()==0){ - ContentBean columnArticleIdBean=new ContentBean(); + CategoryBean columnArticleIdBean=new CategoryBean(); CopyOptions copyOptions=CopyOptions.create(); copyOptions.setIgnoreError(true); BeanUtil.copyProperties(column,columnArticleIdBean,copyOptions); @@ -212,7 +212,7 @@ public class GeneraterAction extends BaseAction { public void generateArticle(HttpServletRequest request, HttpServletResponse response, @PathVariable String columnId) { String dateTime = request.getParameter("dateTime"); // 网站风格物理路径 - List articleIdList = null; + List articleIdList = null; // 查出所有文章(根据选择栏目)包括子栏目 articleIdList = contentBiz.queryIdsByCategoryIdForParser(columnId, dateTime, null); // 有符合条件的新闻就更新 diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index fbf9e7a0..1c6aad1f 100644 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -29,7 +29,7 @@ import freemarker.template.TemplateNotFoundException; import net.mingsoft.base.constant.Const; import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.basic.util.StringUtil; -import net.mingsoft.cms.bean.ContentBean; +import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.cms.biz.ICategoryBiz; import net.mingsoft.cms.biz.IContentBiz; import net.mingsoft.cms.entity.CategoryEntity; @@ -143,7 +143,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { int size = BasicUtil.getInt(ParserUtil.SIZE,10); //获取文章总数 - List columnArticles = contentBiz.queryIdsByCategoryIdForParser(String.valueOf(typeId), null, null); + List columnArticles = contentBiz.queryIdsByCategoryIdForParser(String.valueOf(typeId), null, null); //判断栏目下是否有文章 if(columnArticles.size()==0){ this.outJson(resp, false); @@ -220,7 +220,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { map.put(ParserUtil.URL, BasicUtil.getUrl()); map.put(ParserUtil.PAGE, page); map.put(ParserUtil.ID, article.getId()); - List articleIdList = contentBiz.queryIdsByCategoryIdForParser(column.getCategoryId(), null, null,orderby,order); + List articleIdList = contentBiz.queryIdsByCategoryIdForParser(column.getCategoryId(), null, null,orderby,order); Map contentModelMap = new HashMap(); ModelEntity contentModel = null; for (int artId = 0; artId < articleIdList.size();) { @@ -250,7 +250,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { } // 第一篇文章没有上一篇 if (artId > 0) { - ContentBean preCaBean = articleIdList.get(artId - 1); + CategoryBean preCaBean = articleIdList.get(artId - 1); //判断当前文档是否与上一页文章在同一栏目下,并且不能使用父栏目字符串,因为父栏目中没有所属栏目编号 if(articleColumnPath.contains(preCaBean.getCategoryId()+"")){ page.setPreId(preCaBean.getArticleId()); @@ -258,7 +258,7 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { } // 最后一篇文章没有下一篇 if (artId + 1 < articleIdList.size()) { - ContentBean nextCaBean = articleIdList.get(artId + 1); + CategoryBean nextCaBean = articleIdList.get(artId + 1); //判断当前文档是否与下一页文章在同一栏目下并且不能使用父栏目字符串,因为父栏目中没有所属栏目编号 if(articleColumnPath.contains(nextCaBean.getCategoryId()+"")){ page.setNextId(nextCaBean.getArticleId()); diff --git a/src/main/java/net/mingsoft/cms/bean/CategoryBean.java b/src/main/java/net/mingsoft/cms/bean/CategoryBean.java new file mode 100644 index 00000000..1c402a02 --- /dev/null +++ b/src/main/java/net/mingsoft/cms/bean/CategoryBean.java @@ -0,0 +1,28 @@ +package net.mingsoft.cms.bean; + +import net.mingsoft.cms.entity.CategoryEntity; + +/** +* 文章实体 +* @author 铭飞开发团队 +* 创建日期:2019-11-28 15:12:32
+* 历史修订:
+*/ +public class CategoryBean extends CategoryEntity { + + /** + * 文章编号 + */ + private int articleId; + + + + + public int getArticleId() { + return articleId; + } + + public void setArticleId(int articleId) { + this.articleId = articleId; + } +} \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/bean/ContentBean.java b/src/main/java/net/mingsoft/cms/bean/ContentBean.java index 7a4235c4..c1fece2c 100644 --- a/src/main/java/net/mingsoft/cms/bean/ContentBean.java +++ b/src/main/java/net/mingsoft/cms/bean/ContentBean.java @@ -1,25 +1,23 @@ package net.mingsoft.cms.bean; -import net.mingsoft.cms.entity.CategoryEntity; +import net.mingsoft.cms.entity.ContentEntity; /** -* 文章实体 -* @author 铭飞开发团队 -* 创建日期:2019-11-28 15:12:32
-* 历史修订:
-*/ -public class ContentBean extends CategoryEntity { + * 文章实体bean + */ +public class ContentBean extends ContentEntity { - /** - * 文章编号 - */ - private int articleId; + /** + * 静态化地址 + */ + private String staticUrl; - public int getArticleId() { - return articleId; - } - public void setArticleId(int articleId) { - this.articleId = articleId; - } -} \ No newline at end of file + public String getStaticUrl() { + return staticUrl; + } + + public void setStaticUrl(String staticUrl) { + this.staticUrl = staticUrl; + } +} diff --git a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java index 52faf36e..3a64d5e2 100644 --- a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java @@ -1,7 +1,7 @@ package net.mingsoft.cms.biz; import net.mingsoft.base.biz.IBaseBiz; -import net.mingsoft.cms.bean.ContentBean; +import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.mdiy.entity.ModelEntity; import java.util.List; @@ -16,9 +16,9 @@ import java.util.Map; */ public interface IContentBiz extends IBaseBiz { - List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime); + List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime); - List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime, String orderBy, String order); + List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime, String orderBy, String order); int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, int appId, String categoryIds); } \ No newline at end of file diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index 8a01fb38..91104707 100644 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -22,14 +22,14 @@ The MIT License (MIT) * Copyright (c) 2019 铭飞科技 package net.mingsoft.cms.biz.impl; import net.mingsoft.basic.util.BasicUtil; -import net.mingsoft.cms.bean.ContentBean; +import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.mdiy.entity.ModelEntity; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import net.mingsoft.base.biz.impl.BaseBizImpl; import net.mingsoft.base.dao.IBaseDao; import java.util.*; -import net.mingsoft.cms.entity.ContentEntity; + import net.mingsoft.cms.biz.IContentBiz; import net.mingsoft.cms.dao.IContentDao; @@ -54,11 +54,11 @@ public class ContentBizImpl extends BaseBizImpl implements IContentBiz { } @Override - public List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime) { + public List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime) { return this.contentDao.queryIdsByCategoryIdForParser(categoryId,BasicUtil.getAppId(), beginTime, endTime,null,null); } @Override - public List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime, String orderBy, String order) { + public List queryIdsByCategoryIdForParser(String categoryId, String beginTime, String endTime, String orderBy, String order) { return this.contentDao.queryIdsByCategoryIdForParser(categoryId, BasicUtil.getAppId(), beginTime, endTime,orderBy,order); } diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.java b/src/main/java/net/mingsoft/cms/dao/IContentDao.java index d92f57f3..dc7e0a07 100644 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.java +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.java @@ -3,7 +3,7 @@ package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; import java.util.*; -import net.mingsoft.cms.bean.ContentBean; +import net.mingsoft.cms.bean.CategoryBean; import org.apache.ibatis.annotations.Param; /** @@ -22,7 +22,7 @@ public interface IContentDao extends IBaseDao { * @param endTime 结束时间 * @return */ - public List queryIdsByCategoryIdForParser(@Param("categoryId")String categoryId, @Param("appId")int appId , @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderBy")String orderBy, @Param("order")String order); + public List queryIdsByCategoryIdForParser(@Param("categoryId")String categoryId, @Param("appId")int appId , @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("orderBy")String orderBy, @Param("order")String order); /** * 根据查询文章实体总数 diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml index 97cfd44f..81712b03 100644 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml @@ -26,7 +26,32 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -184,8 +209,9 @@ select * from cms_content order by id desc - + select ct.*,CONCAT("/html/",ct.app_id,cc.category_path,"/",ct.id,".html") AS static_url + from cms_content ct join cms_category cc on ct.content_category_id=cc.id and content_title like CONCAT('%',#{contentTitle},'%') and content_category_id=#{contentCategoryId} diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index 662c6bf0..d14a284f 100644 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -3,15 +3,13 @@ package net.mingsoft.cms.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.PageUtil; -import freemarker.cache.FileTemplateLoader; import freemarker.core.ParseException; import freemarker.template.MalformedTemplateNameException; -import freemarker.template.Template; import freemarker.template.TemplateNotFoundException; import net.mingsoft.base.constant.Const; import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.basic.util.SpringUtil; -import net.mingsoft.cms.bean.ContentBean; +import net.mingsoft.cms.bean.CategoryBean; import net.mingsoft.cms.entity.CategoryEntity; import net.mingsoft.mdiy.bean.PageBean; import net.mingsoft.mdiy.biz.IModelBiz; @@ -151,7 +149,7 @@ public class CmsParserUtil extends ParserUtil { * @throws MalformedTemplateNameException * @throws TemplateNotFoundException */ - public static void generateBasic(List articleIdList) { + public static void generateBasic(List articleIdList) { Map contentModelMap = new HashMap(); ModelEntity contentModel = null; @@ -214,12 +212,12 @@ public class CmsParserUtil extends ParserUtil { parserParams.put(ID, articleId); // 第一篇文章没有上一篇 if (artId > 0) { - ContentBean preCaBean = articleIdList.get(artId - 1); + CategoryBean preCaBean = articleIdList.get(artId - 1); page.setPreId(preCaBean.getArticleId()); } // 最后一篇文章没有下一篇 if (artId + 1 < articleIdList.size()) { - ContentBean nextCaBean = articleIdList.get(artId + 1); + CategoryBean nextCaBean = articleIdList.get(artId + 1); page.setNextId(nextCaBean.getArticleId()); } diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl index 140871cf..a007c0ed 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl @@ -18,8 +18,8 @@ gutter="0" justify="start" align="top"> - -