From 7fbb94f5595febc145aea70ec6e56e78f0aa96d3 Mon Sep 17 00:00:00 2001 From: sunxin <2741094504@qq.com> Date: Thu, 31 Jan 2019 14:44:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=BC=96=E5=8F=B7=E6=96=B9=E6=B3=95=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/mingsoft/cms/action/ColumnAction.java | 25 +++++++++---------- .../mingsoft/cms/action/GeneraterAction.java | 2 +- .../cms/action/web/ArticleAction.java | 3 --- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/action/ColumnAction.java b/src/main/java/net/mingsoft/cms/action/ColumnAction.java index 2f8bf999..8e1f2501 100644 --- a/src/main/java/net/mingsoft/cms/action/ColumnAction.java +++ b/src/main/java/net/mingsoft/cms/action/ColumnAction.java @@ -80,17 +80,16 @@ public class ColumnAction extends BaseAction{ */ @RequestMapping("/add") public String add(HttpServletRequest request,ModelMap model) { - ManagerEntity managerSession = (ManagerEntity) BasicUtil.getSession( SessionConstEnum.MANAGER_SESSION); // 站点ID - int appId =this.getAppId(request); - List list = columnBiz.queryAll(appId, this.getModelCodeId(request)); + int appId =BasicUtil.getAppId(); + List list = columnBiz.queryAll(appId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString())); ColumnEntity columnSuper = new ColumnEntity(); model.addAttribute("appId",appId); model.addAttribute("columnSuper", columnSuper); model.addAttribute("column",new ColumnEntity()); model.addAttribute("listColumn", JSONArray.toJSONString(list)); model.addAttribute("model", "cms"); - return view("/column/form"); + return "/column/form"; } /** @@ -194,10 +193,10 @@ public class ColumnAction extends BaseAction{ // 获取管理实体 ManagerEntity managerSession = (ManagerEntity) BasicUtil.getSession( SessionConstEnum.MANAGER_SESSION); // 站点ID - int appId = this.getAppId(request); + int appId = BasicUtil.getAppId(); List list = new ArrayList(); // 判断管理员权限,查询其管理的栏目集合 - list = columnBiz.queryAll(appId, this.getModelCodeId(request)); + list = columnBiz.queryAll(appId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString())); //查询当前栏目实体 ColumnEntity column = (ColumnEntity) columnBiz.getEntity(columnId); model.addAttribute("appId",appId); @@ -211,7 +210,7 @@ public class ColumnAction extends BaseAction{ model.addAttribute("columnSuper", columnSuper); model.addAttribute("listColumn", JSONArray.toJSONString(list)); model.addAttribute("model", "cms"); - return view("/column/form"); + return "/column/form"; } /** @@ -222,9 +221,9 @@ public class ColumnAction extends BaseAction{ public void list(@ModelAttribute ColumnEntity column,HttpServletResponse response, HttpServletRequest request,ModelMap model) { // 站点ID有session获取 - int websiteId = this.getAppId(request); + int websiteId = BasicUtil.getAppId(); // 需要打开的栏目节点树的栏目ID - List list = columnBiz.queryAll(websiteId, this.getModelCodeId(request)); + List list = columnBiz.queryAll(websiteId, BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString())); EUListBean _list = new EUListBean(list, list.size()); this.outJson(response, net.mingsoft.base.util.JSONArray.toJSONString(_list)); } @@ -241,11 +240,11 @@ public class ColumnAction extends BaseAction{ if(!checkForm(column,response)){ return; } - column.setCategoryAppId( this.getAppId(request)); + column.setCategoryAppId( BasicUtil.getAppId()); column.setAppId(BasicUtil.getAppId()); column.setCategoryManagerId(getManagerBySession(request).getManagerId()); column.setCategoryDateTime(new Timestamp(System.currentTimeMillis())); - column.setCategoryModelId(this.getModelCodeId(request)); + column.setCategoryModelId(BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString())); if(column.getColumnType()==ColumnEntity.ColumnTypeEnum.COLUMN_TYPE_COVER.toInt()){ column.setColumnListUrl(null); } @@ -264,7 +263,7 @@ public class ColumnAction extends BaseAction{ @ResponseBody public void update(@ModelAttribute ColumnEntity column,HttpServletRequest request,HttpServletResponse response) { //获取站点ID - int websiteId = this.getAppId(request); + int websiteId = BasicUtil.getAppId(); //检测栏目信息是否合法 if(!checkForm(column,response)){ return; @@ -278,7 +277,7 @@ public class ColumnAction extends BaseAction{ columnBiz.updateCategory(column); this.columnPath(request,column); //查询当前栏目是否有子栏目， - List childList = columnBiz.queryChild(column.getCategoryId(), websiteId,this.getModelCodeId(request),null); + List childList = columnBiz.queryChild(column.getCategoryId(), websiteId,BasicUtil.getModelCodeId(net.mingsoft.cms.constant.ModelCode.CMS_COLUMN.toString()),null); if(childList != null && childList.size()>0){ //改变子栏目的顶级栏目ID为当前栏目的父级栏目ID for(int i=0;i list = columnBiz.queryAll(websiteId, modelId); model.addAttribute("list", JSONArray.toJSONString(list)); model.addAttribute("now", new Date()); - return view("/cms/generate/index"); + return "/cms/generate/index"; } /** 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 899ef780..b66257be 100644 --- a/src/main/java/net/mingsoft/cms/action/web/ArticleAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/ArticleAction.java @@ -42,9 +42,6 @@ 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;