1.datagear适配达梦

2.图表对比展示修改
3.驱动程序支持导入导出
4.datagear_html_chart_compare中所有rows列改为CHART_ROWS列

application.properties

@@ -1,117 +1,124 @@
 #--UTF-8 file--
 
-#工作空间主目录，可在系统环境变量中设置此项以修改工作空间主目录
+#\u5DE5\u4F5C\u7A7A\u95F4\u4E3B\u76EE\u5F55\uFF0C\u53EF\u5728\u7CFB\u7EDF\u73AF\u5883\u53D8\u91CF\u4E2D\u8BBE\u7F6E\u6B64\u9879\u4EE5\u4FEE\u6539\u5DE5\u4F5C\u7A7A\u95F4\u4E3B\u76EE\u5F55
 DataGearWorkspace=${user.home}/.datagear
 
-#重设密码创建校验文件的目录
+#\u91CD\u8BBE\u5BC6\u7801\u521B\u5EFA\u6821\u9A8C\u6587\u4EF6\u7684\u76EE\u5F55
 directory.resetPasswordCheckFile=${user.home}
 
-#驱动程序管理主目录
+#\u9A71\u52A8\u7A0B\u5E8F\u7BA1\u7406\u4E3B\u76EE\u5F55
 directory.driver=${DataGearWorkspace}/driver
 
-#系统使用的derby数据库主目录
+#\u7CFB\u7EDF\u4F7F\u7528\u7684derby\u6570\u636E\u5E93\u4E3B\u76EE\u5F55
 directory.derby=${DataGearWorkspace}/derby
 
-#临时文件目录
+#\u4E34\u65F6\u6587\u4EF6\u76EE\u5F55
 directory.temp=${DataGearWorkspace}/temp
 
-#图表插件主目录
+#\u56FE\u8868\u63D2\u4EF6\u4E3B\u76EE\u5F55
 directory.chartPlugin=${DataGearWorkspace}/chartPlugin
 
-#看板主目录
+#\u770B\u677F\u4E3B\u76EE\u5F55
 directory.dashboard=${DataGearWorkspace}/dashboard
 
-#看板全局资源主目录
+#\u770B\u677F\u5168\u5C40\u8D44\u6E90\u4E3B\u76EE\u5F55
 directory.dashboardGlobalRes=${DataGearWorkspace}/dashboardGlobalRes
 
-#看板模板内引用全局资源的URL前缀，主要用于标识看版内的全局资源
-#应不以'/'开头且以'/'结尾，留空表示不设前缀
+#\u770B\u677F\u6A21\u677F\u5185\u5F15\u7528\u5168\u5C40\u8D44\u6E90\u7684URL\u524D\u7F00\uFF0C\u4E3B\u8981\u7528\u4E8E\u6807\u8BC6\u770B\u7248\u5185\u7684\u5168\u5C40\u8D44\u6E90
+#\u5E94\u4E0D\u4EE5'/'\u5F00\u5934\u4E14\u4EE5'/'\u7ED3\u5C3E\uFF0C\u7559\u7A7A\u8868\u793A\u4E0D\u8BBE\u524D\u7F00
 dashboardGlobalResUrlPrefix=global/
 
-#数据集文件主目录
+#\u6570\u636E\u96C6\u6587\u4EF6\u4E3B\u76EE\u5F55
 directory.dataSet=${DataGearWorkspace}/dataSet
 
-#数据编辑界面自定义URL构建器脚本文件
+#\u6570\u636E\u7F16\u8F91\u754C\u9762\u81EA\u5B9A\u4E49URL\u6784\u5EFA\u5668\u811A\u672C\u6587\u4EF6
 schemaUrlBuilderScriptFile=${DataGearWorkspace}/db_url_builder.js
 
-#已载入过的图表插件上次修改时间信息存储文件
+#\u5DF2\u8F7D\u5165\u8FC7\u7684\u56FE\u8868\u63D2\u4EF6\u4E0A\u6B21\u4FEE\u6539\u65F6\u95F4\u4FE1\u606F\u5B58\u50A8\u6587\u4EF6
 builtinChartPluginLastModifiedFile=${DataGearWorkspace}/builtinChartPluginLastModified
 
