文档管理-文件上传

controllers/base_auth.go

@@ -25,8 +25,8 @@ func (this *BaseAuthController) Prepare() {
 		//校验签名
 		nonce := this.Ctx.Input.Header("nonce")
 		timestamp := this.Ctx.Input.Header("timestamp")
-		appid := this.Ctx.Input.Header("appid")
-		signature := this.Ctx.Input.Header("signature")
+		/*appid := this.Ctx.Input.Header("appid")
+		signature := this.Ctx.Input.Header("signature")*/
 
 		if nonce == "" {
 			errMsg := "随机字符串不能为空"
@@ -42,7 +42,7 @@ func (this *BaseAuthController) Prepare() {
 			return
 		}
 
-		if appid != utils.AppId {
+		/*if appid != utils.AppId {
 			errMsg := "商家AppId错误，请核查"
 			this.JSON(models.BaseResponse{Ret: 400, Msg: "", ErrMsg: errMsg}, false, false)
 			this.StopRun()
@@ -56,7 +56,7 @@ func (this *BaseAuthController) Prepare() {
 			this.JSON(models.BaseResponse{Ret: 401, Msg: "", ErrMsg: errMsg}, false, false)
 			this.StopRun()
 			return
-		}
+		}*/
 		if method != "GET" && method != "POST" {
 			errMsg := "无效的请求方式"
 			this.JSON(models.BaseResponse{Ret: 501, Msg: "", ErrMsg: errMsg}, false, false)

controllers/outside_report_controller.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"eta/eta_hub/models"
 	"eta/eta_hub/models/document_manage_model"
+	"eta/eta_hub/models/system"
 	"eta/eta_hub/services/document_manage_service"
 )
 
@@ -24,7 +25,6 @@ func (this *OutsideReportController) DocumentSave() {
 		this.ServeJSON()
 	}()
 
-	sysUser := this.SysUser
 	var req *document_manage_model.OutsideReportBO
 	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
 		br.Msg = "参数解析异常！"
@@ -32,9 +32,12 @@ func (this *OutsideReportController) DocumentSave() {
 		return
 	}
 
+	userName := req.UserName
+	sysUser, err := system.GetUserByAdminName(userName)
+
 	req.SysUserId = sysUser.AdminId
 	req.SysUserName = sysUser.AdminName
-	err := document_manage_service.DocumentSave(req)
+	err = document_manage_service.DocumentSave(req)
 	if err != nil {
 		br.Msg = "保存文档失败"
 		br.ErrMsg = "保存文档失败，Err:" + err.Error()

controllers/resource_deal_with_controller.go

@@ -5,8 +5,6 @@ import (
 	"eta/eta_hub/models"
 	"eta/eta_hub/services"
 	"eta/eta_hub/utils"
-	"github.com/h2non/filetype"
-	"io/ioutil"
 	"os"
 	"path"
 	"time"
@@ -23,7 +21,7 @@ type ResourceDealWithController struct {
 // @Param   AiChatTopicId   query   int  true       "主题id"
 // @Success 200 {object} models.ResourceResp
 // @router /file/upload [post]
-func (this *OutsideReportController) FileUpload() {
+func (this *ResourceDealWithController) FileUpload() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -36,7 +34,7 @@ func (this *OutsideReportController) FileUpload() {
 		return
 	}
 
-	fileData, e := ioutil.ReadAll(f)
+	/*fileData, e := ioutil.ReadAll(f)
 	if e != nil {
 		br.Msg = "上传失败"
 		br.ErrMsg = "读取文件失败, Err: " + e.Error()
@@ -47,7 +45,7 @@ func (this *OutsideReportController) FileUpload() {
 		br.Msg = "文件格式有误"
 		br.ErrMsg = "文件格式有误"
 		return
-	}
+	}*/
 
 	uploadFileName := h.Filename //上传的文件名
 	ext := path.Ext(h.Filename)

models/document_manage_model/outside_report.go

@@ -39,6 +39,8 @@ type OutsideReportBO struct {
 	SysUserId       int    `orm:"column(sys_user_id)" description:"创建人id"`
 	SysUserName     string `orm:"column(sys_user_name)" description:"创建人姓名"`
 	ReportCode      string `orm:"column(report_code)" description:"报告唯一编码"`
+	AuthCode        string `orm:"column(auth_code)" description:"报告权限编码"`
+	UserName        string `description:"用户名称"`
 	AttachmentList  []*OutsideReportAttachment
 }
 

models/resource.go

@@ -25,8 +25,18 @@ type ResourceResp struct {
 
 func AddResource(item *Resource) (newId int64, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	newId, err = o.Insert(item)
-	return
+
+	sql := "INSERT INTO resource(resource_url,create_time,resource_type) VALUES(?,?,?)"
+	res, err := o.Raw(sql, item.ResourceUrl, item.CreateTime, item.ResourceType).Exec()
+	if err != nil {
+		return 0, err
+	}
+	newId, err = res.LastInsertId()
+	if err != nil {
+		return 0, err
+	}
+
+	return newId, err
 }
 
 func GetResourceById(id string) (item *Resource, err error) {

models/system/sys_user.go

@@ -1,6 +1,7 @@
 package system
 
 import (
+	"eta/eta_hub/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
@@ -98,6 +99,19 @@ func GetSysUserByAdminName(adminName string) (item *AdminItem, err error) {
 	return
 }
 
+// GetUserByAdminName 根据系统用户名获取用户信息
+func GetUserByAdminName(adminName string) (item *AdminItem, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM admin WHERE admin_name = ? LIMIT 1`
+	err = o.Raw(sql, adminName).QueryRow(&item)
+
+	if err != nil && err.Error() == utils.ErrNoRow() {
+		return nil, nil
+	}
+
+	return item, err
+}
+
 type UserCheckResp struct {
 	IsUser    bool
 	AdminInfo *AdminItem

routers/commentsRouter.go

@@ -232,15 +232,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_hub/controllers:OutsideReportController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:OutsideReportController"],
-        beego.ControllerComments{
-            Method: "FileUpload",
-            Router: `/file/upload`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"],
         beego.ControllerComments{
             Method: "Approve",
@@ -286,6 +277,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_hub/controllers:ResourceDealWithController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ResourceDealWithController"],
+        beego.ControllerComments{
+            Method: "FileUpload",
+            Router: `/file/upload`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_hub/controllers:SmartReportController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:SmartReportController"],
         beego.ControllerComments{
             Method: "Approve",

routers/router.go

@@ -78,6 +78,11 @@ func init() {
 				&controllers.OutsideReportController{},
 			),
 		),
+		web.NSNamespace("/resource_deal_with",
+			web.NSInclude(
+				&controllers.ResourceDealWithController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }