Merge branch 'dev1.4' of http://192.168.3.207:10080/qmx/datatag into dev1.4

src/history/util_history.go

@@ -8,7 +8,6 @@ import (
 	"qfw/util/mail"
 	"qfw/util/redis"
 	"regexp"
-	"strconv"
 	"strings"
 	"time"
 	. "util"
@@ -1329,7 +1328,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 			}
 			xf.Sheets[0].Name = "详细数据"
 			//生文件
-			t := strconv.FormatInt(time.Now().Unix(), 10)
+			//t := strconv.FormatInt(time.Now().Unix(), 10)
+			t := time.Now().Format("20060102")
 			dir := "./web/res/xlsx/" + t + "/"
 			if b, _ := PathExists(dir); !b {
 				err1 := os.MkdirAll(dir, os.ModePerm)
@@ -1337,7 +1337,9 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string, isfile, isHen
 					log.Println("mkdir err", dir)
 				}
 			}
-			fname := t + ".xlsx"
+			//fname := t + ".xlsx"
+			fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t,qu.GetRandom(4))
+			log.Println("fname",fname)
 			err = xf.Save(dir + fname)
 			if err != nil {
 				log.Println("xls error", fname)

src/service/second_push.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"fmt"
 	"history"
 	"log"
 	"os"
@@ -410,7 +411,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -457,7 +458,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -523,7 +524,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -584,7 +585,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -652,7 +653,7 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					}
 					items := strings.Split(v["item"].(string), ",")
 					for _, i := range items {
-						if len(items) > 1 &&v["itemdist"]!=nil{
+						if len(items) > 1 && v["itemdist"] != nil {
 							v["matchkey"] = v["itemdist"].(map[string]interface{})[i]
 							v["item"] = i
 						}
@@ -718,7 +719,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 			}
 			//xf.Sheets[0].Name = "详细数据"
 			//生文件
-			t := strconv.FormatInt(time.Now().Unix(), 10)
+			//t := strconv.FormatInt(time.Now().Unix(), 10)
+			t := time.Now().Format("20060102")
 			dir := "./web/res/xlsx/" + t + "/"
 			if b, _ := history.PathExists(dir); !b {
 				err1 := os.MkdirAll(dir, os.ModePerm)
@@ -726,8 +728,8 @@ func GetXlsxs(mMap []map[string]interface{}, fn, email, id string) {
 					log.Println("mkdir err", dir)
 				}
 			}
-			fname := t + ".xlsx"
-			//err = xf.Save(dir + fname)
+			fname := fmt.Sprintf("%s_%s_%s.xlsx", fn, t,qu.GetRandom(4))
+			log.Println("fname", fname)
 			err = newFile.Save(dir + fname)
 			if err != nil {
 				log.Println("xls error", fname)

src/util/parsxlsx.go

@@ -234,7 +234,7 @@ func writeMap1(tmp map[string]string, i int, v string) {
 	}
 }
 
-var bzpath, gjpath, rpath string = "web/res/%s_数据_%d.xlsx", "web/res/%s_数据_%d.xlsx", "web/res/%s_规则_%d.xlsx"
+var bzpath, gjpath, rpath string = "web/res/%s_数据_%s_%s.xlsx", "web/res/%s_数据_%s_%s.xlsx", "web/res/%s_规则_%s_%s.xlsx"
 
 func ResponseXlsx_Data(id string) string {
 	if id != "" {
@@ -286,7 +286,8 @@ func ResponseXlsx_Data(id string) string {
 				}
 				xf.Sheets = xf.Sheets[:1]
 				xf.Sheets[0].Name = "详细数据"
-				fname := fmt.Sprintf(bzpath, ruleName, time.Now().Unix())
+				t := time.Now().Format("20060102")
+				fname := fmt.Sprintf(bzpath, ruleName, t,util.GetRandom(4))
 				err := xf.Save(fname)
 				if err != nil {
 					log.Println(err)
@@ -344,7 +345,8 @@ func ResponseXlsx_Data(id string) string {
 				}
 				xf.Sheets = xf.Sheets[1:2]
 				xf.Sheets[0].Name = "详细数据"
-				fname := fmt.Sprintf(gjpath, ruleName, time.Now().Unix())
+				t := time.Now().Format("20060102")
+				fname := fmt.Sprintf(gjpath, ruleName, t,util.GetRandom(4))
 				err := xf.Save(fname)
 				if err != nil {
 					log.Println(err)
@@ -420,7 +422,8 @@ func ResponseXlsx_Rule(id string) string {
 		}
 	}
 	ruleName := (*data)["s_name"]
-	fname := fmt.Sprintf(rpath, ruleName, time.Now().Unix())
+	t := time.Now().Format("20060102")
+	fname := fmt.Sprintf(rpath, ruleName, t,util.GetRandom(4))
 	xf.Save(fname)
 	return fname
 }