-#是否禁用匿名用户功能，禁用后，匿名用户将不能使用系统功能
-#可选值：true 表示禁用；false 表示不禁用
+#\u662F\u5426\u7981\u7528\u533F\u540D\u7528\u6237\u529F\u80FD\uFF0C\u7981\u7528\u540E\uFF0C\u533F\u540D\u7528\u6237\u5C06\u4E0D\u80FD\u4F7F\u7528\u7CFB\u7EDF\u529F\u80FD
+#\u53EF\u9009\u503C\uFF1Atrue \u8868\u793A\u7981\u7528\uFF1Bfalse \u8868\u793A\u4E0D\u7981\u7528
 disableAnonymous=false
 
-#是否禁用注册功能
-#可选值：true 表示禁用；false 表示不禁用
+#\u662F\u5426\u7981\u7528\u6CE8\u518C\u529F\u80FD
+#\u53EF\u9009\u503C\uFF1Atrue \u8868\u793A\u7981\u7528\uFF1Bfalse \u8868\u793A\u4E0D\u7981\u7528
 disableRegister=false
 
-#是否禁用检测新版本功能
-#可选值：true 表示禁用；false 表示不禁用
+#\u662F\u5426\u7981\u7528\u68C0\u6D4B\u65B0\u7248\u672C\u529F\u80FD
+#\u53EF\u9009\u503C\uFF1Atrue \u8868\u793A\u7981\u7528\uFF1Bfalse \u8868\u793A\u4E0D\u7981\u7528
 disableDetectNewVersion=false
 
-#默认角色，可选值：ROLE_DATA_ADMIN、ROLE_DATA_ANALYST
-#ROLE_DATA_ADMIN 数据管理员，可以管理数据源、数据集、图表、看板
-#ROLE_DATA_ANALYST 数据分析员，仅可查看数据源、数据集、图表、看板，展示图表和看板
-#默认角色：注册用户
+#\u9ED8\u8BA4\u89D2\u8272\uFF0C\u53EF\u9009\u503C\uFF1AROLE_DATA_ADMIN\u3001ROLE_DATA_ANALYST
+#ROLE_DATA_ADMIN \u6570\u636E\u7BA1\u7406\u5458\uFF0C\u53EF\u4EE5\u7BA1\u7406\u6570\u636E\u6E90\u3001\u6570\u636E\u96C6\u3001\u56FE\u8868\u3001\u770B\u677F
+#ROLE_DATA_ANALYST \u6570\u636E\u5206\u6790\u5458\uFF0C\u4EC5\u53EF\u67E5\u770B\u6570\u636E\u6E90\u3001\u6570\u636E\u96C6\u3001\u56FE\u8868\u3001\u770B\u677F\uFF0C\u5C55\u793A\u56FE\u8868\u548C\u770B\u677F
+#\u9ED8\u8BA4\u89D2\u8272\uFF1A\u6CE8\u518C\u7528\u6237
 defaultRole.register=ROLE_DATA_ADMIN
-#默认角色：管理员添加用户
+#\u9ED8\u8BA4\u89D2\u8272\uFF1A\u7BA1\u7406\u5458\u6DFB\u52A0\u7528\u6237
 defaultRole.add=ROLE_DATA_ADMIN
-#默认角色：匿名用户
+#\u9ED8\u8BA4\u89D2\u8272\uFF1A\u533F\u540D\u7528\u6237
 defaultRole.anonymous=ROLE_DATA_ADMIN
 
-#清理临时目录
-#可删除的过期文件分钟数
+#\u6E05\u7406\u4E34\u65F6\u76EE\u5F55
+#\u53EF\u5220\u9664\u7684\u8FC7\u671F\u6587\u4EF6\u5206\u949F\u6570
 cleanTempDirectory.expiredMinutes=1440
