diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentArticlesMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentArticlesMapper.xml index b331fbd..fd689b1 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentArticlesMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentArticlesMapper.xml @@ -35,7 +35,7 @@ diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentCategoriesMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentCategoriesMapper.xml index 99c27e5..1f22ee8 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentCategoriesMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentCategoriesMapper.xml @@ -31,8 +31,12 @@ and `NAME` = #{name} + + AND LEVEL = 0 + + AND IFDEL = 0 - + order by CREATE_TIME DESC diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml index eb1aad9..b8fe480 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.xml @@ -41,6 +41,7 @@ AND m.IFDEL = 0 GROUP BY m.ID + order by CREATE_TIME DESC diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml index d362962..4c54c74 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml +++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentTagsMapper.xml @@ -35,6 +35,7 @@ AND LEVEL = 0 AND IFDEL = 0 + order by CREATE_TIME DESC ; diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentArticlesServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentArticlesServiceImpl.java index 5a6a2b5..e64ddb5 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentArticlesServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentArticlesServiceImpl.java @@ -31,23 +31,15 @@ public class ContentArticlesServiceImpl extends ServiceImpl getArticlesPage(Page page, AricleSearchDTO aricleDto) { List lists = baseMapper.getArticlesPage(page, aricleDto); - StringBuffer tagsBf = new StringBuffer(); for (ContentArticles ct : lists) { String[] contentTags = ct.getTagIds()==null?new String[0]:ct.getTagIds().split(","); - for (String s : contentTags) { - if (StrUtils.isEmpty(s)) { - continue; - } - String tagName = ContentTagsServiceImpl.getValue(s); - if (StrUtils.isNotEmpty(tagName)) { - tagsBf.append(tagName + ","); - } - } - if (StrUtils.isNotEmpty(tagsBf.toString())) { - ct.setTagIds(tagsBf.substring(0, tagsBf.length() - 1).toString()); + String tagName = ContentTagsServiceImpl.tagIdToTagName(contentTags); + if (StrUtils.isNotEmpty(tagName)) { + ct.setTagIds(tagName.substring(0, tagName.length() - 1)); } else { ct.setTagIds(""); } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java index fe59fa5..5009a9c 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTagsServiceImpl.java @@ -1,5 +1,7 @@ package com.lyms.base.common.service.content.impl; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.lyms.base.common.dao.content.ContentTagsMapper; @@ -32,12 +34,32 @@ public class ContentTagsServiceImpl extends ServiceImpl tagsList = baseMapper.getTags(); + Wrapper wrapper = new EntityWrapper(); + wrapper.and("IFDEL",0); + wrapper.and("ENABLE",0); + List tagsList = baseMapper.selectList(wrapper); for(ContentTags conTag:tagsList){ tagsMap.put(conTag.getId(),conTag.getTagName()); } } + public static String tagIdToTagName(String [] tagIds){ + if(tagIds.length==0){ + return ""; + } + StringBuffer tagsBf = new StringBuffer(); + for (String s : tagIds) { + if (StrUtils.isEmpty(s)) { + continue; + } + String tagName = getValue(s); + if (StrUtils.isNotEmpty(tagName)) { + tagsBf.append(tagName + ","); + } + } + return tagsBf.toString(); + } + public static String getValue(String key){ if(StrUtils.isEmpty(key)){ return ""; diff --git a/parent/base.common/src/main/java/com/lyms/base/common/vo/content/AricleSearchDTO.java b/parent/base.common/src/main/java/com/lyms/base/common/vo/content/AricleSearchDTO.java index de4fa8a..974cb54 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/vo/content/AricleSearchDTO.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/vo/content/AricleSearchDTO.java @@ -15,6 +15,10 @@ public class AricleSearchDTO { */ private Integer type; /** + * 状态 + */ + private Integer status; + /** * 标签id */ private String tagId; @@ -23,6 +27,14 @@ public class AricleSearchDTO { */ private String title; + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public Integer getColumnId() { return columnId; } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentArticlesController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentArticlesController.java index 0fb08e4..26a7344 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentArticlesController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentArticlesController.java @@ -58,6 +58,52 @@ public class ContentArticlesController extends BaseController { return "/articles/articles_edit"; } + + /** + * 获取图文内容列表 + * @return + */ + @ResponseBody + @RequestMapping(value = "/audit", method = { RequestMethod.POST }) + public AjaxResult audit(String id,int type,String reason,AjaxResult ajaxResult) { + String operationName = "操作"; + if(StrUtils.isNotEmpty(id)){ + ContentArticles articles = contentArticlesService.selectById(id); + if(articles!=null){ + if(type == 1){//审核 + if(articles.getStatus() == 1){//审核操作：当前状态是待审核状态 + articles.setStatus(2); + articles.setAuditorTime(new Date()); + articles.setReason(reason); + operationName = "审核"; + }else{ + return handleAjaxResult(ajaxResult, false, "当前状态不是待审核状态导致"); + } + }else if(type == 2){//发布 + if(articles.getStatus() == 2 ||articles.getStatus() == 4){//发布操作：：当前状态是审核通过状态或已下线状态 + articles.setStatus(3); + operationName = "发布"; + }else{ + return handleAjaxResult(ajaxResult, false, "当前状态不是审核通过状态导致"); + } + }else if(type == 3){//下线操作：当前状态是已发布状态 + if(articles.getStatus() == 3){ + articles.setStatus(4); + operationName = "下线"; + }else{ + return handleAjaxResult(ajaxResult, false, "当前状态不是发布状态导致"); + } + }else{ + return handleAjaxResult(ajaxResult, false, "未知操作"); + } + boolean tag = contentArticlesService.updateById(articles); + return handleAjaxResult(ajaxResult, tag, operationName); + } + } + return handleAjaxResult(ajaxResult, false, operationName); + } + + /** * 获取图文内容列表 * @return @@ -67,7 +113,6 @@ public class ContentArticlesController extends BaseController { public Map list(AricleSearchDTO aricleDto) { Page page = getPage(); page = contentArticlesService.getArticlesPage(page,aricleDto); - return toGridData(page); } @RequestMapping(value = "/{ids}/delete", method = { RequestMethod.GET, RequestMethod.POST }) @@ -133,7 +178,7 @@ public class ContentArticlesController extends BaseController { Map map = new HashMap<>(); map.put("ARTICLES_ID",conArti.getId()); //先删除标签关系 - boolean bd = contentArticTagService.deleteByMap(map); + contentArticTagService.deleteByMap(map); //新增或修改图文信息 boolean tag = contentArticlesService.insertOrUpdate(conArti); //批量新增图文对应的标签 @@ -142,7 +187,7 @@ public class ContentArticlesController extends BaseController { if(StrUtils.isNotEmpty(cav.getId())&&!cav.getId().equals("0")) {//更新 return handleAjaxResult(ajaxResult, tag, OperationName.UPDATE); }else{ - return handleAjaxResult(ajaxResult, tag&&bd&&bi, OperationName.CREATE); + return handleAjaxResult(ajaxResult, tag&&bi, OperationName.CREATE); } } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java index f5cb945..b6b6f4a 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java @@ -40,7 +40,10 @@ public class ContentCategoriesController extends BaseController { @ResponseBody @RequestMapping(value = "/selelist", method = { RequestMethod.GET, RequestMethod.POST }) public AjaxResult selelist() { - List lists = categorService.selectList(null); + Wrapper wrapper = new EntityWrapper(); + wrapper.and("IFDEL={0}",0); + wrapper.and("ENABLE={1}",0); + List lists = categorService.selectList(wrapper); return AjaxResult.returnSuccess(lists); } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java index a4e7258..ddc53f1 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java @@ -20,10 +20,7 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -42,25 +39,26 @@ public class ContentMessageTemplateController extends BaseController { //模板信息标签 @Autowired private ContentTemplateMessageTagsService messageTagsService; + /** * 跳转到列表页面 * * @return */ - @RequestMapping(value = "/toList", method = { RequestMethod.GET }) + @RequestMapping(value = "/toList", method = {RequestMethod.GET}) public String toList() { - return "/content/template_list"; + return "/content/template_list"; } - @RequestMapping(value = "/{ids}/delete", method = { RequestMethod.GET, RequestMethod.POST }) + @RequestMapping(value = "/{ids}/delete", method = {RequestMethod.GET, RequestMethod.POST}) @ResponseBody public AjaxResult delete(@PathVariable String ids, AjaxResult ajaxResult) { Wrapper wrapper = new EntityWrapper<>(); //wrapper.where("id in ({0})",ids); - wrapper.in("id",ids); + wrapper.in("id", ids); List template = messageTemplateService.selectList(wrapper); - for(ContentMessageTemplate temp : template){ + for (ContentMessageTemplate temp : template) { temp.setIfdel(1); temp.setModifyTime(new Date()); } @@ -70,91 +68,103 @@ public class ContentMessageTemplateController extends BaseController { } /** - * 跳转到编辑页面 - * - * @return - */ - @RequestMapping(value = { "/{verId}/toEdit" }, method = RequestMethod.GET) - public String toEdit(@PathVariable String verId,String id,String vName, Model model) { - model.addAttribute("verId", verId); - model.addAttribute("vName", vName); - model.addAttribute("id", id); - if(StrUtils.isNotEmpty(id)){//查询 + * 跳转到编辑页面 + * + * @return + */ + @RequestMapping(value = {"/{verId}/toEdit"}, method = RequestMethod.GET) + public String toEdit(@PathVariable String verId, String id, String vName, Model model) { + model.addAttribute("verId", verId); + model.addAttribute("vName", vName); + model.addAttribute("id", id); + if (StrUtils.isNotEmpty(id)) {//查询 ContentMessageTemplate tempInfo = messageTemplateService.selectById(id); - model.addAttribute("tempInfo",tempInfo); - Map colMap = new HashMap<>(); - colMap.put("MESSAGE_TEMPLATE",id); + model.addAttribute("tempInfo", tempInfo); + Map colMap = new HashMap<>(); + colMap.put("MESSAGE_TEMPLATE", id); List tagList = messageTagsService.selectByMap(colMap); model.addAttribute("tags", tagList); } return "/content/template_edit"; - } + } - /** - * 获取消息内容列表 - * @param msgTemp - * @return - */ + /** + * 获取消息内容列表 + * + * @param msgTemp + * @return + */ @ResponseBody - @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST }) + @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) public Map list(MsgTempSerachDTO msgTemp) { - Page page = getPage(); - //根据条件查询短信列表 - List cmtdList = messageTemplateService.getContentMessageTemplate(page,msgTemp); - for(ContentMessageTemplateDTO ct : cmtdList){ - StringBuffer tagsBf = new StringBuffer(); - String[] contentTags = ct.getContentTagIds().split(","); - for(String s:contentTags){ - if(StrUtils.isEmpty(s)){ - continue; - } - String tagName = ContentTagsServiceImpl.getValue(s); - if(StrUtils.isNotEmpty(tagName)){ - tagsBf.append(tagName+","); + if (StrUtils.isNotEmpty(msgTemp.getVerId())) { + Page page = getPage(); + //根据条件查询短信列表 + List cmtdList = messageTemplateService.getContentMessageTemplate(page, msgTemp); + for (ContentMessageTemplateDTO ct : cmtdList) { + String[] contentTags = ct.getContentTagIds().split(","); + String tagName = ContentTagsServiceImpl.tagIdToTagName(contentTags); + if (StrUtils.isNotEmpty(tagName.toString())) { + ct.setContentTagIds(tagName.substring(0, tagName.length() - 1).toString()); + } else { + ct.setContentTagIds(""); } } - if(StrUtils.isNotEmpty(tagsBf.toString())){ - ct.setContentTagIds(tagsBf.substring(0,tagsBf.length()-1).toString()); - }else{ - ct.setContentTagIds(""); - } - System.out.println("标签名：--------------->"+ct.getContentTagIds()); + page.setRecords(cmtdList); + return toGridData(page); + }else{ + return toGridData(getPage()); } - - page.setRecords(cmtdList); - return toGridData(page); } - - /** + + /** * 新增消息模板信息 *

