git pull

merge.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 let moment = require('moment-timezone')
 let _ = require('lodash')
 const uuid = require('uniqid')
-let all=[]
+let all = []
 init()
 
 
@@ -24,13 +24,13 @@ async function init() {
         arr.push(read('E:\\fail\\btc8\\' + files2[i], files2[i]))
     }
 
-    arr=await Promise.all(arr)
-   // console.log(arr)
-    for (let i=0;i<arr.length;i++)
+    arr = await Promise.all(arr)
+    // console.log(arr)
+    for (let i = 0; i < arr.length; i++)
         arrange(arr[i])
-  //  console.log(arr[0].arr[0])
-manage()
- //  console.log(all)
+    //  console.log(arr[0].arr[0])
+    manage()
+    //  console.log(all)
 
     //  console.log(files)
     // let com = await fs.readFileSync('E:\\fail\\btc1', 'utf8');
@@ -39,45 +39,42 @@ manage()
 
 }
 
- function manage()
-{
-    for (let i=0;i<all.length;i++)
-    {
-        let data=all[i].data
-        data= _.uniqBy(data, 'time');
-       data= _.orderBy(data, 'time');
-
-       // let s=data.data.arr
-       // for (let j=0;j<s.length;j++)
-       // {
-       //     let t=(j+1)+','+s[1]+','+s[2]+','+s[3]+','+s[4]+','+s[5]+','+s[6]+','+s[7]+','+s[8]+','+s[9]
-       //     data.text=t
-       // }
-       console.log(data)
-        all[i].data=data
+function manage() {
+    for (let i = 0; i < all.length; i++) {
+        let data = all[i].data
+        data = _.uniqBy(data, 'time');
+        data = _.orderBy(data, 'time');
+        let t=''
+        for (let z = 0; z < data.length; z++) {
+            let s=data[z].data
+            for (let j=0;j<s.length;j++)
+            {
+                let t=(j+1)+','+s[1]+','+s[2]+','+s[3]+','+s[4]+','+s[5]+','+s[6]+','+s[7]+','+s[8]+','+s[9]
+                data[z].text=t
+            }
+        }
+     
+        console.log(data)
+        all[i].data = data
 
 
     }
 
 
-
 }
 
-async function arrange(data)
-{
-    for (let i=0;i<all.length;i++)
-        if (all[i].uniq ===data.uniq) {
-            for (let j=0;j<data.arr.length;j++)
-            all[i].data.push(data.arr[j])
+async function arrange(data) {
+    for (let i = 0; i < all.length; i++)
+        if (all[i].uniq === data.uniq) {
+            for (let j = 0; j < data.arr.length; j++)
+                all[i].data.push(data.arr[j])
             return
         }
 
-    all.push({uniq:data.uniq,data:data.arr})
+    all.push({uniq: data.uniq, data: data.arr})
 }
 
 
-
-
 async function read(dir, name) {
     let arr = []
     let com = await fs.readFileSync(dir, 'utf8');
@@ -91,15 +88,15 @@ async function read(dir, name) {
         let pars = com[i].split(',')
         let obj = {}
         obj.time = pars[1]
-        if (typeof  obj.time === "undefined")
+        if (typeof obj.time === "undefined")
             continue
-        obj.data=pars
+        obj.data = pars
         arr.push(obj)
 
     }
 
-   // console.log(uniq,arr)
-    return {uniq,arr}
+    // console.log(uniq,arr)
+    return {uniq, arr}
     //  console.log(com)
     // com = JSON.parse(com)
 }