lanjianrong 4 роки тому
батько
коміт
1961eafb4d

+ 8 - 0
dao/project_account_dao.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/go-xorm/xorm"
 	"go.mod/models"
+	"go.mod/web/viewmodels"
 )
 
 //数据库操作引擎
@@ -132,3 +133,10 @@ func (d *ProjectAccountDao) Delete(data *models.CmProjectAccount) error {
 	}
 	return err
 }
+
+// 查找
+func (d *ProjectAccountDao) FindById(id int) (viewmodels.ProjectInfo, error) {
+	projectInfo := viewmodels.ProjectInfo{}
+	_, err := d.engine.Sql("select p.`name` as projectName, p.`code`, p.`create_time`, a.`mobile`, a.`name` from `cm_project` as p, `cm_project_account` as a where p.`user_id` = a.`id` and p.`id` = ?", id).Get(&projectInfo)
+	return projectInfo, err
+}

+ 7 - 0
services/project_account_service.go

@@ -35,6 +35,7 @@ type ProjectAccountService interface {
 	Save(viewAccount viewmodels.ProjectAccount, id int, projectId int) error
 	Enable(id int, projectId int, enable int) error
 	ChangeAccount(id int, projectId int, viewAccount viewmodels.ProjectAccount) error
+	GetProjectInfo(id int) (viewmodels.ProjectInfo, error)
 	Delete(id int, projectId int) error
 }
 
@@ -253,3 +254,9 @@ func (s *projectAccountService) ChangeAccount(id int, projectId int, viewAccount
 
 	return nil
 }
+
+func (s *projectAccountService) GetProjectInfo(id int) (viewmodels.ProjectInfo, error) {
+	projectInfo, err := s.dao.FindById(id)
+	// return new errors("啊啊啊")
+	return projectInfo, err
+}

+ 0 - 1
services/safe_service.go

@@ -134,7 +134,6 @@ func (s *safeService) ValidRule(ctx iris.Context) (viewmodels.Safe, error) {
 			log.Println("safe-ValidRule-ReadJson转换异常, error=", err)
 			return safeVaild, err
 		}
-		fmt.Println("-------------------------------------")
 		err = safeVaild.ValidateCreate()
 		return safeVaild, err
 	}

+ 23 - 0
web/api/project_setting_api.go

@@ -310,6 +310,29 @@ func (c *ProjectSettingApi) PostAccountChange() {
 	}
 }
 
+// @Summary 获取项目信息
+// @Tags 项目设置-管理员
+// @Description 获取项目信息
+// @Accept  json
+// @Produce  json
+// @Security ApiKeyAuth
+// @Success 200 {string} string "{code:0成功,-1参数类错误,data:viewmodels.ProjectAccount,msg:错误信息}"
+// @Router /api/projectSetting/project [get]
+func (c *ProjectSettingApi) GetProject() {
+	projectId, err := utils.GetProjectId(c.Ctx)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+		return
+	}
+	data, err := c.ServiceProjectAccount.GetProjectInfo(projectId)
+	if err != nil {
+		c.Ctx.JSON(iris.Map{"code": -1, "msg": fmt.Sprintf("%s", err)})
+		return
+	} else {
+		c.Ctx.JSON(iris.Map{"code": 0, "msg": "操作成功", "data": data})
+	}
+}
+
 // @Summary 保存项目信息
 // @Tags 项目设置-管理员
 // @Description 保存项目信息

+ 3 - 3
web/api/safe_api.go

@@ -62,7 +62,7 @@ func (c *SafeApi) Get() {
 	})
 }
 
-// @Summary 安全巡检列表
+// @Summary 创建新的安全巡检记录
 // @Tags 安全巡检
 // @Description 创建新的安全巡检记录
 // @Accept  json
@@ -120,7 +120,7 @@ func (c *SafeApi) Post() {
 	})
 }
 
-// @Summary 安全巡检列表
+// @Summary 删除记录
 // @Tags 安全巡检
 // @Description 删除安全巡检记录
 // @Accept  json
@@ -156,7 +156,7 @@ func (c *SafeApi) Delete() {
 	})
 }
 
-// @Summary 安全巡检列表
+// @Summary 获取安全巡检详情
 // @Tags 安全巡检
 // @Description 获得安全巡检详情页面数据
 // @Accept  json

+ 7 - 0
web/viewmodels/project.go

@@ -13,6 +13,13 @@ type Project struct {
 	Code string `form:"code" json:"code"`
 	Name string `form:"name" json:"name"`
 }
+type ProjectInfo struct {
+	ProjectName string `from:"projectName" json:"projectName"`
+	Code        string `from:"code" json:"code"`
+	CreateTime  int    `from:"create_time" json:"createTime"`
+	Mobile      string `from:"mobile" json:"mobile"`
+	Name        string `from:"name" json:"name"`
+}
 
 func (l Project) Validate() error {
 	return validation.ValidateStruct(&l,