新开分支整理代码:

1.帮助文档修改功能
2.帮助文档与上一版对比功能
3.单点问题解决
4.markdown帮助文档

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
wangwenrui
2019-01-30 18:17:51 +08:00
committed by 段冬梅
parent 785150f921
commit db00cafd84
654 changed files with 138408 additions and 14 deletions

View File

@@ -0,0 +1,18 @@
package com.nis.web.dao.configuration;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nis.domain.configuration.HelpInfo;
import com.nis.domain.configuration.UserManage;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface HelpInfoDao extends CrudDao<HelpInfo>{
public List<HelpInfo> findComment(@Param("fileName")String fileName);
public List<HelpInfo> findBakComment(@Param("fileName")String fileName);
public List<HelpInfo> findAllComment();
public void saveHelpInfo(HelpInfo helpInfo);
}

View File

@@ -0,0 +1,34 @@
<?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.nis.web.dao.configuration.HelpInfoDao">
<resultMap id="helpInfoMap" type="com.nis.domain.configuration.HelpInfo" >
<id column="id" property="id" jdbcType="INTEGER"/>
<result column="file_name" property="fileName" jdbcType="VARCHAR"/>
<result column="file_comment" property="fileComment" jdbcType="VARCHAR"/>
<result column="back_file_comment" property="backFileComment" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询帮助文档内容 -->
<select id="findComment" parameterType="com.nis.domain.configuration.HelpInfo" resultMap="helpInfoMap">
select file_name,file_comment from help_document
<if test="fileName != null and fileName != ''">
where file_name=#{fileName}
</if>
</select>
<!-- 查询帮助文档上一版内容 -->
<select id="findBakComment" parameterType="com.nis.domain.configuration.HelpInfo" resultMap="helpInfoMap">
select file_name,back_file_comment from help_document
<if test="fileName != null and fileName != ''">
where file_name=#{fileName}
</if>
</select>
<!-- 获取帮助文档所有的信息 -->
<select id="findAllComment" parameterType="com.nis.domain.configuration.HelpInfo" resultMap="helpInfoMap">
select file_name,file_comment,back_file_comment from help_document
</select>
<!-- 保存修改内容,并备份 -->
<update id="saveHelpInfo" parameterType="com.nis.domain.configuration.HelpInfo">
update help_document set back_file_comment=file_comment,file_comment=#{fileComment} where file_name=#{fileName};
</update>
</mapper>