Merge branch 'master' of http://192.168.1.41:3000/caipin/construction_management

# Conflicts:
#	web/api/annex_api.go

services/safe_service.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"log"
 	"strconv"
-	"time"
 
 	"github.com/kataras/iris/v12"
 	"go.mod/comm"
@@ -20,9 +19,9 @@ type SafeService interface {
 	Post(data models.CmSafe) error
 	Del(id int) error
 	GetDetail(id int, pid int) viewmodels.SafeDetail
-	SaveFileInfo(bid int, sid int, uid int, fileList []viewmodels.FileList) error
+	// SaveFileInfo(bid int, sid int, uid int, fileList []viewmodels.FileList) error
 	ValidRule(ctx iris.Context) (viewmodels.Safe, error)
-	ValidFile(ctx iris.Context) (viewmodels.File, error)
+	// ValidFile(ctx iris.Context) (viewmodels.File, error)
 }
 
 // //返回service操作类
@@ -113,29 +112,29 @@ func (s *safeService) GetDetail(id int, pid int) viewmodels.SafeDetail {
 }
 
 // 安全巡检附件数据存库
-func (s *safeService) SaveFileInfo(bid int, sid int, uid int, fileList []viewmodels.FileList) error {
-	fileData := make([]models.CmSafeFile, 0)
-	for _, file := range fileList {
-		fileVM := models.CmSafeFile{}
-		fileVM.BidsectionId = bid
-		fileVM.SafeId = sid
-		fileVM.Uid = uid
-		createTime, _ := time.Parse("2020-11-11 20:30:12", file.CreateTime)
-		fileVM.CreatedTime = createTime
-		fileVM.FileName = file.FileName
-		fileVM.FilePath = file.FilePath
-		fileData = append(fileData, fileVM)
-	}
-	err := s.daoSafeFile.InsertByList(fileData)
-	return err
-}
+// func (s *safeService) SaveFileInfo(bid int, sid int, uid int, fileList []viewmodels.FileList) error {
+// 	fileData := make([]models.CmSafeFile, 0)
+// 	for _, file := range fileList {
+// 		fileVM := models.CmSafeFile{}
+// 		fileVM.BidsectionId = bid
+// 		fileVM.SafeId = sid
+// 		fileVM.Uid = uid
+// 		createTime, _ := time.Parse("2020-11-11 20:30:12", file.CreateTime)
+// 		fileVM.CreatedTime = createTime
+// 		fileVM.FileName = file.FileName
+// 		fileVM.FilePath = file.FilePath
+// 		fileData = append(fileData, fileVM)
+// 	}
+// 	err := s.daoSafeFile.InsertByList(fileData)
+// 	return err
+// }
 
 // 校验文件规则