-#执行清理时间间隔
+#\u6267\u884C\u6E05\u7406\u65F6\u95F4\u95F4\u9694
 cleanTempDirectory.interval=0 0/10 * * * ?
 
-#数据库
+#\u6570\u636E\u5E93
 #datasource.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
 #datasource.url=jdbc:derby:${directory.derby};create=true
 #datasource.username=
 #datasource.password=
 
+#mysql\u914D\u7F6E
+#datasource.driverClassName=com.mysql.cj.jdbc.Driver
+#datasource.url=jdbc:mysql://localhost:3306/newdg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+#datasource.username=root
+##datasource.password=123456
+#datasource.password=rootroot
 
-datasource.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.url=jdbc:mysql://localhost:3306/newdg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
-datasource.username=root
+#\u8FBE\u68A6
+datasource.driverClassName=dm.jdbc.driver.DmDriver
+datasource.url=jdbc:dm://localhost:5236/DATAGEAR?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+datasource.username=DATAGEAR
 #datasource.password=123456
-datasource.password=root
+datasource.password=DATAGEAR123
 
 #datasource.driverClassName=com.mysql.cj.jdbc.Driver
 #datasource.url=jdbc:mysql://localhost:3306/newdg?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 #datasource.username=root
 #datasource.password=123456
 
-#数据库方言，可选项：derby、mysql、oracle、postgresql、default，留空则表示自动判断
+#\u6570\u636E\u5E93\u65B9\u8A00\uFF0C\u53EF\u9009\u9879\uFF1Aderby\u3001mysql\u3001oracle\u3001postgresql\u3001default\uFF0C\u7559\u7A7A\u5219\u8868\u793A\u81EA\u52A8\u5224\u65AD
 datasourceDialect=mysql
 
-#服务层缓存配置：
-#是否禁用缓存：true 禁用；false 启用
+#\u670D\u52A1\u5C42\u7F13\u5B58\u914D\u7F6E\uFF1A
+#\u662F\u5426\u7981\u7528\u7F13\u5B58\uFF1Atrue \u7981\u7528\uFF1Bfalse \u542F\u7528
 service.cache.disabled=false
-#缓存配置项
-#maximumSize 缓存容量，默认1000
-#expireAfterAccess 过期时间，默认3天（跨周末）
+#\u7F13\u5B58\u914D\u7F6E\u9879
+#maximumSize \u7F13\u5B58\u5BB9\u91CF\uFF0C\u9ED8\u8BA41000
+#expireAfterAccess \u8FC7\u671F\u65F6\u95F4\uFF0C\u9ED8\u8BA43\u5929\uFF08\u8DE8\u5468\u672B\uFF09
 service.cache.spec=maximumSize=1000,expireAfterAccess=3d
 
-#看板分享密码加密配置：
-#注意：修改这两项配置会导致系统内所有设置分享密码的看板在访问时校验密码失败，需登录系统重新设置所有看板分享密码！！！
-#密钥，默认为"DataGear"的base64编码值
+#\u770B\u677F\u5206\u4EAB\u5BC6\u7801\u52A0\u5BC6\u914D\u7F6E\uFF1A
+#\u6CE8\u610F\uFF1A\u4FEE\u6539\u8FD9\u4E24\u9879\u914D\u7F6E\u4F1A\u5BFC\u81F4\u7CFB\u7EDF\u5185\u6240\u6709\u8BBE\u7F6E\u5206\u4EAB\u5BC6\u7801\u7684\u770B\u677F\u5728\u8BBF\u95EE\u65F6\u6821\u9A8C\u5BC6\u7801\u5931\u8D25\uFF0C\u9700\u767B\u5F55\u7CFB\u7EDF\u91CD\u65B0\u8BBE\u7F6E\u6240\u6709\u770B\u677F\u5206\u4EAB\u5BC6\u7801\uFF01\uFF01\uFF01
+#\u5BC6\u94A5\uFF0C\u9ED8\u8BA4\u4E3A"DataGear"\u7684base64\u7F16\u7801\u503C
 dashboardSharePassword.crypto.secretKey=RGF0YUdlYXI=
