From 12e9a7ce63aed60a06c5d53770a312a069b0cb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 16 Aug 2021 15:19:57 +0800
Subject: [PATCH] 'commit'

---
 dsSzxy/.idea/workspace.xml                                   | 1 +
 .../FileRelate/FileRelateController/FileReleateController.go | 4 +++-
 dsSzxy/Business/FileRelate/FileRelateDao/FileReleateDao.go   | 5 ++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml
index 024f2452..2923a0bf 100644
--- a/dsSzxy/.idea/workspace.xml
+++ b/dsSzxy/.idea/workspace.xml
@@ -7,6 +7,7 @@
     <list default="true" id="19c8c37d-a056-451c-a29d-fb612b9a3e2f" name="Default Changelist" comment="commit">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Business/FileRelate/FileRelateController/FileReleateController.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/FileRelate/FileRelateController/FileReleateController.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Business/FileRelate/FileRelateDao/FileReleateDao.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/FileRelate/FileRelateDao/FileReleateDao.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/dsSzxy/Business/FileRelate/FileRelateController/FileReleateController.go b/dsSzxy/Business/FileRelate/FileRelateController/FileReleateController.go
index 78088dec..023b3c7b 100644
--- a/dsSzxy/Business/FileRelate/FileRelateController/FileReleateController.go
+++ b/dsSzxy/Business/FileRelate/FileRelateController/FileReleateController.go
@@ -107,7 +107,7 @@ func fileUpload(c *gin.Context) {
 	targetIdentityId := CommonUtil.ConvertStringToInt32(c.PostForm("target_identity_id")) //目标人身份ID
 	targetPersonId := CommonUtil.ConvertStringToInt32(c.PostForm("target_person_id"))     //目标人员ID
 	systemId := CommonUtil.ConvertStringToInt32(c.PostForm("system_id"))                  //系统id
-	FileRelateDao.FileRecord(filename, identityId, personId, targetGroupId, targetIdentityId, targetPersonId, systemId, int32(size), ext)
+	FileRelateDao.FileRecord(uuid,filename, identityId, personId, targetGroupId, targetIdentityId, targetPersonId, systemId, int32(size), ext)
 
 	//返回
 	s := FileRelateDao.GetFileDownLoadUrl(trueName[0:2]+"/"+trueName, file.Filename)
@@ -149,6 +149,7 @@ func fileUpload(c *gin.Context) {
 			"url":          s,
 			"thumbContent": sourceString,
 			"size":         size,
+			"file_id":      uuid,
 		})
 	} else {
 		//删除原始文件
@@ -157,6 +158,7 @@ func fileUpload(c *gin.Context) {
 			"success": true,
 			"url":     s,
 			"size":    size,
+			"file_id": uuid,
 		})
 	}
 }
diff --git a/dsSzxy/Business/FileRelate/FileRelateDao/FileReleateDao.go b/dsSzxy/Business/FileRelate/FileRelateDao/FileReleateDao.go
index 38813e0e..2918f154 100644
--- a/dsSzxy/Business/FileRelate/FileRelateDao/FileReleateDao.go
+++ b/dsSzxy/Business/FileRelate/FileRelateDao/FileReleateDao.go
@@ -25,9 +25,9 @@ func GetFileDownLoadUrl(key string, originName string) string {
 }
 
 //文件记录
-func FileRecord(fileName string, indentityId int32, personId int32, targetGroupId int32, tIdentityId int32, tPersonId int32, systemId int32, fileSize int32, extName string) {
+func FileRecord(fileId string, fileName string, indentityId int32, personId int32, targetGroupId int32, tIdentityId int32, tPersonId int32, systemId int32, fileSize int32, extName string) {
 	var model models.TZhxyFile
-	model.FileId = CommonUtil.GetUUID()
+	model.FileId = fileId
 	model.FileName = fileName
 	model.FileSize = fileSize
 	model.BaseId = "-1"
@@ -49,7 +49,6 @@ func FileRecord(fileName string, indentityId int32, personId int32, targetGroupI
 	_, err = db.Insert(model)
 	if err != nil {
 		fmt.Println(err)
-		return
 	}
 }