* TODO - * + * * @return */ @RequestMapping(value = "/create", method = RequestMethod.POST) @ResponseBody public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) { - ContentMessageTemplate messTemp = new ContentMessageTemplate(); - messTemp.setId(StrUtils.uuid()); - messTemp.setEnable(0); - messTemp.setIfdel(0); - messTemp.setCreateTime(new Date()); - messTemp.setKeyCode(messTemp.getId()); - messTemp.setContent(contentMessage.getContent()); - messTemp.setRichTitle(contentMessage.getRichTitle()); - messTemp.setRichText(contentMessage.getRichText()); - messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId()); + ContentMessageTemplate messTemp = new ContentMessageTemplate(); + String operationName = "操作"; + if(StrUtils.isNotEmpty(contentMessage.getId())&&!contentMessage.getId().equals("0")){//更新 + messTemp = messageTemplateService.selectById(contentMessage.getId()); + if(messTemp!=null){ + messTemp.setModifyTime(new Date()); + } + operationName = "修改"; + + Map map = new HashMap<>(); + map.put("MESSAGE_TEMPLATE",messTemp.getId()); + //先删除标签关系 + messageTagsService.deleteByMap(map); + }else{ + messTemp.setId(StrUtils.uuid()); + messTemp.setEnable(0); + messTemp.setIfdel(0); + messTemp.setCreateTime(new Date()); + messTemp.setKeyCode(messTemp.getId()); + messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId()); + operationName = "新增"; + } + messTemp.setContent(contentMessage.getContent()); + messTemp.setRichTitle(contentMessage.getRichTitle()); + messTemp.setRichText(contentMessage.getRichText()); messTemp.setIsRich(contentMessage.getIsRich()); - for(String tags : contentMessage.getContentTagIds()){ + + List tempTags = new ArrayList<>(); + for (String tags : contentMessage.getContentTagIds()) { ContentTemplateMessageTags ctmt = new ContentTemplateMessageTags(); ctmt.setId(StrUtils.uuid()); ctmt.setMessageTemplate(messTemp.getId()); ctmt.setTagsIds(tags); - messageTagsService.insert(ctmt); + tempTags.add(ctmt); } - boolean tag = messageTemplateService.insert(messTemp); - return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + boolean tags = messageTagsService.insertBatch(tempTags); + boolean tag = messageTemplateService.insertOrUpdate(messTemp); + return handleAjaxResult(ajaxResult, tag&&tags, operationName); } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java index 9525378..bde9510 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTagsController.java @@ -121,9 +121,11 @@ public class ContentTagsController extends BaseController { @RequestMapping(value = "/create", method = { RequestMethod.POST }) public AjaxResult create(ContentTagsDTO ctd, AjaxResult ajaxResult) { ContentTags cts = null; + String operationName = "新增"; if(StrUtils.isNotEmpty(ctd.getId())&&!ctd.getId().equals("0")){//更新 cts = contentTagsService.selectById(ctd.getId()); cts.setModifyTime(new Date()); + operationName = "修改"; }else{//新增 cts = new ContentTags(); cts.setId(StrUtils.uuid()); @@ -143,6 +145,6 @@ public class ContentTagsController extends BaseController { if(tag){ ContentTagsServiceImpl.setValue(cts.getId(),cts.getTagName()); } - return handleAjaxResult(ajaxResult, tag, OperationName.CREATE); + return handleAjaxResult(ajaxResult, tag, operationName); } } diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java index 8bc2b0b..d840a01 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentTemplateVersionController.java @@ -1,7 +1,5 @@ package com.lyms.cm.controller.content; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; import com.lyms.base.common.entity.content.ContentMessageTemplate; import com.lyms.base.common.entity.content.ContentTemplateMessageTags; import com.lyms.base.common.entity.content.ContentTemplateVersion; @@ -23,7 +21,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import java.util.Date; import java.util.List; -import java.util.Map; /** *

@@ -51,9 +48,8 @@ public class ContentTemplateVersionController extends BaseController { */ @RequestMapping(value = "/list", method = { RequestMethod.POST, RequestMethod.GET }) @ResponseBody - public Map list(Model model) { - Page page = getPage(); - EntityWrapper ew = new EntityWrapper(); + public List list(Model model) { + /*EntityWrapper ew = new EntityWrapper(); String versionId = getParameter("versionId"); String searchName = getParameter("name"); if (StrUtils.isNotEmpty(searchName)) { @@ -62,10 +58,9 @@ public class ContentTemplateVersionController extends BaseController { if (StrUtils.isNotEmpty(versionId)) { ew.and("version_id like {0}", versionId.trim() + "%"); } - ew.orderBy("id"); - page = templateVersionService.selectPage(page,ew); - Map map = toGridData(page); - return map; + ew.orderBy("id");*/ + List tempVerList = templateVersionService.selectList(null); + return tempVerList; } @ResponseBody @@ -93,7 +88,6 @@ public class ContentTemplateVersionController extends BaseController { messTemp.setIfdel(ctd.getIfdel()); for(int i =0;i:" + tagId); if(tagId.indexOf(",")!=0){ tagId = ","+tagId; } @@ -105,7 +99,6 @@ public class ContentTemplateVersionController extends BaseController { ctmt.setMessageTemplate(messTemp.getId()); ctmt.setTagsIds(tagId); messageTagsService.insert(ctmt); - System.out.println("tagsId后---------------->:" + tagId); } messageTemplateService.insert(messTemp); } diff --git a/parent/center.manager/src/main/resources/logback.xml b/parent/center.manager/src/main/resources/logback.xml index d68d455..f3cfe9f 100644 --- a/parent/center.manager/src/main/resources/logback.xml +++ b/parent/center.manager/src/main/resources/logback.xml @@ -29,7 +29,7 @@ - + diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html index ab1b94c..ec1beaa 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_edit.html @@ -58,7 +58,7 @@

- +
+ class="form-control w-lg" required="">
-
- +
+
@@ -269,7 +269,8 @@ } function initSeleTags(){ - if("$!tags" != "[]"){ + var tags = "$!tags"; + if(tags != "" && tags != "[]"){ #foreach($tg in $tags) addSeleTags("${tg.tagsIds}".split(",")); #end @@ -286,6 +287,11 @@ initCloumnData(); //初始化标签数据 initTagsData(); + //内容类型 1:普通内容，2:专题内容 + var contentType = "$!conArtic.contentType"; + if(contentType == "2"){ + switchContent(2); + } //初始化 var ue = UE.getEditor('editor', { @@ -300,7 +306,6 @@ var pickImgSrc = $("#pickImage").attr("src"); var content = UE.getEditor('editor').getContent(); data+="&content="+content; - if(pickImgSrc.indexOf("p0.jpg")==-1){ data+="&image="+pickImgSrc; } @@ -308,8 +313,11 @@ for(var i=1;i \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html index 0738e82..c82ee61 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/articles/articles_list.html @@ -5,13 +5,38 @@
-
+
+ + + + + + +
+
+
+
+ + +
+ +
-
+
-
+
-
- - +
+ 查询
-
-
- 查询 -
-
@@ -53,12 +72,19 @@ #end #override("js") #end #extends("/common/base_list.html") diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_edit.html index 30e64d8..9dc0d43 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_edit.html @@ -28,7 +28,7 @@
-
@@ -238,8 +238,12 @@ var content = UE.getEditor('editor').getContent(); data+="&description="+content; data+="&icon="+pickImgSrc; - ajaxPost(APP.PATH + "/contentCategories/create", data); - parent.reloadGrid('dataTable'); + ajaxPost(APP.PATH + "/contentCategories/create", data,function(r){ + msg(r.message); + parent.reloadGrid('dataTable'); + parent.layer.closeAll();//关闭弹窗 + }); + } } \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html index 9d71ad8..d7355d4 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/categories/categonies_list.html @@ -19,7 +19,7 @@
- +
@@ -76,7 +76,13 @@ ,shade: 0.6 //遮罩透明度 ,maxmin: true //允许全屏最小化 ,anim: 2 //0-6的动画形式，-1不开启 - ,content: "
" + ,content: "
" + ,btn: ['通过','取消'] //按钮 + ,yes:function(){ + saveVersion(); + },btn2:function(){ + layer.msg('取消', {icon: 1}); + } }); } @@ -115,7 +121,11 @@ function saveVersion(){ if($('#validForm').valid()){ var data = $('#validForm').serialize(); - ajaxPost(APP.PATH +'/contentTemplateVersion/create',data); + ajaxPost(APP.PATH +'/contentTemplateVersion/create',data,function(r){ + msg(r.message); + initTempVersion(); + layer.closeAll();//关闭弹窗 + }); } } function add() { @@ -131,16 +141,21 @@ var templateVer = []; var version = ""; function showMessageList(vId){ - version = templateVer[vId]; - $("#verId").val(version.id); - $("#version").text(version.versionName); + if(vId!=null){ + version = templateVer[vId]; + }else{ + layer.closeAll();//关闭弹窗 + } + $("#verId").val(version.id); + $("#version").text(version.versionName); var querys = {verId:version.id}; + var queryParams = { + query:querys + } + $('#dataTable').bootstrapTable('refresh', queryParams ); + - var queryParams = { - query:querys - } - $('#dataTable').bootstrapTable('refresh', queryParams ); } function initMsgTab(){ @@ -148,18 +163,22 @@ url: '${ctx}/contentMessageTemplate/list', //请求后台的URL（*） method: 'get', //请求方式（*） striped: true, //是否显示行间隔色 + pagination: true, cache: false, //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*） sortable: false, //是否启用排序 sidePagination: "server", //分页方式：client客户端分页，server服务端分页（*） pageNumber:1, //初始化加载第一页，默认第一页 - pageSize: 50, //每页的记录行数（*） + pageSize: 10, //每页的记录行数（*） pageList: [200], //可供选择的每页的行数（*） strictSearch: true, onDblClickRow:function(row,ev){ popWindow("修改信息模板", APP.PATH + controllerRequestMappint + version.id+"/toEdit?id="+row.id+"&vName="+version.versionName,850,800); }, - queryParams:{ - verId:0 + queryParams:function (params) { + return { + _size: params.limit, //每页记录数 + _offset: params.offset , //偏移量 + }; }, clickToSelect: true, //是否启用点击选中行 //height: 600, //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度 @@ -176,10 +195,12 @@ visible:false },{ field: 'content', - title: '短信内容' + title: '短信内容', + width:"70%" },{ field:'contentTagIds', title:'标签', + width:"30%", formatter:function(value,row,index){ var tagsNames = value.split(","); var tagsHtml = ""; @@ -214,31 +235,41 @@ "
" + "
" + "
" + - "
" + - "
提交
" + "
" + ,btn: ['通过','取消'] //按钮 + ,yes:function(){ + saveVersion(); + },btn2:function(){ + layer.msg('取消', {icon: 1}); + } }); } - - $(function(){ - initTagsData(); - initMsgTab(); + //初始化短信版本 + function initTempVersion(){ //获取消息模板版本列表 $.ajax({ url: "${ctx}/contentTemplateVersion/list", cache: false, dataType: "json", success: function(data){ - var data = data.rows; var versionHtml = ""; if(data){ - templateVer = data; + templateVer = data; data.forEach(function(i,d){ versionHtml+="
  • "+i.versionName+"
    • "; }); + $("#temp_version").empty(); $("#temp_version").append(versionHtml); } } }); + + } + + $(function(){ + initTagsData(); + initMsgTab(); + initTempVersion(); }); diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_edit.html b/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_edit.html index 34d3517..15914ba 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_edit.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_edit.html @@ -17,7 +17,7 @@
    -
    @@ -26,7 +26,7 @@
    - +
    @@ -50,11 +50,14 @@ \ No newline at end of file diff --git a/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_list.html b/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_list.html index e055583..419f6fc 100644 --- a/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_list.html +++ b/parent/center.manager/src/main/webapp/WEB-INF/views/tags/tags_list.html @@ -49,7 +49,7 @@ function add(id,level,tagName) { function editTag(id){ if(id){ - popWindow("修改标签", APP.PATH + controllerRequestMappint + id + "/toEdit",800,480); + popWindow("修改标签", APP.PATH + controllerRequestMappint + id + "/toEdit?level=0",800,480); } } @@ -77,7 +77,8 @@ function buildTable(tab,id){ width: '20%', },{ field: 'tagDesc', - title: '标签简介' + title: '标签简介', + width: '40%' },{ field: 'level', title: '栏目等级', @@ -93,7 +94,7 @@ function buildTable(tab,id){ }], url: APP.PATH + controllerRequestMappint + "list?perId="+id, //请求后台的URL（*） method: 'post', - showHeader:true, + showHeader:false, striped: true, //是否显示行间隔色 cache: false, //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*） sortable: false, //是否启用排序 @@ -119,7 +120,8 @@ $(function(){ width: '20%', },{ field: 'tagDesc', - title: '标签简介' + title: '标签简介', + width: '40%' },{ field: 'level', title: '栏目等级', @@ -154,6 +156,12 @@ $(function(){ showExport: true, showToggle: true, detailView: true, + queryParams:function (params) { + return { + _size: params.limit, //每页记录数 + _offset: params.offset , //偏移量 + }; + }, onExpandRow: function (index, row, detail) { buildTable(detail.html('
    ').find('table'),row.id); }