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 1fa9f04..8b83fdf 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 @@ -12,6 +12,7 @@ + @@ -30,6 +31,6 @@ - ID AS id, CATEGORY_ID AS categoryId, TYPE AS type, WEIGHT AS weight, IMAGE AS image, TITLE AS title, INTRODUCTION AS introduction, CONTENT AS content, LINK AS link, STATUS AS status, REASON AS reason, AUDITOR_TIME AS auditorTime, AUDITOR_ID AS auditorId, AUDITOR_NAME AS auditorName, CREATE_TIME AS createTime, CREATE_ID AS createId, CREATE_NAME AS createName, MODIFY_ID AS modifyId, MODIFY_NAME AS modifyName, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable + ID AS id, CATEGORY_ID AS categoryId, TYPE AS type, WEIGHT AS weight, IMAGE AS image, TITLE AS title, INTRODUCTION AS introduction, CONTENT AS content,CONTENT_TYPE as contentType LINK AS link, STATUS AS status, REASON AS reason, AUDITOR_TIME AS auditorTime, AUDITOR_ID AS auditorId, AUDITOR_NAME AS auditorName, CREATE_TIME AS createTime, CREATE_ID AS createId, CREATE_NAME AS createName, MODIFY_ID AS modifyId, MODIFY_NAME AS modifyName, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable 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 e44ef64..63adf0e 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 @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - ID AS id,TEMPLATE_VERSION_ID AS templateVersionId, CONTENT AS content, RICH_TEXT AS richTitle, RICH_TEXT AS richText, KEY_CODE AS keyCode, CREATE_TIME AS createTime, CREATE_ID AS createId, CREATE_NAME AS createName, MODIFY_ID AS modifyId, MODIFY_NAME AS modifyName, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable + ID AS id,TEMPLATE_VERSION_ID AS templateVersionId, CONTENT AS content,IS_RICH AS isRich, RICH_TEXT AS richTitle, RICH_TEXT AS richText, KEY_CODE AS keyCode, CREATE_TIME AS createTime, CREATE_ID AS createId, CREATE_NAME AS createName, MODIFY_ID AS modifyId, MODIFY_NAME AS modifyName, MODIFY_TIME AS modifyTime, IFDEL AS ifdel, ENABLE AS enable diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentArticles.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentArticles.java index 2e2c2fd..41d26e1 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentArticles.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentArticles.java @@ -34,7 +34,7 @@ public class ContentArticles implements Serializable { * 分类：1:孕期,2:育儿,3:其它 */ @TableField(value="TYPE") - private String type; + private int type; /** * 排序 */ @@ -56,6 +56,11 @@ public class ContentArticles implements Serializable { @TableField(value="INTRODUCTION") private String introduction; /** + * 内容类型 1:普通内容，2:专题内容 + */ + @TableField(value="CONTENT") + private int contentType; + /** * 正文 */ @TableField(value="CONTENT") @@ -148,11 +153,19 @@ public class ContentArticles implements Serializable { this.categoryId = categoryId; } - public String getType() { + public int getType() { return type; } - public void setType(String type) { + public int getContentType() { + return contentType; + } + + public void setContentType(int contentType) { + this.contentType = contentType; + } + + public void setType(int type) { this.type = type; } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java index 8ac9cbe..e2f072e 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/content/ContentMessageTemplate.java @@ -36,6 +36,10 @@ public class ContentMessageTemplate implements Serializable { @TableField(value="CONTENT") private String content; /** + * 是否图文 + */ + private String isRich; + /** * 富文本标题 */ @TableField(value="RICH_TITLE") @@ -139,6 +143,14 @@ public class ContentMessageTemplate implements Serializable { this.keyCode = keyCode; } + public String getIsRich() { + return isRich; + } + + public void setIsRich(String isRich) { + this.isRich = isRich; + } + public Date getCreateTime() { return createTime; } diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java index d4fcfbd..7ccfaca 100644 --- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java +++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java @@ -21,5 +21,6 @@ public interface ContentArticlesService extends BaseService { *
  • @return 大于0修改成功，否则为失败 */ public Integer deleteLogicById(Serializable id); - + + public boolean create(ContentArticles conArti); } 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 53e8ecd..33423fd 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 @@ -5,8 +5,10 @@ import com.lyms.base.common.dao.content.ContentArticlesMapper; import com.lyms.base.common.entity.content.ContentArticles; import com.lyms.base.common.service.content.ContentArticlesService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.io.Serializable; +import java.util.Date; /** *

    @@ -22,4 +24,14 @@ public class ContentArticlesServiceImpl extends ServiceImpl 0; + } } 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 31774e7..7742bea 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 @@ -1,9 +1,17 @@ package com.lyms.cm.controller.content; +import com.lyms.base.common.entity.content.ContentArticles; +import com.lyms.base.common.service.content.ContentArticlesService; +import com.lyms.base.common.vo.content.ContentArticlesVO; +import com.lyms.constants.OperationName; +import com.lyms.util.StrUtils; +import com.lyms.web.bean.AjaxResult; import com.lyms.web.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; /** *

    @@ -16,7 +24,9 @@ import org.springframework.web.bind.annotation.RequestMethod; @Controller @RequestMapping("/contentArticles") public class ContentArticlesController extends BaseController { - + @Autowired + private ContentArticlesService contentArticlesService; + /** * 跳转到新增页面 * @@ -36,5 +46,29 @@ public class ContentArticlesController extends BaseController { public String toList() { return "/articles/articles_list"; } + + @ResponseBody + @RequestMapping(value = "/create", method = { RequestMethod.POST }) + public AjaxResult create(ContentArticlesVO cav, AjaxResult ajaxResult) { + ContentArticles conArti = new ContentArticles(); + + conArti.setId(StrUtils.uuid()); + conArti.setCategoryId(cav.getCategoryId()); + conArti.setType(cav.getType()); + conArti.setWeight(cav.getWeight()); + conArti.setImage(cav.getImage()); + conArti.setTitle(cav.getTitle()); + conArti.setIntroduction(cav.getIntroduction()); + conArti.setContentType(cav.getContentType()); + conArti.setContent(cav.getContent()); + conArti.setLink(cav.getLink()); + + for (String tags:cav.getTags()){ + + + } + boolean tag = contentArticlesService.create(conArti); + return handleAjaxResult(ajaxResult, true, OperationName.CREATE); + } } 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 f96b308..b65b4e6 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 @@ -3,12 +3,17 @@ #select6 { width: 100%; height: 36px; + } - - - +/* +.tagsClass{ + width: 100%; + height: 36px; + min-height:36px; +}*/ +

    @@ -17,7 +22,7 @@
    -
    @@ -26,8 +31,8 @@
    - + @@ -38,17 +43,15 @@
    - +
    +
    - -
    - + +
    +
    @@ -63,6 +66,7 @@ onclick="switchContent(2)"> 专题内容 +
    -
    +
    - +
    @@ -131,7 +134,32 @@ - - + +
    -
    +
    - -
    + +
    - -
    - -
    + +
    +
    +
    - -
    + +
    - -
    + +
    - +
    @@ -76,20 +74,34 @@ var controllerRequestMappint = "/contentMessageTemplate/"; function addVer(){ layer.open({ type: 1 //Page层类型 - ,area: ['500px', '300px'] + ,area: ['530px', '300px'] ,title: '新增消息模板版本' ,shade: 0.6 //遮罩透明度 ,maxmin: true //允许全屏最小化 ,anim: 2 //0-6的动画形式，-1不开启 - ,content: "
    " + ,content: "
    " }); } + + function initTagsData(){ + $.get("${ctx}/contentTags/seleList", "json", function(data) { + if (data.success) { + var optionTagHtml = ""; + data.data.forEach(function(d, i) { + optionTagHtml += ''; + }); + $("#searchTags").append(optionTagHtml); + } + }); + } function saveVersion(){ - var verName = $("#verName").val(); - console.log(verName); - ajaxPost(APP.PATH +'/contentTemplateVersion/create',"versionName="+verName); - return false; + if($('#validForm').valid()){ + var verName = $("#verName").val(); + ajaxPost(APP.PATH +'/contentTemplateVersion/create',"versionName="+verName); + }else{ + return false; + } } function add() { var verId = $("#verId").val(); @@ -118,6 +130,9 @@ var controllerRequestMappint = "/contentMessageTemplate/"; } $(function(){ + initTagsData(); + + //获取消息模板版本列表 $.ajax({ url: "${ctx}/contentTemplateVersion/list", cache: false,