Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/controller/HelpCenterCatalogController.java

@@ -0,0 +1,77 @@
+package com.ym.mec.cms.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.cms.dal.entity.HelpCenterCatalog;
+import com.ym.mec.cms.service.HelpCenterCatalogService;
+import com.ym.mec.cms.service.HelpCenterContentService;
+import com.ym.mec.common.controller.BaseController;
+
+@RestController
+@RequestMapping("helpCenterCatalog")
+@Api(tags = "帮助中心分类")
+public class HelpCenterCatalogController extends BaseController {
+
+	@Autowired
+	private HelpCenterCatalogService helpCenterCatalogService;
+
+	@Autowired
+	private HelpCenterContentService helpCenterContentService;
+
+	@GetMapping(value = "list")
+	@ApiImplicitParams({ @ApiImplicitParam(name = "parentId", value = "父分类编号（可为空）", required = true, dataType = "Integer"),
+			@ApiImplicitParam(name = "status", value = "状态(1，显示 0，隐藏；可为空)", required = true, dataType = "Integer") })
+	public Object list(Integer parentId, Integer status) {
+		List<HelpCenterCatalog> dataList = helpCenterCatalogService.queryByParentId(parentId, status);
+		return succeed(dataList);
+	}
+
+	@GetMapping(value = "get")
+	@ApiImplicitParam(name = "id", value = "分类编号", required = true, dataType = "Integer", paramType = "path")
+	public Object findHelpCatalogById(Integer id) {
+		if (id == null || id <= 0)
+			return failed("请检查输入的ID");
+		return succeed(helpCenterCatalogService.get(id));
+	}
+
+	@PostMapping(value = "modify", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object modifyHelpCatalog(HelpCenterCatalog helpCatalog) {
+		if (helpCatalog == null)
+			return failed("参数输入有误");
+		if (helpCatalog.getId() != null && helpCatalog.getId() > 0) {
+			helpCatalog.setModifyOn(new Date());
+			return helpCenterCatalogService.updateCatalog(helpCatalog) ? succeed() : failed("修改失败");
+		} else {
+			if (StringUtils.isBlank(helpCatalog.getText())) {
+				return failed("帮助分类不能为空");
+			}
+			helpCatalog.setCreateOn(new Date());
+			return helpCenterCatalogService.insert(helpCatalog) > 0 ? succeed() : failed("添加失败");
+		}
+	}
+
+	@PostMapping(value = "delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@ApiImplicitParam(name = "id", value = "分类编号", required = true, dataType = "Integer", paramType = "path")
+	public Object delHelpCatalog(Integer id) {
+		if (id == null || id <= 0)
+			return failed("ID解析失败");
+		List<HelpCenterCatalog> list = helpCenterCatalogService.queryByParentId(id, null);
+		if (list != null && list.size() > 0) {
+			return failed("删除失败,请先删除子集分类");
+		}
+		return helpCenterCatalogService.deleteCatalog(id) ? succeed() : failed("删除失败");
+	}
+}

cms/src/main/java/com/ym/mec/cms/controller/HelpCenterContentControlller.java

@@ -0,0 +1,83 @@
+package com.ym.mec.cms.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+
+import java.util.Date;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.cms.controller.queryinfo.HelpCenterContentQueryInfo;
+import com.ym.mec.cms.dal.entity.HelpCenterContent;
+import com.ym.mec.cms.service.HelpCenterCatalogService;
+import com.ym.mec.cms.service.HelpCenterContentService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.PageInfo;
+
+@RestController
+@RequestMapping("helpCenterContent")
+@Api(tags = "帮助中心内容")
+public class HelpCenterContentControlller extends BaseController {
+
+	@Autowired
+	private HelpCenterContentService helpCenterContentService;
+
+	@Autowired
+	private HelpCenterCatalogService helpCenterCatalogService;
+
+	@GetMapping(value = "list")
+	public Object findHelpContentByCondition(HelpCenterContentQueryInfo queryInfo) {
+
+		queryInfo.setSort("order_");
+		queryInfo.setOrder("asc");
+		PageInfo<HelpCenterContent> data = helpCenterContentService.queryPage(queryInfo);
+		return succeed(data);
+	}
+
+	@GetMapping(value = "get")
+	@ApiImplicitParam(name = "id", value = "编号", required = true, dataType = "Integer", paramType = "path")
+	public Object findHelpContentByKey(Integer id) {
+		if (id == null || id <= 0) {
+			return failed("请检查输入的参数");
+		}
+		return succeed(helpCenterContentService.get(id));
+	}
+
+	@PostMapping(value = "modify", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	public Object modifyHelpContent(HelpCenterContent helpContent) {
+		if (helpContent == null) {
+			return failed("参数输入有误");
+		}
+
+		if (helpContent.getId() != null && helpContent.getId() > 0) {
+			helpContent.setModifyOn(new Date());
+			return helpCenterContentService.update(helpContent) > 0 ? succeed() : failed("修改失败");
+		} else {
+			if (StringUtils.isBlank(helpContent.getContent())) {
+				return failed("帮助内容不能为空");
+			}
+			if (StringUtils.isBlank(helpContent.getTitle())) {
+				return failed("帮助中心标题不能为空");
+			}
+			if (helpContent.getCatalogId() < 0) {
+				return failed("请选择分类");
+			}
+			helpContent.setCreateOn(new Date());
+			return helpCenterContentService.insert(helpContent) > 0 ? succeed() : failed("添加失败");
+		}
+	}
+
+	@PostMapping(value = "delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+	@ApiImplicitParam(name = "id", value = "编号", required = true, dataType = "Integer", paramType = "path")
+	public Object delHelpContent(Integer id) {
+		if (id == null || id <= 0)
+			return failed("ID解析失败");
+		return helpCenterContentService.delete(id) > 0 ? succeed() : failed("删除失败");
+	}
+}

cms/src/main/java/com/ym/mec/cms/controller/queryinfo/HelpCenterContentQueryInfo.java

@@ -0,0 +1,42 @@
+package com.ym.mec.cms.controller.queryinfo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class HelpCenterContentQueryInfo extends QueryInfo {
+
+	@ApiModelProperty(value = "父分类ID，多个用逗号分隔", required = false)
+	private String catalogIds;
+
+	@ApiModelProperty(value = "标题", required = false)
+	private String title;
+
+	@ApiModelProperty(value = "状态（1-显示 0-隐藏）", required = false)
+	private Integer status;
+
+	public String getCatalogIds() {
+		return catalogIds;
+	}
+
+	public void setCatalogIds(String catalogIds) {
+		this.catalogIds = catalogIds;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+}

cms/src/main/java/com/ym/mec/cms/dal/dao/HelpCenterCatalogDao.java

@@ -0,0 +1,13 @@
+package com.ym.mec.cms.dal.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.cms.dal.entity.HelpCenterCatalog;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface HelpCenterCatalogDao extends BaseDAO<Integer, HelpCenterCatalog> {
+
+	public List<HelpCenterCatalog> queryByParentId(@Param("parentId") Integer parentId, @Param("status") Integer status);
+}

cms/src/main/java/com/ym/mec/cms/dal/dao/HelpCenterContentDao.java

@@ -0,0 +1,13 @@
+package com.ym.mec.cms.dal.dao;
+
+import java.util.Map;
+
+import com.ym.mec.cms.dal.entity.HelpCenterContent;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface HelpCenterContentDao extends BaseDAO<Integer, HelpCenterContent> {
+
+	public int updateContentByCatalog(Map<String, Object> map);
+
+	public int deleteContentByCatalog(Integer catalogId);
+}

cms/src/main/java/com/ym/mec/cms/dal/entity/HelpCenterCatalog.java

@@ -0,0 +1,126 @@
+package com.ym.mec.cms.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class HelpCenterCatalog {
+
+	@ApiModelProperty(value = "编号", required = false)
+	private Integer id;
+
+	@ApiModelProperty(value = "父分类ID", required = false)
+	private Integer parentId;
+
+	@ApiModelProperty(value = "分类名称", required = false)
+	private String text;
+
+	@ApiModelProperty(value = "描述", required = false)
+	private String description;
+
+	/**  */
+	private java.util.Date createOn;
+
+	/**  */
+	private java.util.Date modifyOn;
+
+	@ApiModelProperty(value = "排序", required = false)
+	private Integer order;
+
+	/**
+	 * 子集合
+	 */
+	private List<HelpCenterCatalog> children;
+
+	@ApiModelProperty(value = "状态 1 显示 0隐藏", required = false)
+	private Integer status;
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getId() {
+		return this.id;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+	public List<HelpCenterCatalog> getChildren() {
+		return children;
+	}
+
+	public void setChildren(List<HelpCenterCatalog> children) {
+		this.children = children;
+	}
+
+	public void setParentId(Integer parentId) {
+		this.parentId = parentId;
+	}
+
+	public Integer getParentId() {
+		return this.parentId;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	public void setCreateOn(java.util.Date createOn) {
+		this.createOn = createOn;
+	}
+
+	public java.util.Date getCreateOn() {
+		return this.createOn;
+	}
+
+	public void setModifyOn(java.util.Date modifyOn) {
+		this.modifyOn = modifyOn;
+	}
+
+	public java.util.Date getModifyOn() {
+		return this.modifyOn;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Integer getStatus() {
+		return this.status;
+	}
+
+	public String toString() {
+		StringBuilder buf = new StringBuilder();
+		buf.append("HelpCatalog [");
+		buf.append("id=").append(id).append(",");
+		buf.append("parentId=").append(parentId).append(",");
+		buf.append("text=").append(text).append(",");
+		buf.append("description=").append(description).append(",");
+		buf.append("createOn=").append(createOn).append(",");
+		buf.append("modifyOn=").append(modifyOn).append(",");
+		buf.append("order=").append(order).append(",");
+		buf.append("status=").append(status).append(",");
+		buf.setLength(buf.length() - 1);
+		buf.append("]");
+		return buf.toString();
+	}
+
+}

cms/src/main/java/com/ym/mec/cms/dal/entity/HelpCenterContent.java

@@ -0,0 +1,121 @@
+package com.ym.mec.cms.dal.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class HelpCenterContent {
+
+	@ApiModelProperty(value = "编号", required = false)
+	private Integer id;
+
+	@ApiModelProperty(value = "标题", required = false)
+	private String title;
+
+	@ApiModelProperty(value = "内容", required = false)
+	private String content = "";
+
+	@ApiModelProperty(value = "分类ID", required = false)
+	private Integer catalogId;
+
+	/** 创建时间 */
+	private java.util.Date createOn;
+
+	/** 修改时间 */
+	private java.util.Date modifyOn;
+
+	@ApiModelProperty(value = "状态 1显示 0隐藏", required = false)
+	private Integer status;
+
+	@ApiModelProperty(value = "排序", required = false)
+	private Integer order;
+
+	private HelpCenterCatalog catalog;
+
+	public HelpCenterCatalog getCatalog() {
+		return catalog;
+	}
+
+	public void setCatalog(HelpCenterCatalog catalog) {
+		this.catalog = catalog;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getId() {
+		return this.id;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getTitle() {
+		return this.title;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getContent() {
+		return this.content;
+	}
+
+	public void setCatalogId(Integer catalogId) {
+		this.catalogId = catalogId;
+	}
+
+	public Integer getCatalogId() {
+		return this.catalogId;
+	}
+
+	public void setCreateOn(java.util.Date createOn) {
+		this.createOn = createOn;
+	}
+
+	public java.util.Date getCreateOn() {
+		return this.createOn;
+	}
+
+	public void setModifyOn(java.util.Date modifyOn) {
+		this.modifyOn = modifyOn;
+	}
+
+	public java.util.Date getModifyOn() {
+		return this.modifyOn;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Integer getStatus() {
+		return this.status;
+	}
+
+	public String toString() {
+		StringBuilder buf = new StringBuilder();
+		buf.append("HelpContent [");
+		buf.append("id=").append(id).append(",");
+		buf.append("title=").append(title).append(",");
+		buf.append("content=").append(content).append(",");
+		buf.append("order=").append(order).append(",");
+		buf.append("catalogId=").append(catalogId).append(",");
+		buf.append("createOn=").append(createOn).append(",");
+		buf.append("modifyOn=").append(modifyOn).append(",");
+		buf.append("status=").append(status).append(",");
+		buf.setLength(buf.length() - 1);
+		buf.append("]");
+		return buf.toString();
+	}
+
+}

cms/src/main/java/com/ym/mec/cms/service/HelpCenterCatalogService.java

@@ -0,0 +1,31 @@
+package com.ym.mec.cms.service;
+
+import java.util.List;
+
+import com.ym.mec.cms.dal.entity.HelpCenterCatalog;
+import com.ym.mec.common.service.BaseService;
+
+public interface HelpCenterCatalogService extends BaseService<Integer, HelpCenterCatalog> {
+
+	/**
+	 * 根据父节点查询所有子节点对象
+	 * @param parentId 父节点（可为null）
+	 * @param status 状态（可为null）
+	 * @return
+	 */
+	public List<HelpCenterCatalog> queryByParentId(Integer parentId, Integer status);
+
+	/**
+	 * 修改分类信息
+	 * @param catalog
+	 * @return
+	 */
+	public boolean updateCatalog(HelpCenterCatalog catalog);
+
+	/**
+	 * 删除分类信息
+	 * @param id
+	 * @return
+	 */
+	public boolean deleteCatalog(Integer id);
+}

cms/src/main/java/com/ym/mec/cms/service/HelpCenterContentService.java

@@ -0,0 +1,11 @@
+package com.ym.mec.cms.service;
+
+import com.ym.mec.cms.dal.entity.HelpCenterContent;
+import com.ym.mec.common.service.BaseService;
+
+public interface HelpCenterContentService extends BaseService<Integer,HelpCenterContent>{
+	
+	public boolean updateContentByCatalog(Integer catalogId,Integer status);
+	
+	public boolean deleteContentByCatalog(Integer catalogId);
+}

cms/src/main/java/com/ym/mec/cms/service/impl/HelpCenterCatalogServiceImpl.java

@@ -0,0 +1,56 @@
+package com.ym.mec.cms.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.cms.dal.dao.HelpCenterCatalogDao;
+import com.ym.mec.cms.dal.entity.HelpCenterCatalog;
+import com.ym.mec.cms.service.HelpCenterCatalogService;
+import com.ym.mec.cms.service.HelpCenterContentService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class HelpCenterCatalogServiceImpl extends BaseServiceImpl<Integer, HelpCenterCatalog> implements HelpCenterCatalogService {
+
+	@Autowired
+	private HelpCenterCatalogDao helpCenterCatalogDao;
+
+	@Autowired
+	private HelpCenterContentService helpCenterContentService;
+
+	@Override
+	public BaseDAO<Integer, HelpCenterCatalog> getDAO() {
+
+		return helpCenterCatalogDao;
+	}
+
+	@Override
+	public List<HelpCenterCatalog> queryByParentId(Integer parentId, Integer status) {
+
+		List<HelpCenterCatalog> dataList = helpCenterCatalogDao.queryByParentId(parentId, status);
+		if (dataList != null) {
+			for (HelpCenterCatalog sub : dataList) {
+				List<HelpCenterCatalog> subList = helpCenterCatalogDao.queryByParentId(sub.getId(), status);
+				if (subList == null) {
+					continue;
+				}
+				sub.setChildren(subList);
+				queryByParentId(sub.getId(), status);
+			}
+		}
+		return dataList;
+	}
+
+	public boolean updateCatalog(HelpCenterCatalog catalog) {
+		return helpCenterCatalogDao.update(catalog) > 0 && helpCenterContentService.updateContentByCatalog(catalog.getId(), catalog.getStatus());
+	}
+
+	@Override
+	public boolean deleteCatalog(Integer id) {
+		return helpCenterCatalogDao.delete(id) > 0 && helpCenterContentService.deleteContentByCatalog(id);
+	}
+
+}

cms/src/main/java/com/ym/mec/cms/service/impl/HelpCenterContentServiceImpl.java

@@ -0,0 +1,41 @@
+package com.ym.mec.cms.service.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.cms.dal.dao.HelpCenterContentDao;
+import com.ym.mec.cms.dal.entity.HelpCenterContent;
+import com.ym.mec.cms.service.HelpCenterContentService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class HelpCenterContentServiceImpl extends BaseServiceImpl<Integer, HelpCenterContent> implements HelpCenterContentService {
+
+	@Autowired
+	private HelpCenterContentDao contentCenterDao;
+
+	@Override
+	public BaseDAO<Integer, HelpCenterContent> getDAO() {
+		return contentCenterDao;
+	}
+
+	@Override
+	public boolean updateContentByCatalog(Integer catalogId, Integer status) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("catalogId", catalogId);
+		map.put("status", status);
+		contentCenterDao.updateContentByCatalog(map);
+		return true;
+	}
+
+	@Override
+	public boolean deleteContentByCatalog(Integer catalogId) {
+		contentCenterDao.deleteContentByCatalog(catalogId);
+		return true;
+	}
+
+}

cms/src/main/resources/config/mybatis/HelpCenterCatalogMapper.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ym.mec.cms.dal.dao.HelpCenterCatalogDao">
+	<resultMap id="HelpCenterCatalog" type="com.ym.mec.cms.dal.entity.HelpCenterCatalog">
+		<id column="id_" property="id" jdbcType="INTEGER" />
+		<result column="parent_id_" property="parentId" jdbcType="INTEGER" />
+		<result column="name_" property="text" jdbcType="VARCHAR" />
+		<result column="description_" property="description" jdbcType="VARCHAR" />
+		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
+		<result column="modify_on_" property="modifyOn" jdbcType="TIMESTAMP" />
+		<result column="order_" property="order" jdbcType="INTEGER" />
+		<result column="status_" property="status" jdbcType="INTEGER" />
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		id_, parent_id_, name_, description_, create_on_, modify_on_, order_,status_
+	</sql>
+
+	<select id="get" resultMap="HelpCenterCatalog" parameterType="java.lang.Integer">
+		select
+		<include refid="Base_Column_List" />
+		from help_center_catalog
+		where id_ = #{id,jdbcType=INTEGER}
+	</select>
+
+	<select id="queryPage" parameterType="map" resultMap="HelpCenterCatalog">
+		select
+		<include refid="Base_Column_List" />
+		from
+		help_center_catalog
+		order by order_ asc
+	</select>
+
+	<select id="queryByParentId" parameterType="map" resultMap="HelpCenterCatalog">
+		select
+		<include refid="Base_Column_List" />
+		from
+		help_center_catalog
+		where 1 = 1
+		<if test="parentId != null">
+			and parent_id_= #{parentId,jdbcType=INTEGER}
+		</if>
+		<if test="status != null">
+			and status_ = #{status,jdbcType=INTEGER}
+		</if>
+		order by order_ desc
+	</select>
+
+	<delete id="delete" parameterType="java.lang.Integer">
+		delete from help_center_catalog
+		where id_ = #{id,jdbcType=INTEGER}
+	</delete>
+	
+	<delete id="batchDelete" parameterType="String">
+		delete from help_center_catalog
+		where id_ in #{ids}
+	</delete>
+	
+	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.HelpCenterCatalog">
+		insert into help_center_catalog (id_, parent_id_, name_,
+		description_, create_on_, modify_on_,
+		order_,status_)
+		values (#{id,jdbcType=INTEGER}, #{parentId,jdbcType=INTEGER},
+		#{text,jdbcType=VARCHAR},
+		#{description,jdbcType=VARCHAR}, #{createOn,jdbcType=TIMESTAMP}, #{modifyOn,jdbcType=TIMESTAMP},
+		#{order,jdbcType=INTEGER},#{status,jdbcType=INTEGER})
+	</insert>
+	
+	<update id="update" parameterType="com.ym.mec.cms.dal.entity.HelpCenterCatalog">
+		update help_center_catalog
+		<set>
+			<if test="parentId != null">
+				parent_id_ = #{parentId,jdbcType=INTEGER},
+			</if>
+			<if test="text != null">
+				name_ = #{text,jdbcType=VARCHAR},
+			</if>
+			<if test="description != null">
+				description_ = #{description,jdbcType=VARCHAR},
+			</if>
+			<if test="createOn != null">
+				create_on_ = #{createOn,jdbcType=TIMESTAMP},
+			</if>
+			<if test="modifyOn != null">
+				modify_on_ = #{modifyOn,jdbcType=TIMESTAMP},
+			</if>
+			<if test="order != null">
+				order_ = #{order,jdbcType=INTEGER},
+			</if>
+			<if test="status != null">
+				status_ = #{status,jdbcType=INTEGER},
+			</if>
+		</set>
+		where id_ = #{id,jdbcType=INTEGER}
+	</update>
+</mapper>

cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ym.mec.cms.dal.dao.HelpCenterContentDao">
+	<resultMap id="HelpCenterContent" type="com.ym.mec.cms.dal.entity.HelpCenterContent">
+		<id column="id_" property="id" jdbcType="INTEGER" />
+		<result column="title_" property="title" jdbcType="VARCHAR" />
+		<result column="create_on_" property="createOn" jdbcType="TIMESTAMP" />
+		<result column="modify_on_" property="modifyOn" jdbcType="TIMESTAMP" />
+		<result column="status_" property="status" jdbcType="INTEGER" />
+		<result column="order_" property="order" jdbcType="INTEGER" />
+		<result column="catalog_id_" property="catalogId" jdbcType="INTEGER" />
+		<association property="catalog" 
+			javaType="com.ym.mec.cms.dal.entity.HelpCenterCatalog">
+			<result column="catalog_id_" property="id" />
+			<result column="name_" property="text" />
+			<result column="parent_id_" property="parentId" />
+		</association>
+	</resultMap>
+
+	<resultMap id="HelpCenterContentBlobs" type="com.ym.mec.cms.dal.entity.HelpCenterContent"
+		extends="HelpCenterContent">
+		<result column="content_" property="content" jdbcType="LONGVARCHAR" />
+	</resultMap>
+	<!-- 查询条件 -->
+	<sql id="queryConditionUnion">
+		<where>
+			<if test="catalogIds != null">
+				and content.catalog_id_ in (${catalogIds})
+			</if>
+			<if test="title!= null and title != ''">
+				and content.title_ like '%' #{title} '%'
+			</if>
+			<if test="status!= null">
+				and content.status_ = #{status}
+			</if>
+		</where>
+	</sql>
+	
+	<sql id="Base_Column_List">
+		id_, title_, catalog_id_, create_on_, modify_on_,status_,order_
+	</sql>
+
+	<sql id="Base_Column_List_union">
+		content.id_, content.title_, content.catalog_id_,
+		content.create_on_,
+		content.modify_on_,content.status_,content.content_,content.order_,
+		catalog.id_,
+		catalog.name_, catalog.parent_id_
+	</sql>
+
+	<sql id="Blob_Column_List">
+		content_
+	</sql>
+
+	<select id="get" resultMap="HelpCenterContentBlobs" parameterType="java.lang.Integer">
+		select
+		<include refid="Base_Column_List_union" />
+		from help_center_content content left join help_center_catalog catalog on
+		content.catalog_id_=catalog.id_
+		where content.id_ =
+		#{id,jdbcType=INTEGER}
+	</select>
+
+	<select id="queryPage" parameterType="map" resultMap="HelpCenterContentBlobs">
+		select
+		<include refid="Base_Column_List_union" />
+		from help_center_content content left join help_center_catalog catalog on
+		content.catalog_id_=catalog.id_
+		<include refid="queryConditionUnion" />
+		order by order_ asc
+		<include refid="global.limit" />
+	</select>
+
+	<select id="findCount" parameterType="map" resultType="int">
+		select count(*) from help_center_content content left join help_center_catalog catalog on
+		content.catalog_id_=catalog.id_
+		<include refid="queryConditionUnion" />
+	</select>
+
+	<delete id="delete" parameterType="java.lang.Integer">
+		delete from help_center_content
+		where id_ = #{id,jdbcType=INTEGER}
+	</delete>
+	
+	<delete id="deleteContentByCatalog" parameterType="java.lang.Integer">
+		delete from help_center_content
+		where catalog_id_ = #{catalogId,jdbcType=INTEGER}
+	</delete>
+
+	<insert id="insert" parameterType="com.ym.mec.cms.dal.entity.HelpCenterContent">
+		insert into help_center_content
+		(id_, title_, catalog_id_,
+		create_on_, modify_on_, content_,status_,order_
+		)
+		values
+		(#{id,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR},
+		#{catalogId,jdbcType=INTEGER},
+		#{createOn,jdbcType=TIMESTAMP},
+		#{modifyOn,jdbcType=TIMESTAMP}, #{content,jdbcType=LONGVARCHAR},#{status,jdbcType=INTEGER},#{order,jdbcType=INTEGER}
+		)
+	</insert>
+
+	<update id="update" parameterType="com.ym.mec.cms.dal.entity.HelpCenterContent">
+		update help_center_content
+		<set>
+			<if test="title != null">
+				title_ = #{title,jdbcType=VARCHAR},
+			</if>
+			<if test="catalogId != null">
+				catalog_id_ = #{catalogId,jdbcType=INTEGER},
+			</if>
+			<if test="createOn != null">
+				create_on_ = #{createOn,jdbcType=TIMESTAMP},
+			</if>
+			<if test="modifyOn != null">
+				modify_on_ = #{modifyOn,jdbcType=TIMESTAMP},
+			</if>
+			<if test="content != null">
+				content_ = #{content,jdbcType=LONGVARCHAR},
+			</if>
+			<if test="status != null">
+				status_ = #{status,jdbcType=INTEGER},
+			</if>
+			<if test="order != null">
+				order_ = #{order,jdbcType=INTEGER},
+			</if>
+		</set>
+		where id_ = #{id,jdbcType=INTEGER}
+	</update>
+
+	<update id="updateBlobs" parameterType="com.ym.mec.cms.dal.entity.HelpCenterContent">
+		update help_center_content
+		set title_ = #{title,jdbcType=VARCHAR},
+		catalog_id_ =
+		#{catalogId,jdbcType=INTEGER},
+		create_on_ =
+		#{createOn,jdbcType=TIMESTAMP},
+		modify_on_ =
+		#{modifyOn,jdbcType=TIMESTAMP},
+		content_ =
+		#{content,jdbcType=LONGVARCHAR},
+		status_= #{status,jdbcType=INTEGER},
+		order_= #{order,jdbcType=INTEGER}
+		where id_ = #{id,jdbcType=INTEGER}
+	</update>
+
+	<update id="updateByKey" parameterType="com.ym.mec.cms.dal.entity.HelpCenterContent">
+		update help_center_content
+		set title_ = #{title,jdbcType=VARCHAR},
+		catalog_id_ =
+		#{catalogId,jdbcType=INTEGER},
+		create_on_ =
+		#{createOn,jdbcType=TIMESTAMP},
+		modify_on_ =
+		#{modifyOn,jdbcType=TIMESTAMP},
+		status_ = #{status,jdbcType=INTEGER},
+		order_ = #{order,jdbcType=INTEGER},
+		where id_ = #{id,jdbcType=INTEGER}
+	</update>
+	
+	<update id="updateContentByCatalog" parameterType="map">
+		update help_center_content set status_=#{status} where catalog_id_=#{catalogId}
+	</update>
+</mapper>