-#盐值，应仅包含0-9、a-f、A-F字符、且长度为偶数的字符串，默认为"DataGear"的hex编码值
+#\u76D0\u503C\uFF0C\u5E94\u4EC5\u5305\u542B0-9\u3001a-f\u3001A-F\u5B57\u7B26\u3001\u4E14\u957F\u5EA6\u4E3A\u5076\u6570\u7684\u5B57\u7B26\u4E32\uFF0C\u9ED8\u8BA4\u4E3A"DataGear"\u7684hex\u7F16\u7801\u503C
 dashboardSharePassword.crypto.salt=4461746147656172
-#看板访问密码允许填错次数，-1表示不限制
+#\u770B\u677F\u8BBF\u95EE\u5BC6\u7801\u5141\u8BB8\u586B\u9519\u6B21\u6570\uFF0C-1\u8868\u793A\u4E0D\u9650\u5236
 dashboardSharePassword.authFailThreshold=5
-#看板访问密码允许填错次数的限定分钟数
+#\u770B\u677F\u8BBF\u95EE\u5BC6\u7801\u5141\u8BB8\u586B\u9519\u6B21\u6570\u7684\u9650\u5B9A\u5206\u949F\u6570
 dashboardSharePassword.authFailPastMinutes=60
 
-#Spring Boot配置
+#Spring Boot\u914D\u7F6E
 #-----------------------------------------
 
-#内嵌服务端口号
+#\u5185\u5D4C\u670D\u52A1\u7AEF\u53E3\u53F7
 server.port=50401
 server.servlet.session.cookie.name=qinnamin
 
-#lab2=https://blog.csdn.net/weixin_41129148/article/details/121208602
-lab2=http://localhost:8080/#/metaData-term
+lab2=https://blog.csdn.net/weixin_41129148/article/details/121208602
+#lab2=http://49.235.67.21/bdm/#/metaData-term
 #-----------------------------------------

datagear-management/src/main/java/org/datagear/management/mapper/HtmlChartCompareMapper.xml

@@ -5,11 +5,11 @@
     <id column="COMPARE_ID" property="compareId" jdbcType="VARCHAR" />
     <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="ROWS" property="rows" jdbcType="VARCHAR" />
+    <result column="CHART_ROWS" property="rows" jdbcType="VARCHAR" />
     <result column="NAME" property="name" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    COMPARE_ID, CREATE_USER, CREATE_TIME, ROWS, NAME
+    COMPARE_ID, CREATE_USER, CREATE_TIME, CHART_ROWS, NAME
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -22,8 +22,8 @@
     where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="org.datagear.management.domain.HtmlChartCompare" >
