From 64cca8add7b32c8406427776530166d3e0c0661a Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sat, 19 Jan 2019 12:19:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/action/web/ArticleAction.java | 80 ++++++----- src/main/resources/application.yml | 2 - src/main/webapp/WEB-INF/web.xml | 130 ------------------ 3 files changed, 43 insertions(+), 169 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/web.xml diff --git a/src/main/java/net/mingsoft/cms/action/web/ArticleAction.java b/src/main/java/net/mingsoft/cms/action/web/ArticleAction.java index ecd2096f..899ef780 100644 --- a/src/main/java/net/mingsoft/cms/action/web/ArticleAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/ArticleAction.java @@ -29,29 +29,35 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; + +import io.swagger.annotations.ApiOperation; +import net.mingsoft.base.filter.DateValueFilter; + +import io.swagger.annotations.ApiOperation; +import net.mingsoft.base.filter.DateValueFilter; import net.mingsoft.basic.action.BaseAction; +import net.mingsoft.basic.bean.ListBean; import net.mingsoft.basic.biz.IColumnBiz; import net.mingsoft.basic.entity.ColumnEntity; +import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.cms.biz.IArticleBiz; import net.mingsoft.cms.entity.ArticleEntity; import net.mingsoft.mdiy.biz.IContentModelBiz; import net.mingsoft.mdiy.biz.IContentModelFieldBiz; import net.mingsoft.mdiy.entity.ContentModelEntity; -import org.apache.commons.lang3.StringUtils; - -import cn.hutool.core.util.ObjectUtil; -import net.mingsoft.base.filter.DateValueFilter; -import net.mingsoft.basic.bean.ListBean; -import net.mingsoft.basic.util.BasicUtil; +import springfox.documentation.annotations.ApiIgnore; /** * @@ -101,37 +107,36 @@ public class ArticleAction extends BaseAction { * basicDateTime:"发布时间",basicUpdateTime:"更新时间","basicHit":点击数, * "basicId":编号 articleContent:"文章内容","basicSort":排序,[自定义模型字段]} */ - @RequestMapping("/{basicId}/detail") + @GetMapping("/{basicId}/detail") @ResponseBody public void detail(@PathVariable int basicId, HttpServletRequest request, HttpServletResponse response) { - System.out.println(BasicUtil.getSession("xxx")); - //ArticleEntity article = articleBiz.getById(basicId); -// if (article == null) { -// this.outJson(response, ""); -// return; -// } -// // 获取文章栏目id获取栏目实体 -// ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId()); -// ContentModelEntity contentModel = (ContentModelEntity) contentModelBiz -// .getEntity(column.getColumnContentModelId()); -// -// // 判断内容模型的值 -// if (contentModel != null) { -// Map where = new HashMap(); -// // 压入basicId字段的值 -// where.put("basicId", basicId); -// // 遍历所有的字段实体,得到字段名列表信息 -// List listFieldName = new ArrayList(); -// listFieldName.add("basicId"); -// // 查询新增字段的信息 -// List fieldLists = fieldBiz.queryBySQL(contentModel.getCmTableName(), listFieldName, where); -// if (fieldLists.size() > 0) { -// Map map = (Map) fieldLists.get(0); -// article.setExtendsFields(map); -// } -// } -// -// this.outJson(response, JSONObject.toJSONStringWithDateFormat(article, "yyyy-MM-dd hh:mm:ss")); + ArticleEntity article = articleBiz.getById(basicId); + if (article == null) { + this.outJson(response, ""); + return; + } + // 获取文章栏目id获取栏目实体 + ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId()); + ContentModelEntity contentModel = (ContentModelEntity) contentModelBiz + .getEntity(column.getColumnContentModelId()); + + // 判断内容模型的值 + if (contentModel != null) { + Map where = new HashMap(); + // 压入basicId字段的值 + where.put("basicId", basicId); + // 遍历所有的字段实体,得到字段名列表信息 + List listFieldName = new ArrayList(); + listFieldName.add("basicId"); + // 查询新增字段的信息 + List fieldLists = fieldBiz.queryBySQL(contentModel.getCmTableName(), listFieldName, where); + if (fieldLists.size() > 0) { + Map map = (Map) fieldLists.get(0); + article.setExtendsFields(map); + } + } + + this.outJson(response, JSONObject.toJSONStringWithDateFormat(article, "yyyy-MM-dd hh:mm:ss")); } @@ -183,9 +188,10 @@ public class ArticleAction extends BaseAction { * "total":总记录数量 * } */ - @RequestMapping(value = "/list") + @RequestMapping(value = "/list",method= RequestMethod.GET) + @ApiOperation(value="文章列表信息") @ResponseBody - public void list(@ModelAttribute ArticleEntity article, HttpServletRequest request, HttpServletResponse response) { + public void list(@ModelAttribute @ApiIgnore ArticleEntity article, HttpServletRequest request, HttpServletResponse response) { int appId = BasicUtil.getAppId(); int[] ids = null; if (article.getBasicCategoryId()>0) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 977da323..3ff3d837 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,3 @@ -application: - version: mcms-4.7.0 server: port: 8080 servlet.context-path: /ms-mcms diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 9c446d57..00000000 --- a/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - mybatis - - contextConfigLocation - classpath:spring-core.xml - - - 字符集过滤器 - encodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - 字符集编码 - encoding - UTF-8 - - - - encodingFilter - /* - - - - shiroFilter - org.springframework.web.filter.DelegatingFilterProxy - - targetFilterLifecycle - true - - - - shiroFilter - /* - - - - - org.springframework.web.context.request.RequestContextListener - - - - - org.springframework.web.util.IntrospectorCleanupListener - - - spring监听器 - org.springframework.web.context.ContextLoaderListener - - - - spring mvc servlet - springMvc - org.springframework.web.servlet.DispatcherServlet - - spring mvc 配置文件 - contextConfigLocation - classpath:spring-mvc.xml - - 1 - - - springMvc - *.do - - - - - DruidWebStatFilter - com.alibaba.druid.support.http.WebStatFilter - - exclusions - *.js,*.gif,*.jpg,*.png,*.css,*.ico,*.jsp,/druid/*,/download/* - - - sessionStatMaxCount - 2000 - - - sessionStatEnable - true - - - principalSessionName - session_user_key - - - profileEnable - true - - - - DruidWebStatFilter - /* - - - index - default.html - default.htm - index.htm - index.html - login.do - - - - 404 - /error/404.do - - - 400 - /error/400.do - - - 403 - /error/403.do - - - 405 - /error/405.do - - - 500 - /error/500.do - - - 15 - - \ No newline at end of file