From e44f798db447950d2bf1ce112d4fb2c30f2758d2 Mon Sep 17 00:00:00 2001 From: xu_lw Date: Thu, 22 Aug 2019 14:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/PlatOperInfoQueryAction.java | 5 + ecp-mbu-web/src/main/webapp/js/plt_common.js | 405 ------------------ ecp-mbu-web/src/main/webapp/js/pub.js | 1 + .../main/webapp/pages/plt/pub_tms_mng.html | 2 +- .../src/test/java/generator/ColumnInfo.java | 2 +- .../src/test/java/generator/DictTypeEnum.java | 18 +- .../src/test/resources/conf/cre_icrd.xml | 60 +-- .../src/test/resources/conf/cre_plt.xml | 42 +- .../src/test/resources/conf/cre_plt_mysql.sql | 100 ++--- .../test/resources/conf/cre_plt_oracle.sql | 60 +-- ecp-mbu-web/src/test/resources/conf/dict.xml | 86 ++-- .../resources/conf/generator-mysql-cmm.xml | 2 +- .../resources/conf/generator-mysql-plt.xml | 2 +- .../test/resources/conf/generator-mysql.xml | 2 +- .../test/resources/conf/generator-oracle.xml | 2 +- 15 files changed, 195 insertions(+), 594 deletions(-) delete mode 100644 ecp-mbu-web/src/main/webapp/js/plt_common.js diff --git a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/action/system/PlatOperInfoQueryAction.java b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/action/system/PlatOperInfoQueryAction.java index 667af968..9f83f92d 100644 --- a/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/action/system/PlatOperInfoQueryAction.java +++ b/ecp-mbu-web/src/main/java/com/murong/ecp/netpay/mbu/web/action/system/PlatOperInfoQueryAction.java @@ -11,6 +11,7 @@ import com.murong.ecp.netpay.mbu.web.common.enums.MBUConstant; import com.murong.ecp.netpay.mbu.web.common.enums.MBUMsgCd; import com.yuangou.ecp.biz.transengine.AbstractTransaction; import com.yuangou.ecp.biz.transengine.util.EDBUtil; +import com.yuangou.ecp.bp.comp.expr.YGExpUtil; import com.yuangou.ecp.bp.core.common.exception.YGException; import com.yuangou.ecp.bp.core.common.message.YGBizMessage; import com.yuangou.ecp.bp.core.common.message.YGBizMessageContext; @@ -68,6 +69,10 @@ public class PlatOperInfoQueryAction extends AbstractTransaction { reqBO2.setReqId(reqBO.getGda().getJrnNo()); logger.infoFmt("请求参数reqBO2：{}", JSON.toJSONString(reqBO2)); logger.info(" 系统服务-日终处理-平台运行信息"); + + + rspBO.setCurAcDt(reqBO.getGda().getTxDt()); + // ActPubRstsQryRspBO rspBO2 = actManageService.actPubRstsQuery(reqBO2); // logger.info("actMngService{}:"+rspBO2); // logger.info("reqBO2:"+reqBO2); diff --git a/ecp-mbu-web/src/main/webapp/js/plt_common.js b/ecp-mbu-web/src/main/webapp/js/plt_common.js deleted file mode 100644 index 636557a1..00000000 --- a/ecp-mbu-web/src/main/webapp/js/plt_common.js +++ /dev/null @@ -1,405 +0,0 @@ -$(document).ready(function () { - $(".amt").change(function() { - console.log($(this).attr("id") + ",amt") - - // 金额处理 - $(this).val(bui_util.amtFormat($(this).val())); - }); - - $(".dict").each(function() { - // - var dictName = $(this).data("dict-name"); - var sqlId = $(this).data("dict-sqlid"); - - if( dictName ) { - // 静态数据字典 - var dictObj = bui_dict.getFieldHlp(dictName); - if(!dictObj) { - console.log(".dict dict-name:" + dictName + " not found"); - return; - } - var options = ""; - $.each(dictObj, function (key, value) { - var option = ""; - options += option; - }); - $(this).append(options); - } else if( sqlId ) { - var args = sqlId.split(";"); - var params; - if( args.length == 1 ) { - params = {}; - } else if( args.length == 2 ) { - params = { - param_1:$("#"+args[1]).val() - }; - } else if( args.length == 3 ) { - params = { - param_1:$("#"+args[1]).val(), - param_2:$("#"+args[2]).val() - }; - } else if( args.length == 4 ) { - params = { - param_1:$("#"+args[1]).val(), - param_2:$("#"+args[2]).val(), - param_3:$("#"+args[3]).val() - }; - } - - // 动态 - bui_util.getFieldHelpBySqlId($(this).attr("id"), args[0], params); - return; - } else { - console.log($(this).attr("id") + " not config dict attr(dict-name、dict-sqlid、dict-tablename）"); - } - - }); - - $.validator.addMethod('mobile', function (value, element) { - return this.optional(element) || /^1\d{10}$/.test(value); - }, '请输入正确的手机号码'); - - var nowTemp = new Date(); - var now = new Date(nowTemp.getFullYear(), nowTemp.getMonth(), nowTemp.getDate(), 0, 0, 0, 0); - // 单个日期选择 - $('.dpd7').datetimepicker({ - format:'yyyy-mm-dd', - startDate:getSysDate(1), - clearBtn:true, - minView:'2', - autoclose: true - }); - - // 单个时间选择（时分) - $('.dpt1').datetimepicker({ - format:'hh:ii', - clearBtn:true, - startView:'0', - autoclose: true - }); - -}); -var bui_util = (function () { - var amtFormat = function (num) { - if (!num) { - return "0.00"; - } - // 金额格式化 - num = num.toString().replace(/\$|\,/g, ''); - if (isNaN(num)) - num = "0"; - sign = (num == (num = Math.abs(num))); -// num = Math.floor(num*100+0.50000000001); - num = Math.floor(num * 100); - cents = num % 100; - num = Math.floor(num / 100).toString(); - if (cents < 10) - cents = "0" + cents; - for (var i = 0; i < Math.floor((num.length - (1 + i)) / 3); i++) - num = num.substring(0, num.length - (4 * i + 3)) + ',' + - num.substring(num.length - (4 * i + 3)); - return (((sign) ? '' : '-') + num + '.' + cents); - }; - - var amtProc = function (val) { - // 金额处理，删除千分位 - if (val) { - return val; - } - return val.replace(/\,/g, ''); - }; - - var dateProc = function (val) { - // 日期处理，删除- - if (!val) { - return val; - } - return val.replace(/\/|\-/g, ''); - }; - - var timeProc = function (val) { - // 时间处理，删除: - if (!val) { - return val; - } - return val.replace(/\:/g, ''); - }; - - var timestampProc = function (val) { - // 时间戳处理，删除-: - if (!val) { - return val; - } - return val.replace(/\-|\:/g, ''); - }; - - var timeFormat = function (val) { - // 时间格式化 - if (!val || val.length < 6) { - return val; - } - return val.substr(0, 2) + ":" + val.substr(2, 2) + ":" + val.substr(4, 2); - }; - - var dateFormat = function (val) { - // 日期格式化 - if (!val || val.length < 8) { - return val; - } - return val.substr(0, 4) + "-" + val.substr(4, 2) + "-" + val.substr(6, 2); - }; - - var timestampFormat = function (val) { - // 时间戳格式化 - if (!val || val.length < 14) { - return val; - } - return val.substr(0, 4) + "-" + val.substr(4, 2) + "-" + val.substr(6, 2) + " " + val.substr(8, 2) + ":" + val.substr(10, 2) + ":" + val.substr(12, 2); - }; - - var dateFormatter = function (value, row, index) { - return dateFormat(value); - }; - - var timeFormatter = function (value, row, index) { - return timeFormat(value); - }; - - var timestampFormatter = function (value, row, index) { - return timestampFormat(value); - }; - - var amtFormatter = function (value, row, index) { - return amtFormat(value); - }; - - - var getNowDate = function(dateFlg) { - // 获取字符日期 - var myDate = new Date(); - var m = (myDate.getMonth() + 1) < 10 ? ("0" + (myDate.getMonth() + 1)) : (myDate.getMonth() + 1); - var d = myDate.getDate() < 10 ? ("0" + myDate.getDate()) : myDate.getDate(); - if (dateFlg == 0) { - return "" + myDate.getFullYear() + m + d; - } else if (dateFlg == 1) { - return myDate.getFullYear() + "-" + m + "-" + d; - } - }; - - var getFieldHelp = function (elementId, tableName, keyColumn, valueColumn, condition) { - // 根据表名动态获取select下拉框内容 - // elementId select元素id - // tableName 表名 - // keyColumn key名称 - // valueColumn value名称 - // condition 查询条件 - var params = { - table_name:tableName, - key_column:keyColumn, - value_column:valueColumn, - condition:condition - }; - - syncCallTxn("pltadmbpc1", "pubFieldHlpByTableName", params, function (data) { - var options = ""; - $.each(data.rec, function (k, c) { - var option = ""; - options += option; - }); - $("#" + elementId).empty(); - $("#" + elementId).append(options); - }); - }; - - var getFieldHelpBySqlId = function (elementId, sqlId, params) { - // 根据表名动态获取select下拉框内容 - // elementId select元素id - // sqlId sql名称 - // params 参数 - var params1 = { - sql_id:sqlId - } - params1 = $.extend({}, params1, params); - - var url = "/mbu/pltadmbpc1/pubFieldHlpBySqlId.do"; - $.ajax({ - type: "GET", - url: url, - data: params1, - dataType: "json", - async: false, - error: function (request) { - Messenger().post("调用url:[" + url + "]失败, " + request); - }, - success: function (data) { - var msgcd = data.gda.msg_cd; - $("#" + elementId).empty(); - if(!isTxnSucc(msgcd)) { - console.log("调用url:[" + url + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); - return; - } - var options = ""; - $.each(data.rec, function (k, c) { - var option = ""; - options += option; - }); - $("#" + elementId).append(options); - } - }); - - }; - - var isTxnSucc = function(msgCod) { - if(!msgCod || msgCod.length < 8 ) { - return false; - } - return msgCod.substring(3) == "00000"; - }; - - var syncCallTxn = function (serverName, txnCod, params, sucessFunc) { - // 同步调用交易处理 - // serverName 服务名(必须） - // txnCod 交易码（必须） - // params 参数（可输） - // sucessFunc 成功处理函数（可输） - var resultData; - $.ajax({ - type: "GET", - url: "/mbu/" + serverName + "/" + txnCod + ".do", - data: params, - dataType: "json", - async: false, - error: function (request) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); - }, - success: function (data) { - resultData = data; - var msgcd = data.gda.msg_cd; - if(!isTxnSucc(msgcd)) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); - return; - } - if( sucessFunc ) { - sucessFunc(data); - } - } - }); - return resultData; - }; - - var syncCallAction = function (serverName, txnCod, method, params, sucessFunc) { - // 同步调用action处理 - // serverName 服务名(必须） - // txnCod 交易码（必须） - // method 方法名（必须) - // params 参数（可输） - // sucessFunc 成功处理函数（可输） - var resultData; - $.ajax({ - type: "GET", - url: "/mbu/" + serverName + "/" + txnCod + ".do?_action=" + method, - data: params, - dataType: "json", - async: false, - error: function (request) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); - }, - success: function (data) { - resultData = data; - var msgcd = data.gda.msg_cd; - if(!isTxnSucc(msgcd)) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); - return; - } - if( sucessFunc ) { - sucessFunc(data); - } - } - }); - return resultData; - }; - - var asyncCallTxn = function (serverName,txnCod, params, sucessFunc) { - // 异步调用交易处理 - // serverName 服务名(必须） - // txnCod 交易码（必须） - // params 参数（可输） - // sucessFunc 成功处理函数（可输） - $.ajax({ - type: "GET", - url: "/mbu/" + serverName + "/" + txnCod + ".do", - data: params, - dataType: "json", - async: true, - error: function (request) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); - }, - success: function (data) { - var msgcd = data.gda.msg_cd; - if(!isTxnSucc(msgcd)) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); - return; - } - if( sucessFunc ) { - sucessFunc(data); - } - } - }); - }; - - var asyncCallAction = function (serverName,txnCod, method, params, sucessFunc) { - // 异步调用action处理 - // serverName 服务名(必须） - // txnCod 交易码（必须） - // method 方法名（必须） - // params 参数（可输） - // sucessFunc 成功处理函数（可输） - $.ajax({ - type: "GET", - url: "/mbu/" + serverName + "/" + txnCod + ".do?_action=" + method, - data: params, - dataType: "json", - async: true, - error: function (request) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]失败, " + request); - }, - success: function (data) { - var msgcd = data.gda.msg_cd; - if(!isTxnSucc(msgcd)) { - Messenger().post("调用交易:[" + serverName + "." + txnCod + "]错误, " + data.gda.msg_cd + ":" + data.gda.msg_inf); - return; - } - if( sucessFunc ) { - sucessFunc(data); - } - } - }); - }; - - - return { - amtFormat: amtFormat, - amtProc: amtProc, - amtFormatter: amtFormatter, - dateProc: dateProc, - timeProc: timeProc, - timestampProc: timestampProc, - timestampFormat: timestampFormat, - timeFormat: timeFormat, - dateFormat: dateFormat, - timeFormatter: timeFormatter, - dateFormatter: dateFormatter, - timestampFormatter: timestampFormatter, - getFieldHelp: getFieldHelp, - asyncCallTxn:asyncCallTxn, - syncCallTxn:syncCallTxn, - syncCallAction:syncCallAction, - asyncCallAction:asyncCallAction, - isTxnSucc:isTxnSucc, - getFieldHelpBySqlId:getFieldHelpBySqlId - }; -})(); - diff --git a/ecp-mbu-web/src/main/webapp/js/pub.js b/ecp-mbu-web/src/main/webapp/js/pub.js index 07b0eb99..cd795241 100644 --- a/ecp-mbu-web/src/main/webapp/js/pub.js +++ b/ecp-mbu-web/src/main/webapp/js/pub.js @@ -709,3 +709,4 @@ function ulInitData0(ul_id){ $("#"+ul_id).append(option); }); } + diff --git a/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html b/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html index b3fd2c31..e0b76047 100644 --- a/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html +++ b/ecp-mbu-web/src/main/webapp/pages/plt/pub_tms_mng.html @@ -19,7 +19,7 @@ -
+
diff --git a/ecp-mbu-web/src/test/java/generator/ColumnInfo.java b/ecp-mbu-web/src/test/java/generator/ColumnInfo.java index a3e976ef..683374ac 100644 --- a/ecp-mbu-web/src/test/java/generator/ColumnInfo.java +++ b/ecp-mbu-web/src/test/java/generator/ColumnInfo.java @@ -12,7 +12,7 @@ public class ColumnInfo { private String remark; private int dataType; /** - * ֵ + * 字典类型 */ private DictTypeEnum dictType; private int length; diff --git a/ecp-mbu-web/src/test/java/generator/DictTypeEnum.java b/ecp-mbu-web/src/test/java/generator/DictTypeEnum.java index fe22e9b0..bda89622 100644 --- a/ecp-mbu-web/src/test/java/generator/DictTypeEnum.java +++ b/ecp-mbu-web/src/test/java/generator/DictTypeEnum.java @@ -4,15 +4,15 @@ package generator; * Created by syxlw on 2018/5/5. */ public enum DictTypeEnum { - AMT("amt1", ""), // λС - DATE("date", ""), - TIME("time", "ʱ"), - TIMESTAMP("timestamp", "ʱ"), - NUMBER("number", ""), // С - DIGIT("digits", ""), - CHAR("char", "ַ"), - CCHAR("cchar", "ַ"), - EMAIL("email", ""), + AMT("amt1", "金额"), // 有两位小数 + DATE("date", "日期"), + TIME("time", "时间"), + TIMESTAMP("timestamp", "时间戳"), + NUMBER("number", "数字型"), // 有小数 + DIGIT("digits", "数字型"), + CHAR("char", "字符型"), + CCHAR("cchar", "中文字符"), + EMAIL("email", "邮箱"), URL("url", "url"), ; private String value; diff --git a/ecp-mbu-web/src/test/resources/conf/cre_icrd.xml b/ecp-mbu-web/src/test/resources/conf/cre_icrd.xml index 4722e939..9c625d7f 100644 --- a/ecp-mbu-web/src/test/resources/conf/cre_icrd.xml +++ b/ecp-mbu-web/src/test/resources/conf/cre_icrd.xml @@ -1,39 +1,39 @@ - + - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + diff --git a/ecp-mbu-web/src/test/resources/conf/cre_plt.xml b/ecp-mbu-web/src/test/resources/conf/cre_plt.xml index e50aa032..de946493 100644 --- a/ecp-mbu-web/src/test/resources/conf/cre_plt.xml +++ b/ecp-mbu-web/src/test/resources/conf/cre_plt.xml @@ -1,30 +1,30 @@ - + -
- - - - - +
+ + + + +
\ No newline at end of file diff --git a/ecp-mbu-web/src/test/resources/conf/cre_plt_mysql.sql b/ecp-mbu-web/src/test/resources/conf/cre_plt_mysql.sql index 73458c3f..19dff61c 100644 --- a/ecp-mbu-web/src/test/resources/conf/cre_plt_mysql.sql +++ b/ecp-mbu-web/src/test/resources/conf/cre_plt_mysql.sql @@ -1,15 +1,15 @@ drop table t_pub_dsinfo; create table t_pub_dsinfo( -name varchar(80) not null default '' COMMENT '', -jdbc_driver varchar(100) not null default '' COMMENT 'JDBC', +name varchar(80) not null default '' COMMENT '名称', +jdbc_driver varchar(100) not null default '' COMMENT 'JDBC驱动', jdbc_url varchar(256) not null default '' COMMENT 'JDBC URL', -username varchar(20) not null default '' COMMENT 'û', -password varchar(50) not null default '' COMMENT 'û', -remark varchar(80) not null default '' COMMENT 'ע', -nod_id varchar(20) not null default '' COMMENT 'ڵid', -tm_smp varchar(14) not null default '' COMMENT 'ʱ', +username varchar(20) not null default '' COMMENT '用户名', +password varchar(50) not null default '' COMMENT '用户密码', +remark varchar(80) not null default '' COMMENT '备注', +nod_id varchar(20) not null default '' COMMENT '节点id', +tm_smp varchar(14) not null default '' COMMENT '时间戳', primary key(name) -) COMMENT='ԴϢ'; +) COMMENT='数据源信息'; drop table T_PUB_DCT; @@ -33,7 +33,7 @@ CREATE TABLE T_PUB_DCT UPD_TM VARCHAR(6), UPD_OPER VARCHAR(10) NOT NULL, UPD_DESC VARCHAR(512) -) COMMENT='ֵ'; +) COMMENT='数据字典'; CREATE TABLE T_PUB_HLP @@ -50,7 +50,7 @@ CREATE TABLE T_PUB_HLP UPD_TM VARCHAR(6), UPD_OPER VARCHAR(10), UPD_DESC VARCHAR(512) -) COMMENT='ֵöֵ'; +) COMMENT='数据字典枚举值表'; insert into T_PUB_HLP(FLD_NM,FLD_VAL,FLD_EXP) values('','',''); @@ -58,57 +58,57 @@ insert into T_PUB_HLP(FLD_NM,FLD_VAL,FLD_EXP) values('','',''); drop table T_PUB_BSTS; CREATE TABLE T_PUB_BSTS ( - AC_DT VARCHAR(8) NOT NULL comment '', - BAT_STS VARCHAR(1) NOT NULL DEFAULT 'U' comment '״̬', - BAT_BEG_TM VARCHAR(19) NOT NULL DEFAULT ' ' comment 'ʼʱ' , - BAT_END_TM VARCHAR(19) NOT NULL DEFAULT ' ' comment '', - WIN_DT1 VARCHAR(8) NOT NULL DEFAULT ' ' comment '1', - WIN_DT2 VARCHAR(8) NOT NULL DEFAULT ' ' comment '2', - WIN_BEG_TM VARCHAR(6) NOT NULL DEFAULT ' ' comment 'ڿʼʱ', - WIN_END_TM VARCHAR(6) NOT NULL DEFAULT ' ' comment 'ڽʱ', - LAST_AC_DT VARCHAR(8) NOT NULL DEFAULT ' ' comment 'ջ', - LAST_AC_DT_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment 'ջڱ־', - LAST_AC_DT2 VARCHAR(8) NOT NULL DEFAULT ' ' comment 'ջ', - LAST_AC_DT2_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment 'ջڱ־', - CUR_AC_DT VARCHAR(8) NOT NULL DEFAULT ' ' comment 'ǰ', - CUR_AC_DT_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment 'ǰڱ־', - NEXT_AC_DT VARCHAR(8) NOT NULL DEFAULT ' ' comment 'һջ', - NEXT_AC_DT_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment 'һջڱ־', - TM_SMP VARCHAR(26) NOT NULL DEFAULT ' ' comment 'ʱ', - NOD_ID VARCHAR(20) NOT NULL DEFAULT ' ' comment 'ڵID', + AC_DT VARCHAR(8) NOT NULL comment '会计日期', + BAT_STS VARCHAR(1) NOT NULL DEFAULT 'U' comment '状态', + BAT_BEG_TM VARCHAR(19) NOT NULL DEFAULT ' ' comment '开始时间' , + BAT_END_TM VARCHAR(19) NOT NULL DEFAULT ' ' comment '结束', + WIN_DT1 VARCHAR(8) NOT NULL DEFAULT ' ' comment '窗口日期1', + WIN_DT2 VARCHAR(8) NOT NULL DEFAULT ' ' comment '窗口日期2', + WIN_BEG_TM VARCHAR(6) NOT NULL DEFAULT ' ' comment '窗口开始时间', + WIN_END_TM VARCHAR(6) NOT NULL DEFAULT ' ' comment '窗口结束时间', + LAST_AC_DT VARCHAR(8) NOT NULL DEFAULT ' ' comment '上日会计日期', + LAST_AC_DT_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment '上日会计日期标志', + LAST_AC_DT2 VARCHAR(8) NOT NULL DEFAULT ' ' comment '上上日会计日期', + LAST_AC_DT2_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment '上上日会计日期标志', + CUR_AC_DT VARCHAR(8) NOT NULL DEFAULT ' ' comment '当前会计日期', + CUR_AC_DT_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment '当前会计日期标志', + NEXT_AC_DT VARCHAR(8) NOT NULL DEFAULT ' ' comment '下一日会计日期', + NEXT_AC_DT_FLG VARCHAR(1) NOT NULL DEFAULT ' ' comment '下一日会计日期标志', + TM_SMP VARCHAR(26) NOT NULL DEFAULT ' ' comment '时间戳', + NOD_ID VARCHAR(20) NOT NULL DEFAULT ' ' comment '节点ID', PRIMARY key(AC_DT) ); drop table t_plt_reginf; create table t_plt_reginf( -reg_id varchar(20) not null default ' ' comment 'id', -reg_nm varchar(60) not null default ' ' comment '', -remark varchar(100) not null default ' ' comment 'ע', -cre_opr varchar(20) not null default '' comment '', -cre_ts varchar(14) not null default '' comment 'ʱ', -upd_opr varchar(20) not null default '' comment '', -upd_ts varchar(14) not null default '' comment 'ʱ', -nod_id varchar(20) not null default '' comment 'ڵid', -tm_smp varchar(14) not null default '' comment 'ʱ', +reg_id varchar(20) not null default ' ' comment '域id', +reg_nm varchar(60) not null default ' ' comment '域名称', +remark varchar(100) not null default ' ' comment '备注', +cre_opr varchar(20) not null default '' comment '创建者', +cre_ts varchar(14) not null default '' comment '创建时间', +upd_opr varchar(20) not null default '' comment '更新者', +upd_ts varchar(14) not null default '' comment '更新时间', +nod_id varchar(20) not null default '' comment '节点id', +tm_smp varchar(14) not null default '' comment '时间戳', primary key(reg_id) -) comment ='Ϣ'; +) comment ='域信息'; drop table t_plt_nodinf; create table t_plt_nodinf( -reg_id varchar(20) not null default ' ' comment 'id', -nod_id1 varchar(20) not null default ' ' comment 'ڵid', -nod_nm varchar(60) not null default ' ' comment 'ڵ', -nod_mng_url varchar(128) not null default ' ' comment 'ڵurl', -remark varchar(100) not null default ' ' comment 'ע', -cre_opr varchar(20) not null default '' comment '', -cre_ts varchar(14) not null default '' comment 'ʱ', -upd_opr varchar(20) not null default '' comment '', -upd_ts varchar(14) not null default '' comment 'ʱ', -nod_id varchar(20) not null default '' comment 'ڵid', -tm_smp varchar(14) not null default '' comment 'ʱ', +reg_id varchar(20) not null default ' ' comment '域id', +nod_id1 varchar(20) not null default ' ' comment '节点id', +nod_nm varchar(60) not null default ' ' comment '节点名称', +nod_mng_url varchar(128) not null default ' ' comment '节点管理url', +remark varchar(100) not null default ' ' comment '备注', +cre_opr varchar(20) not null default '' comment '创建者', +cre_ts varchar(14) not null default '' comment '创建时间', +upd_opr varchar(20) not null default '' comment '更新者', +upd_ts varchar(14) not null default '' comment '更新时间', +nod_id varchar(20) not null default '' comment '节点id', +tm_smp varchar(14) not null default '' comment '时间戳', primary key(reg_id, nod_id1) -) comment = 'ڵϢ'; +) comment = '节点信息'; insert into t_cmm_cons(CST_NM,EFF_DT, EXP_DT, PARM_CLS,CST_DISP_NM,CST_VAL) values('PLT_QRY_REGION', '20180507', '99999999', 'CMM', 'PLT_QRY_REGION', 'select reg_id key, reg_nm value from t_plt_reginf'); diff --git a/ecp-mbu-web/src/test/resources/conf/cre_plt_oracle.sql b/ecp-mbu-web/src/test/resources/conf/cre_plt_oracle.sql index e8a04c97..4be89a8c 100644 --- a/ecp-mbu-web/src/test/resources/conf/cre_plt_oracle.sql +++ b/ecp-mbu-web/src/test/resources/conf/cre_plt_oracle.sql @@ -11,15 +11,15 @@ tm_smp varchar(14) default '' not null, primary key(name) ) ; -comment on table t_pub_dsinfo is 'ԴϢ'; -comment on column t_pub_dsinfo.name is ''; -comment on column t_pub_dsinfo.jdbc_driver is 'JDBC'; +comment on table t_pub_dsinfo is '数据源信息'; +comment on column t_pub_dsinfo.name is '名称'; +comment on column t_pub_dsinfo.jdbc_driver is 'JDBC驱动'; comment on column t_pub_dsinfo.jdbc_url is 'JDBC URL'; -comment on column t_pub_dsinfo.username is 'û'; -comment on column t_pub_dsinfo.password is 'û'; -comment on column t_pub_dsinfo.remark is 'ע'; -comment on column t_pub_dsinfo.nod_id is 'ڵid'; -comment on column t_pub_dsinfo.tm_smp is 'ʱ'; +comment on column t_pub_dsinfo.username is '用户名'; +comment on column t_pub_dsinfo.password is '用户密码'; +comment on column t_pub_dsinfo.remark is '备注'; +comment on column t_pub_dsinfo.nod_id is '节点id'; +comment on column t_pub_dsinfo.tm_smp is '时间戳'; drop table t_plt_reginf; @@ -35,16 +35,16 @@ create table t_plt_reginf( tm_smp varchar(14) default ' ' not null , primary key(reg_id) ); -comment on table t_plt_reginf is 'Ϣ'; -comment on column t_plt_reginf.reg_id is 'id'; -comment on column t_plt_reginf.reg_nm is ''; -comment on column t_plt_reginf.remark is 'ע'; -comment on column t_plt_reginf.cre_opr is ''; -comment on column t_plt_reginf.cre_ts is 'ʱ'; -comment on column t_plt_reginf.upd_opr is ''; -comment on column t_plt_reginf.upd_ts is 'ʱ'; -comment on column t_plt_reginf.nod_id is 'ڵid'; -comment on column t_plt_reginf.tm_smp is 'ʱ'; +comment on table t_plt_reginf is '域信息'; +comment on column t_plt_reginf.reg_id is '域id'; +comment on column t_plt_reginf.reg_nm is '域名称'; +comment on column t_plt_reginf.remark is '备注'; +comment on column t_plt_reginf.cre_opr is '创建者'; +comment on column t_plt_reginf.cre_ts is '创建时间'; +comment on column t_plt_reginf.upd_opr is '更新者'; +comment on column t_plt_reginf.upd_ts is '更新时间'; +comment on column t_plt_reginf.nod_id is '节点id'; +comment on column t_plt_reginf.tm_smp is '时间戳'; drop table t_plt_nodinf; create table t_plt_nodinf( @@ -62,16 +62,16 @@ create table t_plt_nodinf( primary key(reg_id, nod_id1) ); -comment on table t_plt_nodinf is 'ڵϢ'; -comment on column t_plt_nodinf.reg_id is 'id'; -comment on column t_plt_nodinf.nod_id1 is 'ڵid'; -comment on column t_plt_nodinf.nod_nm is 'ڵ'; -comment on column t_plt_nodinf.nod_mng_url is 'ڵurl'; -comment on column t_plt_nodinf.remark is 'ע'; -comment on column t_plt_nodinf.cre_opr is ''; -comment on column t_plt_nodinf.cre_ts is 'ʱ'; -comment on column t_plt_nodinf.upd_opr is ''; -comment on column t_plt_nodinf.upd_ts is 'ʱ'; -comment on column t_plt_nodinf.nod_id is 'ڵid'; -comment on column t_plt_nodinf.tm_smp is 'ʱ'; +comment on table t_plt_nodinf is '节点信息'; +comment on column t_plt_nodinf.reg_id is '域id'; +comment on column t_plt_nodinf.nod_id1 is '节点id'; +comment on column t_plt_nodinf.nod_nm is '节点名称'; +comment on column t_plt_nodinf.nod_mng_url is '节点管理url'; +comment on column t_plt_nodinf.remark is '备注'; +comment on column t_plt_nodinf.cre_opr is '创建者'; +comment on column t_plt_nodinf.cre_ts is '创建时间'; +comment on column t_plt_nodinf.upd_opr is '更新者'; +comment on column t_plt_nodinf.upd_ts is '更新时间'; +comment on column t_plt_nodinf.nod_id is '节点id'; +comment on column t_plt_nodinf.tm_smp is '时间戳'; diff --git a/ecp-mbu-web/src/test/resources/conf/dict.xml b/ecp-mbu-web/src/test/resources/conf/dict.xml index 4b7c8fa6..0e57c3d4 100644 --- a/ecp-mbu-web/src/test/resources/conf/dict.xml +++ b/ecp-mbu-web/src/test/resources/conf/dict.xml @@ -1,55 +1,55 @@ - + - - - - - + + + + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - + + + + + + \ No newline at end of file diff --git a/ecp-mbu-web/src/test/resources/conf/generator-mysql-cmm.xml b/ecp-mbu-web/src/test/resources/conf/generator-mysql-cmm.xml index 3e4789d3..59cf2d30 100644 --- a/ecp-mbu-web/src/test/resources/conf/generator-mysql-cmm.xml +++ b/ecp-mbu-web/src/test/resources/conf/generator-mysql-cmm.xml @@ -1,4 +1,4 @@ - + + + +