-    insert into datagear_html_chart_compare (COMPARE_ID, CREATE_USER, CREATE_TIME, 
-      ROWS, NAME)
+    insert into datagear_html_chart_compare (COMPARE_ID, CREATE_USER, CREATE_TIME,
+                                             CHART_ROWS, NAME)
     values (#{compareId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{rows,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR})
   </insert>
@@ -40,7 +40,7 @@
         CREATE_TIME,
       </if>
       <if test="rows != null" >
-        ROWS,
+        CHART_ROWS,
       </if>
       <if test="name != null" >
         NAME,
@@ -74,7 +74,7 @@
         CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="rows != null" >
-        ROWS = #{rows,jdbcType=VARCHAR},
+        CHART_ROWS = #{rows,jdbcType=VARCHAR},
       </if>
       <if test="name != null" >
         NAME = #{name,jdbcType=VARCHAR},
@@ -86,7 +86,7 @@
     update datagear_html_chart_compare
     set CREATE_USER = #{createUser,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      ROWS = #{rows,jdbcType=VARCHAR},
+        CHART_ROWS = #{rows,jdbcType=VARCHAR},
       NAME = #{name,jdbcType=VARCHAR}
     where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
   </update>

datagear-web/src/main/java/org/datagear/web/mapper/HtmlChartCompareMapper.xml

@@ -5,11 +5,11 @@
     <id column="COMPARE_ID" property="compareId" jdbcType="VARCHAR" />
     <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="ROWS" property="rows" jdbcType="VARCHAR" />
+    <result column="CHART_ROWS" property="rows" jdbcType="VARCHAR" />
     <result column="NAME" property="name" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    COMPARE_ID, CREATE_USER, CREATE_TIME, ROWS, NAME
+    COMPARE_ID, CREATE_USER, CREATE_TIME, CHART_ROWS, NAME
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -36,8 +36,8 @@
     where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="org.datagear.management.domain.HtmlChartCompare" >
-    insert into datagear_html_chart_compare (COMPARE_ID, CREATE_USER, CREATE_TIME, 
-      ROWS, NAME)
+    insert into datagear_html_chart_compare (COMPARE_ID, CREATE_USER, CREATE_TIME,
+                                             CHART_ROWS, NAME)
     values (#{compareId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{rows,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR})
   </insert>
@@ -54,7 +54,7 @@
         CREATE_TIME,
       </if>
       <if test="rows != null" >
-        ROWS,
+        CHART_ROWS,
       </if>
       <if test="name != null" >
         NAME,
@@ -88,7 +88,7 @@
         CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="rows != null" >
-        ROWS = #{rows,jdbcType=VARCHAR},
+        CHART_ROWS = #{rows,jdbcType=VARCHAR},
       </if>
       <if test="name != null" >
         NAME = #{name,jdbcType=VARCHAR},
@@ -100,7 +100,7 @@
     update datagear_html_chart_compare
     set CREATE_USER = #{createUser,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      ROWS = #{rows,jdbcType=VARCHAR},
+        CHART_ROWS = #{rows,jdbcType=VARCHAR},
       NAME = #{name,jdbcType=VARCHAR}
     where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
   </update>

datagear-web/src/main/resources/org/datagear/web/static/script/chartFactory.js

@@ -324,7 +324,8 @@
 			var cds = this.chartDataSets[i];
 			cds.propertySigns = (cds.propertySigns || {});
 			cds.alias = (cds.alias == null ?  "" : cds.alias);
-			cds.attachment = (cds.attachment == true ? true : false);
+			// cds.attachment = (cds.attachment == true ? true : false);
+			cds.attachment = false;
 			cds.query = (cds.query || {});
 			cds.query.paramValues = (cds.query.paramValues || {});
 			

datagear-web/src/main/resources/org/datagear/web/templates/chartCompare/chartcompare_grid.ftl

@@ -43,17 +43,18 @@ boolean readonly 是否只读操作，默认为false
                 <#if readonly>
                     <input class="el-button el-button--primary" name="viewButton" type="button" value="<@spring.message code='view' />" />
                 <#else>
-                    <#if !selectOperation>
-                        <div class="showGroup">
-                            <input class="el-button el-button--primary" name="showButton" type="button" value="<@spring.message code='chart.show' />" />
-                            <select class="showGroupSelect">
-                                <option value="copyShowURL"><@spring.message code='copyShowURL' /></option>
-                            </select>
-                            <button type="button" class="copyShowURLDelegation" style="display:none;">&nbsp;</button>
-                        </div>
+<#--                    <#if !selectOperation>-->
+<#--                        <div class="showGroup">-->
+<#--                            <input class="el-button el-button--primary" name="showButton" type="button" value="<@spring.message code='chart.show' />" />-->
+<#--                            <select class="showGroupSelect">-->
+<#--                                <option value="copyShowURL"><@spring.message code='copyShowURL' /></option>-->
+<#--                            </select>-->
+<#--                            <button type="button" class="copyShowURLDelegation" style="display:none;">&nbsp;</button>-->
+<#--                        </div>-->
 
-                    </#if>
-                    <input class="el-button el-button--primary" name="viewButton" type="button" value="<@spring.message code='view' />" />
+<#--                    </#if>-->
+<#--                    <input class="el-button el-button--primary" name="viewButton" type="button" value="<@spring.message code='view' />" />-->
+                    <input class="el-button el-button--primary" name="viewButton" type="button" value="<@spring.message code='chart.show' />" />
                     <#if !selectOperation>
                         <input class="el-button el-button--danger" name="deleteButton" type="button" value="<@spring.message code='delete' />" show-any-role="${Role.ROLE_DATA_ADMIN}" />
                     </#if>

datagear-web/src/main/resources/org/datagear/web/templates/driverEntity/driverEntity_grid.ftl

@@ -33,14 +33,12 @@ selectOperation 是否选择操作，允许为null
 			<#if selectOperation>
 				<input name="confirmButton" type="button" class="recommended" value="<@spring.message code='confirm' />" />
 				<input name="viewButton" type="button" value="<@spring.message code='view' />" />
-			<#else>
-				<#--
+<#--			<#else>-->
 				<input name="importButton" type="button" value="<@spring.message code='import' />" />
 				<input name="exportButton" type="button" value="<@spring.message code='export' />" />
-				-->
-				<input name="addButton" type="button" value="<@spring.message code='add' />" />
-				<input name="editButton" type="button" value="<@spring.message code='edit' />" />
-				<input name="viewButton" type="button" value="<@spring.message code='view' />" />
+<#--				<input name="addButton" type="button" value="<@spring.message code='add' />" />-->
+<#--				<input name="editButton" type="button" value="<@spring.message code='edit' />" />-->
+<#--				<input name="viewButton" type="button" value="<@spring.message code='view' />" />-->
 				<input name="deleteButton" type="button" value="<@spring.message code='delete' />" />
 			</#if>
 		</div>

datagear-web/src/main/webapp/WEB-INF/classes/org/datagear/web/mapper/HtmlChartCompareMapper.xml

@@ -5,11 +5,11 @@
     <id column="COMPARE_ID" property="compareId" jdbcType="VARCHAR" />
     <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="ROWS" property="rows" jdbcType="VARCHAR" />
+    <result column="CHART_ROWS" property="rows" jdbcType="VARCHAR" />
     <result column="NAME" property="name" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
-    COMPARE_ID, CREATE_USER, CREATE_TIME, ROWS, NAME
+    COMPARE_ID, CREATE_USER, CREATE_TIME, CHART_ROWS, NAME
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -36,8 +36,8 @@
     where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="org.datagear.management.domain.HtmlChartCompare" >
-    insert into datagear_html_chart_compare (COMPARE_ID, CREATE_USER, CREATE_TIME, 
-      ROWS, NAME)
+    insert into datagear_html_chart_compare (COMPARE_ID, CREATE_USER, CREATE_TIME,
+                                             CHART_ROWS, NAME)
     values (#{compareId,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{rows,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR})
   </insert>
@@ -54,7 +54,7 @@
         CREATE_TIME,
       </if>
       <if test="rows != null" >
-        ROWS,
+        CHART_ROWS,
       </if>
       <if test="name != null" >
         NAME,
@@ -88,7 +88,7 @@
         CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="rows != null" >
-        ROWS = #{rows,jdbcType=VARCHAR},
+        CHART_ROWS = #{rows,jdbcType=VARCHAR},
       </if>
       <if test="name != null" >
         NAME = #{name,jdbcType=VARCHAR},
@@ -100,7 +100,7 @@
     update datagear_html_chart_compare
     set CREATE_USER = #{createUser,jdbcType=VARCHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      ROWS = #{rows,jdbcType=VARCHAR},
+        CHART_ROWS = #{rows,jdbcType=VARCHAR},
       NAME = #{name,jdbcType=VARCHAR}
     where COMPARE_ID = #{compareId,jdbcType=VARCHAR}
   </update>

pom.xml

@@ -60,6 +60,17 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.dameng</groupId>
+			<artifactId>Dm7JdbcDriver17</artifactId>
+			<version>7.6.0.77</version>
+			<exclusions>
+				<exclusion>
+					<groupId>jdk.tools</groupId>
+					<artifactId>jdk.tools</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>