-func (s *safeService) ValidFile(ctx iris.Context) (viewmodels.File, error) {
-	fileValid := viewmodels.File{}
-	err := ctx.ReadJSON(&fileValid)
-	return fileValid, err
-}
+// func (s *safeService) ValidFile(ctx iris.Context) (viewmodels.File, error) {
+// 	fileValid := viewmodels.File{}
+// 	err := ctx.ReadJSON(&fileValid)
+// 	return fileValid, err
+// }
 
 // 规则校验
 func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {

web/api/annex_api.go

@@ -8,6 +8,7 @@ package api
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/kataras/iris/v12"
 	"go.mod/services"
@@ -40,7 +41,10 @@ func (c *AnnexApi) Get() {
 		return
 	}
 	dataId, err := utils.GetDecryptId(annexData.DataId)
-	data = c.ServiceAnnex.Get(int(annexData.DataType), dataId)
+	dataType, err := strconv.Atoi(annexData.DataType)
+	data = c.ServiceAnnex.Get(dataType, dataId)
+	dataType, err := strconv.Atoi(annexData.DataType)
+	data := c.ServiceAnnex.Get(dataType, dataId)
 	c.Ctx.JSON(iris.Map{
 		"code": 0,
 		"msg":  "请求成功",

web/api/safe_api.go

@@ -199,41 +199,41 @@ func (c *SafeApi) GetDetail() {
 // @Success 200 {object} viewmodels.Safe "{code:0成功,msg:}"
 // @Failure 400 {string} string	"{code:0成功,-1参数类错误,-2服务端内部错误,msg:错误信息}"
 // @Router /api/safe/file [post]
-func (c *SafeApi) PostFile() {
-	// 1.规则验证
-	safeData, err := c.ServiceSafe.ValidFile(c.Ctx)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
-		return
-	}
-	bidsectionId, err := utils.GetDecryptId(safeData.BidsectionId)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadJSON转换异常,请检查参数"})
-		return
-	}
-	sId, err := utils.GetDecryptId(safeData.SaveId)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadJSON转换异常,请检查参数"})
-		return
-	}
-
-	uid, err := utils.GetProjectAccountId(c.Ctx)
-	if err != nil {
-		c.Ctx.JSON(iris.Map{"code": -1, "msg": "未登录或账号失效，请重新登录"})
-		return
-	}
-
-	err = c.ServiceSafe.SaveFileInfo(bidsectionId, sId, uid, safeData.FileList)
-
-	if err != nil {
-		c.Ctx.JSON(iris.Map{
-			"code": -1,
-			"msg":  fmt.Sprintf("%s", err),
-		})
-		return
-	}
-	c.Ctx.JSON(iris.Map{
-		"code": 0,
-		"msg":  "请求成功",
-	})
-}
+// func (c *SafeApi) PostFile() {
+// 	// 1.规则验证
+// 	safeData, err := c.ServiceSafe.ValidFile(c.Ctx)
+// 	if err != nil {
+// 		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+// 		return
+// 	}
+// 	bidsectionId, err := utils.GetDecryptId(safeData.BidsectionId)
+// 	if err != nil {
+// 		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadJSON转换异常,请检查参数"})
+// 		return
+// 	}
+// 	sId, err := utils.GetDecryptId(safeData.SaveId)
+// 	if err != nil {
+// 		c.Ctx.JSON(iris.Map{"code": -1, "msg": "ReadJSON转换异常,请检查参数"})
+// 		return
+// 	}
+
+// 	uid, err := utils.GetProjectAccountId(c.Ctx)
+// 	if err != nil {
+// 		c.Ctx.JSON(iris.Map{"code": -1, "msg": "未登录或账号失效，请重新登录"})
+// 		return
+// 	}
+
+// 	err = c.ServiceSafe.SaveFileInfo(bidsectionId, sId, uid, safeData.FileList)
+
+// 	if err != nil {
+// 		c.Ctx.JSON(iris.Map{
+// 			"code": -1,
+// 			"msg":  fmt.Sprintf("%s", err),
+// 		})
+// 		return
+// 	}
+// 	c.Ctx.JSON(iris.Map{
+// 		"code": 0,
+// 		"msg":  "请求成功",
+// 	})
+// }

web/viewmodels/safe.go

@@ -11,7 +11,6 @@ import (
 
 	validation "github.com/go-ozzo/ozzo-validation/v3"
 	"go.mod/models"
-	"go.mod/web/viewmodels"
 )
 
 type Safe struct {
@@ -45,22 +44,25 @@ type SafeDetail struct {
 	Id           string `form:"id" json:"id" `
 	BidsectionId string `form:"bidsectionId" json:"bidsectionId"`
 
-	Code             string                     `form:"code" json:"code"`
-	CreateTime       time.Time                  `form:"createTime" json:"createTime"`
-	Position         string                     `form:"position" json:"position"`
-	Inspection       string                     `form:"inspection" json:"inspection"`
-	InspectionDetail string                     `form:"inspectionDetail" json:"inspectionDetail"`
-	Demand           string                     `form:"demand" json:"demand"`
-	Status           int                        `form:"status" json:"status"`
-	AuditName        string                     `form:"auditName" json:"auditName"`
-	FileList         []viewmodels.AnnexListView `form:"files" json:"files"`
-	Auditors         []Auditors                 `form:"auditors" json:"auditors"`
-	auditorHistory   []models.CmSafeAudit       `form:"auditorHistory" json:"auditorHistory"`
+	Code             string               `form:"code" json:"code"`
+	CreateTime       time.Time            `form:"createTime" json:"createTime"`
+	Position         string               `form:"position" json:"position"`
+	Inspection       string               `form:"inspection" json:"inspection"`
+	InspectionDetail string               `form:"inspectionDetail" json:"inspectionDetail"`
+	Demand           string               `form:"demand" json:"demand"`
+	Status           int                  `form:"status" json:"status"`
+	AuditName        string               `form:"auditName" json:"auditName"`
+	FileList         []AnnexListView      `form:"files" json:"files"`
+	Auditors         []Auditors           `form:"auditors" json:"auditors"`
+	auditorHistory   []models.CmSafeAudit `form:"auditorHistory" json:"auditorHistory"`
 }
 
 type SafeFile struct {
-	Name       string    `from:"name" json:"name"`
-	CreateTime time.Time `from:"create_time" json:""`
+	FileName    string    `from:"filename" json:"filename"`
+	FilePath    string    `from:"filepath" json:"filepath"`
+	AccountName string    `from:"account_name" json:"acountName"`
+	AccountId   string    `from:"account_id" json:"acountId"`
+	CreateTime  time.Time `from:"create_time" json:"createTime"`
 }
 type Auditors struct {
 	Name string
@@ -92,22 +94,3 @@ func (l Safe) ValidateDelete() error {
 		validation.Field(&l.Id, validation.Required.Error("检查项目不能为空")),
 	)
 }
-
-type FileList struct {
-	FileName   string `from:"filename" josn:"filename"`
-	FilePath   string `from:"filepath" josn:"filepath"`
-	CreateTime string `form:"createTime" json:"createTime"`
-}
-type File struct {
-	BidsectionId string     `form:"bidsectionId" json:"bidsectionId"`
-	SaveId       string     `form:"saveId" json:"saveId"`
-	FileList     []FileList `from:"fileList" json:"fileList"`
-}
-
-func (l File) ValidateFile() error {
-	return validation.ValidateStruct(&l,
-		validation.Field(&l.BidsectionId, validation.Required.Error("标段ID不能为空")),
-		validation.Field(&l.FileList, validation.Required.Error("上传的文件不能为空")),
-		validation.Field(&l.SaveId, validation.Required.Error("巡检id不能为空")),
-	)
-}