Merge branch 'eta/2.0.0' into debug

controllers/data_manage/manual_edb.go

@@ -23,31 +23,6 @@ type ManualEdbController struct {
 	controllers.BaseAuthController
 }
 
-// TemplateDownload
-// @Title 下载模板
-// @Description 下载模板
-// @Success 200 {object} models.EdbdataClassifyResp
-// @Param   Source   query   int  false       "来源：1：模板1；2：模板2"
-// @router /template [get]
-func (c *ManualEdbController) TemplateDownload() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		c.Data["json"] = br
-		c.ServeJSON()
-	}()
-	source, _ := c.GetInt("Source")
-	switch source {
-	case 2:
-		c.Ctx.Output.Download("./static/template/导入模板2.xlsx", "数据导入模板2.xlsx")
-	default:
-		c.Ctx.Output.Download("./static/template/导入模板1.xlsx", "数据导入模板1.xlsx")
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "下载成功"
-}
-
 // EdbDetail
 // @Title 指标列表
 // @Description 指标列表

controllers/target.go

@@ -819,8 +819,15 @@ func (this *TargetCommonController) TemplateDownload() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	source, _ := this.GetInt("Source")
+	switch source {
+	case 2:
+		this.Ctx.Output.Download("./static/template/导入模板2.xlsx", "数据导入模板2.xlsx")
+	default:
+		this.Ctx.Output.Download("./static/template/导入模板1.xlsx", "数据导入模板1.xlsx")
+	}
 
-	this.Ctx.Output.Download("./static/数据导入模板.xlsx", "数据导入模板.xlsx")
+	//this.Ctx.Output.Download("./static/数据导入模板.xlsx", "数据导入模板.xlsx")
 
 	br.Ret = 200
 	br.Success = true

routers/commentsRouter.go

@@ -5299,15 +5299,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ManualEdbController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:ManualEdbController"],
-        beego.ControllerComments{
-            Method: "TemplateDownload",
-            Router: `/template`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:MyChartController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers/data_manage:MyChartController"],
         beego.ControllerComments{
             Method: "MyChartAdd",

services/data/manual.go

@@ -217,6 +217,7 @@ func ManualIndexSource2Edb(req ManualIndexSource2EdbReq, lang string) (edb *data
 }
 
 func ImportManualData(path string, sysUser *system.Admin) (successCount, failCount int, err error, errMsg string) {
+	// TODO 操作记录
 	errMsg = `导入失败`
 	xlFile, err := xlsx.OpenFile(path)
 	if err != nil {