Merge branch 'dm' of http://8.136.199.33:3000/eta_gn_server/eta_api into dm

controllers/data_manage/edb_info.go

@@ -5548,9 +5548,8 @@ func (this *EdbInfoController) EdbChartList() {
 		br.ErrMsg = "获取普通指标列表失败, Err:" + e.Error()
 		return
 	}
-	if len(list) == 0 {
-		list = make([]*data_manage.EdbInfoList, 0)
-	} else {
+	respList := make([]*data_manage.EdbInfoList, 0)
+	if len(list) > 0 {
 		classifyIdList := make([]int, 0)
 		for _, v := range list {
 			v.ConvertToResp()
@@ -5609,6 +5608,11 @@ func (this *EdbInfoController) EdbChartList() {
 				if currClassify, ok := classifyMap[v.ClassifyId]; ok {
 					v.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(v.IsJoinPermission, currClassify.IsJoinPermission, v.EdbInfoId, v.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
 
+					// 不展示无权限的
+					if !v.HaveOperaAuth {
+						continue
+					}
+
 					v.Button = data.GetEdbOpButton(sysUser, v.SysUserId, v.EdbType, v.EdbInfoType, v.HaveOperaAuth)
 				}
 
@@ -5618,6 +5622,8 @@ func (this *EdbInfoController) EdbChartList() {
 						v.IsSupplierStop = 1
 					}
 				}
+
+				respList = append(respList, v)
 			}
 		}
 
@@ -5626,7 +5632,7 @@ func (this *EdbInfoController) EdbChartList() {
 
 	resp := response.EdbInfoChartListResp{
 		Paging: page,
-		List:   list,
+		List:   respList,
 	}
 	br.Ret = 200
 	br.Success = true

controllers/data_manage/predict_edb_info.go

@@ -127,9 +127,8 @@ func (this *PredictEdbInfoController) EdbChartList() {
 		return
 	}
 
-	if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
-		list = make([]*data_manage.EdbInfoList, 0)
-	} else {
+	respList := make([]*data_manage.EdbInfoList, 0)
+	if len(list) > 0 {
 		classifyIdList := make([]int, 0)
 		for _, v := range list {
 			v.ConvertToResp()
@@ -164,7 +163,15 @@ func (this *PredictEdbInfoController) EdbChartList() {
 			for _, v := range list {
 				if currClassify, ok := classifyMap[v.ClassifyId]; ok {
 					v.HaveOperaAuth = data_manage_permission.CheckEdbPermissionByPermissionIdList(v.IsJoinPermission, currClassify.IsJoinPermission, v.EdbInfoId, v.ClassifyId, permissionEdbIdList, permissionClassifyIdList)
+
+					// 不展示无权限的
+					if !v.HaveOperaAuth {
+						continue
+					}
+
 					v.Button = data.GetEdbOpButton(sysUser, v.SysUserId, v.EdbType, v.EdbInfoType, v.HaveOperaAuth)
+
+					respList = append(respList, v)
 				}
 			}
 		}
@@ -174,7 +181,7 @@ func (this *PredictEdbInfoController) EdbChartList() {
 
 	resp := response.PredictEdbInfoListResp{
 		Paging: page,
-		List:   list,
+		List:   respList,
 	}
 	br.Ret = 200
 	br.Success = true

controllers/report_approve/report_approve.go

@@ -615,7 +615,19 @@ func (this *ReportApproveController) Detail() {
 		detail.Report.ReportLayout = reportInfo.ReportLayout
 
 		detail.Report.ReportCode = utils.MD5(strconv.Itoa(approveItem.ReportId))
-		detail.Report.ReportClassify = fmt.Sprintf("%s/%s/%s", report_approve.FlowReportTypeMap[approveItem.ReportType], cnClassifyIdName[approveItem.ClassifyFirstId], cnClassifyIdName[approveItem.ClassifySecondId])
+		var reportClassify []string
+		reportClassify = append(reportClassify, report_approve.FlowReportTypeMap[approveItem.ReportType])
+		if v, ok := cnClassifyIdName[approveItem.ClassifyFirstId]; ok {
+			reportClassify = append(reportClassify, v)
+		}
+		if v, ok := cnClassifyIdName[approveItem.ClassifySecondId]; ok {
+			reportClassify = append(reportClassify, v)
+		}
+		if v, ok := cnClassifyIdName[approveItem.ClassifyThirdId]; ok {
+			reportClassify = append(reportClassify, v)
+		}
+		detail.Report.ReportClassify = strings.Join(reportClassify, "/")
+		// detail.Report.ReportClassify = fmt.Sprintf("%s/%s/%s/%s", report_approve.FlowReportTypeMap[approveItem.ReportType], cnClassifyIdName[approveItem.ClassifyFirstId], cnClassifyIdName[approveItem.ClassifySecondId], cnClassifyIdName[approveItem.ClassifyThirdId])
 	}
 	if approveItem.ReportType == report_approve.FlowReportTypeEnglish {
 		detail.Report.ReportCode = utils.MD5(strconv.Itoa(approveItem.ReportId))

controllers/resource.go

@@ -15,8 +15,11 @@ import (
 	"os"
 	"path"
 	"regexp"
+	"strconv"
 	"strings"
 	"time"
+
+	rdHttp "github.com/rdlucklib/rdluck_tools/http"
 )
 
 // 资源管理-图片上传，合同上传等
@@ -1090,3 +1093,31 @@ func (this *ResourceAuthController) FileDownload() {
 	br.Success = true
 	this.Ctx.Output.Download(localFilePath, fileName)
 }
+
+// FileDownload
+// @Title 文件加载
+// @Description 文件加载
+// @Param   FileUrl  query  string  true  "文件路径"
+// @Success 200 Ret=200 操作成功
+// @router /file/reload [get]
+func (this *ResourceController) FileReload() {
+
+	fileUrl := `https://hzstatic.hzinsights.com/static/images/202202/20220208/Qr3dulOoVTJgyl8skH1jL1kv36RX.png`
+
+	body, err := rdHttp.Get(fileUrl)
+	if err != nil {
+		fmt.Println("err: ", err)
+		this.Ctx.WriteString("err: " + err.Error() + "")
+		return
+	}
+	// 设置响应头
+	this.Ctx.ResponseWriter.Header().Set("Content-Type", "image/png")
+	this.Ctx.ResponseWriter.Header().Set("Content-Length", strconv.Itoa(len(body)))
+
+	// 将文件内容写入响应体
+	_, err = this.Ctx.ResponseWriter.Write(body)
+	if err != nil {
+		http.Error(this.Ctx.ResponseWriter, "Failed to write response", http.StatusInternalServerError)
+		return
+	}
+}

models/speech_recognition/speech_recognition_tag.go

@@ -222,7 +222,7 @@ func (m *SpeechRecognitionTag) UpdateSortByMenuId(menuId, nowSort int, prevTagId
 // GetMaxSortByMenuId 获取分类下最大Sort
 func (m *SpeechRecognitionTag) GetMaxSortByMenuId(menuId int) (sort int, err error) {
 	// o := orm.NewOrm()
-	sql := fmt.Sprintf(`SELECT MAX(sort) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionTagCols.MenuId)
+	sql := fmt.Sprintf(`SELECT COALESCE(MAX(sort), 0) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionTagCols.MenuId)
 	//err = o.Raw(sql, menuId).QueryRow(&sort)
 	err = global.DEFAULT_DmSQL.Raw(sql, menuId).Scan(&sort).Error
 	return

models/speech_recognition/speech_recognition_tag_menu.go

@@ -245,7 +245,7 @@ func (m *SpeechRecognitionTagMenu) UpdateSortByParentId(parentId, menuId, nowSor
 // GetMaxSortByParentId 获取父级分类下最大Sort
 func (m *SpeechRecognitionTagMenu) GetMaxSortByParentId(parentId int) (sort int, err error) {
 	// o := orm.NewOrm()
-	sql := fmt.Sprintf(`SELECT MAX(sort) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionTagMenuCols.ParentId)
+	sql := fmt.Sprintf(`SELECT COALESCE(MAX(sort), 0) AS sort FROM %s WHERE %s = ?`, m.TableName(), SpeechRecognitionTagMenuCols.ParentId)
 	//err = o.Raw(sql, parentId).QueryRow(&sort)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return

routers/commentsRouter.go

@@ -10330,6 +10330,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta_gn/eta_api/controllers:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:ResourceController"],
+        beego.ControllerComments{
+            Method: "FileReload",
+            Router: `/file/reload`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta_gn/eta_api/controllers:ResourceController"] = append(beego.GlobalControllerRouter["eta_gn/eta_api/controllers:ResourceController"],
         beego.ControllerComments{
             Method: "Upload",