|
|
@@ -2,8 +2,6 @@ package data_manage
|
|
|
|
|
|
import (
|
|
|
"encoding/json"
|
|
|
- "fmt"
|
|
|
- "github.com/rdlucklib/rdluck_tools/paging"
|
|
|
"eta/eta_api/controllers"
|
|
|
"eta/eta_api/models"
|
|
|
"eta/eta_api/models/data_manage"
|
|
|
@@ -11,6 +9,8 @@ import (
|
|
|
"eta/eta_api/services"
|
|
|
"eta/eta_api/services/data"
|
|
|
"eta/eta_api/utils"
|
|
|
+ "fmt"
|
|
|
+ "github.com/rdlucklib/rdluck_tools/paging"
|
|
|
"os"
|
|
|
"os/exec"
|
|
|
"sort"
|
|
|
@@ -2226,205 +2226,6 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-//
|
|
|
-//// @Param Img query string true "图片"
|
|
|
-//// @Success 200 {object} models.ResourceResp
|
|
|
-//// @router /chart_info/base64Upload [post]
|
|
|
-//func (this *ChartInfoController) ChartInfoBase64Upload() {
|
|
|
-//
|
|
|
-// br := new(models.BaseResponse).Init()
|
|
|
-// defer func() {
|
|
|
-// this.Data["json"] = br
|
|
|
-// this.ServeJSON()
|
|
|
-// }()
|
|
|
-//
|
|
|
-// var err error
|
|
|
-// ext := ".png"
|
|
|
-// uploadDir := "./static"
|
|
|
-// randStr := utils.GetRandStringNoSpecialChar(28)
|
|
|
-// fileName := randStr + ext
|
|
|
-// fpath := uploadDir + "/" + fileName
|
|
|
-//
|
|
|
-// image := this.Ctx.Request.FormValue("Img")
|
|
|
-// if image == "" {
|
|
|
-// resp := new(models.ResourceResp)
|
|
|
-// resp.Id = 0
|
|
|
-// resp.ResourceUrl = ""
|
|
|
-// br.Msg = "上传成功"
|
|
|
-// br.Ret = 200
|
|
|
-// br.Success = true
|
|
|
-// br.Data = resp
|
|
|
-// return
|
|
|
-// }
|
|
|
-// b, _ := regexp.MatchString(`^data:\s*image\/(\w+);base64,`, image)
|
|
|
-// if !b {
|
|
|
-// br.Msg = "图片格式不正确"
|
|
|
-// br.ErrMsg = "图片格式不正确"
|
|
|
-// return
|
|
|
-// }
|
|
|
-// re, _ := regexp.Compile(`^data:\s*image\/(\w+);base64,`)
|
|
|
-// base64Str := re.ReplaceAllString(image, "")
|
|
|
-// base64Str = strings.Replace(base64Str, " ", "", -1)
|
|
|
-//
|
|
|
-// err = utils.SaveBase64ToFile(base64Str, fpath)
|
|
|
-// if err != nil {
|
|
|
-// br.Msg = "图片保存失败"
|
|
|
-// br.ErrMsg = "图片保存失败,Err:" + err.Error()
|
|
|
-// return
|
|
|
-// }
|
|
|
-// fmt.Println("end")
|
|
|
-//
|
|
|
-// defer os.Remove(fpath)
|
|
|
-//
|
|
|
-// hzUploadDir := "static/images/"
|
|
|
-// savePath := hzUploadDir + time.Now().Format("200601/20060102/")
|
|
|
-// savePath += fileName
|
|
|
-// //上传到阿里云
|
|
|
-// err = services.UploadFileToAliyun(fileName, fpath, savePath)
|
|
|
-// if err != nil {
|
|
|
-// br.Msg = "文件上传失败"
|
|
|
-// br.ErrMsg = "文件上传失败，Err:" + err.Error()
|
|
|
-// return
|
|
|
-// }
|
|
|
-// utils.FileLog.Info("%s:", time.Now().Format(utils.FormatDateTime))
|
|
|
-// utils.FileLog.Info("end update oss ")
|
|
|
-//
|
|
|
-// fileHost := "https://hzstatic.hzinsights.com/"
|
|
|
-//
|
|
|
-// resourceUrl := fileHost + savePath
|
|
|
-//
|
|
|
-// item := new(models.Resource)
|
|
|
-// item.ResourceUrl = resourceUrl
|
|
|
-// item.ResourceType = 1
|
|
|
-// item.CreateTime = time.Now()
|
|
|
-// newId, err := models.AddResource(item)
|
|
|
-// if err != nil {
|
|
|
-// br.Msg = "资源上传失败"
|
|
|
-// br.ErrMsg = "资源上传失败,Err:" + err.Error()
|
|
|
-// return
|
|
|
-// }
|
|
|
-// resp := new(models.ResourceResp)
|
|
|
-// resp.Id = newId
|
|
|
-// resp.ResourceUrl = resourceUrl
|
|
|
-// br.Msg = "上传成功"
|
|
|
-// br.Ret = 200
|
|
|
-// br.Success = true
|
|
|
-// br.Data = resp
|
|
|
-//
|
|
|
-// //br := new(models.BaseResponse).Init()
|
|
|
-// //defer func() {
|
|
|
-// // this.Data["json"] = br
|
|
|
-// // this.ServeJSON()
|
|
|
-// //}()
|
|
|
-// //imgData := this.GetString("Img")
|
|
|
-// //if imgData == "" {
|
|
|
-// // br.Msg = "图片参数错误"
|
|
|
-// // br.ErrMsg = "图片参数错误,Img Is Empty"
|
|
|
-// // return
|
|
|
-// //}
|
|
|
-//
|
|
|
-// //dateDir := time.Now().Format("20060102")
|
|
|
-// //uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
|
|
|
-// //
|
|
|
-// //if !utils.FileIsExist(uploadDir) {
|
|
|
-// // err := os.MkdirAll(uploadDir, 777)
|
|
|
-// // if err != nil {
|
|
|
-// // br.Msg = "存储目录创建失败"
|
|
|
-// // br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
|
|
|
-// // return
|
|
|
-// // }
|
|
|
-// //}
|
|
|
-// //var resourceUrl string
|
|
|
-// //param := url.Values{}
|
|
|
-// //param.Add("Sign", "dIGi2M0VN21s3dKS")
|
|
|
-// //param.Add("Img", imgData)
|
|
|
-// //svgToPngUrl := `http://8.136.199.33:8086/v1/image/svg_to_png`
|
|
|
-// //respBody, err := http.Post(svgToPngUrl, param.Encode(), "")
|
|
|
-// //if err != nil {
|
|
|
-// // br.Msg = "文件上传失败"
|
|
|
-// // br.ErrMsg = "图片格式转换失败，Err:" + err.Error()
|
|
|
-// // return
|
|
|
-// //}
|
|
|
-// //fmt.Println(string(respBody))
|
|
|
-// //respItem := new(data_manage.ImageSvgToPngResp)
|
|
|
-// //err = json.Unmarshal(respBody, &respItem)
|
|
|
-// //if err != nil {
|
|
|
-// // br.Msg = "文件上传失败"
|
|
|
-// // br.ErrMsg = "图片格式转换失败，Unmarshal Err:" + err.Error()
|
|
|
-// // return
|
|
|
-// //}
|
|
|
-// //resourceUrl = respItem.Data.ResourceURL
|
|
|
-// //resp := new(models.ResourceResp)
|
|
|
-// //resp.ResourceUrl = resourceUrl
|
|
|
-// //br.Msg = "上传成功"
|
|
|
-// //br.Ret = 200
|
|
|
-// //br.Success = true
|
|
|
-// //br.Data = resp
|
|
|
-//
|
|
|
-//
|
|
|
-//
|
|
|
-// /*
|
|
|
-// svg 转 png
|
|
|
-//
|
|
|
-// uploadDir := "static/images/"
|
|
|
-// if !utils.FileIsExist(uploadDir) {
|
|
|
-// err := os.MkdirAll(uploadDir, 777)
|
|
|
-// if err != nil {
|
|
|
-// br.Msg = "图表保存失败"
|
|
|
-// br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
|
|
|
-// return
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// var saveToOssPath string
|
|
|
-// randStr := utils.GetRandStringNoSpecialChar(28)
|
|
|
-// var fileName, outFileName string
|
|
|
-// fileName = randStr + ".txt"
|
|
|
-// //saveSvgPath = uploadDir + fileName
|
|
|
-// err := utils.SaveToFile(imgData, fileName)
|
|
|
-// if err != nil {
|
|
|
-// br.Msg = "图片保存失败"
|
|
|
-// br.ErrMsg = "图片保存失败,Err:" + err.Error()
|
|
|
-// return
|
|
|
-// }
|
|
|
-//
|
|
|
-// outFileName = randStr + ".png"
|
|
|
-// cd := exec.Command("highcharts-export-server", "--infile", fileName, "--constr", "Chart", "--scale", "2", "--workers", "5", "--workLimit", "5", "--outfile", outFileName)
|
|
|
-// str, err := cd.Output()
|
|
|
-// fmt.Println(string(str))
|
|
|
-// if err != nil {
|
|
|
-// fmt.Println("Command Err:" + err.Error())
|
|
|
-// return
|
|
|
-// }
|
|
|
-// fmt.Println("end convert", time.Now())
|
|
|
-//
|
|
|
-// defer func() {
|
|
|
-// os.Remove(fileName)
|
|
|
-// os.Remove(outFileName)
|
|
|
-// }()
|
|
|
-// saveToOssPath = uploadDir + time.Now().Format("200601/20060102/")
|
|
|
-// saveToOssPath += outFileName
|
|
|
-// //上传到阿里云
|
|
|
-// fmt.Println("upload:", outFileName, saveToOssPath)
|
|
|
-// err = services.UploadFileToAliyun("", outFileName, saveToOssPath)
|
|
|
-// if err != nil {
|
|
|
-// br.Msg = "文件上传失败"
|
|
|
-// br.ErrMsg = "文件上传失败，Err:" + err.Error()
|
|
|
-// return
|
|
|
-// }
|
|
|
-// fileHost := "https://hzstatic.hzinsights.com/"
|
|
|
-// resourceUrl := fileHost + saveToOssPath
|
|
|
-//
|
|
|
-// resp := new(models.ResourceResp)
|
|
|
-// resp.ResourceUrl = resourceUrl
|
|
|
-// br.Msg = "上传成功"
|
|
|
-// br.Ret = 200
|
|
|
-// br.Success = true
|
|
|
-// br.Data = resp
|
|
|
-// */
|
|
|
-// return
|
|
|
-//}
|
|
|
-
|
|
|
// @Param Img query string true "图片"
|
|
|
// @Success 200 {object} models.ResourceResp
|
|
|
// @router /chart_info/base64Upload [post]
|
|
|
@@ -2504,8 +2305,7 @@ func (this *ChartInfoController) ChartInfoBase64Upload() {
|
|
|
br.ErrMsg = "文件上传失败，Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- fileHost := "https://hzstatic.hzinsights.com/"
|
|
|
- resourceUrl := fileHost + saveToOssPath
|
|
|
+ resourceUrl := utils.Imghost + saveToOssPath
|
|
|
resp.ResourceUrl = resourceUrl
|
|
|
resp.Source = "convert"
|
|
|
//resp.CacheKey = imgDataKey
|
