Commit d0b6f4f8 authored by Clownce Deng's avatar Clownce Deng

*) 代码优化;

parent 6e886e10
...@@ -9,7 +9,7 @@ module.exports = { ...@@ -9,7 +9,7 @@ module.exports = {
// 数据库配置 // 数据库配置
database_conf: { database_conf: {
database_type: "pg", database_type: "pg",
database_host: "127.0.0.1:5432", database_host: "192.168.2.103:5432",
database_name: "TOPMES6_TEST_V6", database_name: "TOPMES6_TEST_V6",
database_user: "toplinker", database_user: "toplinker",
database_pwd: "TopLinker0510", database_pwd: "TopLinker0510",
...@@ -18,5 +18,5 @@ module.exports = { ...@@ -18,5 +18,5 @@ module.exports = {
// TopJS位置 // TopJS位置
topjs_path: "D:/Programs/TopJS/3.3.1/bin/topjs3.exe", topjs_path: "D:/Programs/TopJS/3.3.1/bin/topjs3.exe",
// 工作目录 // 工作目录
work_path: "F:/workspace/pg_batch_insert" work_path: "D:/pgtest"
}; };
\ No newline at end of file
...@@ -41,7 +41,7 @@ try { ...@@ -41,7 +41,7 @@ try {
var query = DB.query(LOCAL_DB_CONN); var query = DB.query(LOCAL_DB_CONN);
var beforeTime = moment(); var beforeTime = moment();
query.begin(); query.begin();
// COPY服务端寻找文件,\COPY客户端寻找文件 // COPY服务端寻找文件,\COPY客户端寻找文件(注意:\COPY只能在SQL Shell中执行,它是变相调用COPY FROM STDIN)
var sql = "COPY oee_machine_log_v2 (workcenter_id,log_time,log_type,lot_no,partnumber,subpart,lot_serial,station,state," var sql = "COPY oee_machine_log_v2 (workcenter_id,log_time,log_type,lot_no,partnumber,subpart,lot_serial,station,state,"
+ "programe_name,daq_time,analysis_flag,log_data) FROM '{0}/data{1}.csv' delimiter ',' csv header"; + "programe_name,daq_time,analysis_flag,log_data) FROM '{0}/data{1}.csv' delimiter ',' csv header";
sql = _.format(sql, config.work_path, wid); sql = _.format(sql, config.work_path, wid);
...@@ -105,7 +105,7 @@ function randomBuildLogFile(workcenter_id, row_count) { ...@@ -105,7 +105,7 @@ function randomBuildLogFile(workcenter_id, row_count) {
function randomBuildMapData() { function randomBuildMapData() {
var retMap = {}; var retMap = {};
for (var count = 1; count <= 100; count++) { for (var count = 1; count <= 0; count++) {
retMap["test_key_" + count] = "test_value_" + count; retMap["test_key_" + count] = "test_value_" + count;
} }
var retStr; var retStr;
......
...@@ -41,8 +41,8 @@ try { ...@@ -41,8 +41,8 @@ try {
// 批量插入数据到数据库 // 批量插入数据到数据库
console.info("start to batchInsert data..."); console.info("start to batchInsert data...");
var query = DB.query(LOCAL_DB_CONN); var query = DB.query(LOCAL_DB_CONN);
var beforeTime = moment();
query.begin(); query.begin();
var beforeTime = moment();
query.batchInsert("oee_machine_log_v2", _.keys(logDataList[0]), logDataList); query.batchInsert("oee_machine_log_v2", _.keys(logDataList[0]), logDataList);
if (query.lastError().isValid()) { if (query.lastError().isValid()) {
query.rollback(); query.rollback();
...@@ -84,7 +84,7 @@ function randomBuildLogList(workcenter_id, row_count) { ...@@ -84,7 +84,7 @@ function randomBuildLogList(workcenter_id, row_count) {
function randomBuildMapData() { function randomBuildMapData() {
var retMap = {}; var retMap = {};
for (var count = 1; count <= 100; count++) { for (var count = 1; count <= 0; count++) {
retMap["test_key_" + count] = "test_value_" + count; retMap["test_key_" + count] = "test_value_" + count;
} }
return retMap; return retMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment