williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目信息

Browse Source
This commit is contained in:
henry
2022-01-19 13:23:07 +08:00
parent 86fa9cd853
commit 61d345b571
10 changed files with 355 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/api/admin/controller/manage/basic.go Normal file
View File

@ -0,0 +1,11 @@
package manage
import "SciencesServer/app/basic/config"
// BasicParams 基本信息
type BasicParams struct {
ID, TenantID uint64
Name, Image, Code, Mobile, Introduce string
config.Area
Industrys, Keywords []string
}

106
app/api/admin/controller/manage/company.go Normal file
View File

@ -0,0 +1,106 @@
package manage
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"errors"
)
type Company struct {
*session.Admin
}
type CompanyHandle func(session *session.Admin) *Company
type (
// CompanyInstance 公司企业信息
CompanyInstance struct {
ID string `json:"id"`
*model.ManageCompanyInfo
Industrys []string `json:"industrys"`
Area string `json:"area"`
}
// CompanyDetail 公司企业详细信息
CompanyDetail struct {
ID string `json:"id"`
*model2.ManageCompany
Industrys []string `json:"industrys"`
Keywords []string `json:"keywords"`
Directions []string `json:"directions"`
Area string `json:"area"`
}
// CompanyParams 公司企业参数信息
CompanyParams struct {
}
)
// Instance 首页信息
func (c *Company) Instance(tenantID uint64, name string, status int, page, pageSize int) (*controller.ReturnPages, error) {
mManageCompany := model.NewManageCompany()
where := make([]*model2.ModelWhere, 0)
if c.TenantID > 0 {
where = append(where, model2.NewWhere("c.tenant_id", c.TenantID))
}
if tenantID > 0 {
where = append(where, model2.NewWhere("c.tenant_id", tenantID))
}
if name != "" {
where = append(where, model2.NewWhereLike("c.name", name))
}
if status > 0 {
where = append(where, model2.NewWhere("c.examine_status", status))
}
var count int64
out, err := mManageCompany.Companys(page, pageSize, &count)
if err != nil {
return nil, err
}
list := make([]*CompanyInstance, 0)
for _, v := range out {
mManageCompany.Industry = v.Industry
list = append(list, &CompanyInstance{
ID: v.GetEncodeID(), ManageCompanyInfo: v, Industrys: mManageCompany.GetIndustryAttribute(), Area: v.FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Form 数据操作
func (c *Company) Form(params *CompanyParams) error {
return nil
}
// Detail 详细信息
func (c *Company) Detail(id uint64) (*CompanyDetail, error) {
mManageCompany := model.NewManageCompany()
out, err := mManageCompany.Company(id)
if err != nil {
return nil, err
} else if out.ManageCompany == nil {
return nil, errors.New("操作错误，公司企业信息不存在或已被删除")
}
return &CompanyDetail{
ID: out.GetEncodeID(),
ManageCompany: out.ManageCompany,
Industrys: out.GetIndustryAttribute(),
Keywords: out.GetKeywordAttribute(),
Area: out.FormatBasic(),
}, nil
}
func NewCompany() CompanyHandle {
return func(session *session.Admin) *Company {
return &Company{session}
}
}

158
app/api/admin/controller/manage/expert.go Normal file
View File

@ -0,0 +1,158 @@
package manage
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/config"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"SciencesServer/utils"
"errors"
"strings"
"time"
)
type Expert struct {
*session.Admin
}
type ExpertHandle func(session *session.Admin) *Expert
type (
// ExpertInstance 专家信息
ExpertInstance struct {
ID string `json:"id"`
Name string `json:"name"`
Industrys []string `json:"industrys"`
ResearchName string `json:"research_name"`
LaboratoryName string `json:"laboratory_name"`
Address string `json:"address"`
ExamineStatus model2.ExamineStatusKind `json:"examine_status"`
CreatedAt time.Time `json:"created_at"`
Area string `json:"area"`
}
// ExpertDetail 专家详细信息
ExpertDetail struct {
ID string `json:"id"`
*model2.ManageExpert
Industrys []string `json:"industrys"`
Keywords []string `json:"keywords"`
Researchs []string `json:"researchs"`
Area string `json:"area"`
}
// ExpertParams 专家参数信息
ExpertParams struct {
ID, TenantID uint64
}
)
// Instance 首页信息
func (c *Expert) Instance(tenantID uint64, name string, examineStatus int, page, pageSize int) (*controller.ReturnPages, error) {
mManageExpert := model.NewManageExpert()
where := make([]*model2.ModelWhere, 0)
if c.TenantID > 0 {
where = append(where, model2.NewWhere("e.tenant_id", c.TenantID))
}
if tenantID > 0 {
where = append(where, model2.NewWhere("e.tenant_id", tenantID))
}
if name != "" {
where = append(where, model2.NewWhereLike("e.name", name))
}
if examineStatus > 0 {
where = append(where, model2.NewWhere("e.examine_status", examineStatus))
}
var count int64
out, err := mManageExpert.Experts(page, pageSize, &count, where...)
if err != nil {
return nil, err
}
list := make([]*ExpertInstance, 0)
for _, v := range out {
_industrys := make([]string, 0)
for _, v := range strings.Split(v.Industry, ";") {
_industrys = append(_industrys, config.GetIndustryInfo(v, "-", "/"))
}
// 研究机构，实验室
list = append(list, &ExpertInstance{ID: v.GetEncodeID(), Name: v.Name, Industrys: _industrys,
ResearchName: v.ResearchName, LaboratoryName: v.LaboratoryName, ExamineStatus: v.ExamineStatus,
Address: v.FormatBasic(), CreatedAt: v.CreatedAt, Area: v.FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Detail 详细信息
func (*Expert) Detail(id uint64) (*ExpertDetail, error) {
mManageExpert := model.NewManageExpert()
out, err := mManageExpert.Expert(id)
if err != nil {
return nil, err
} else if out.ManageExpert == nil {
return nil, errors.New("操作错误，专家信息不存在或已被删除")
}
return &ExpertDetail{
ID: out.GetEncodeID(),
ManageExpert: out.ManageExpert,
Industrys: out.GetIndustryAttribute(),
Keywords: out.GetKeywordAttribute(),
Researchs: out.GetResearchAttribute(),
Area: out.FormatBasic(),
}, nil
}
// Form 数据操作
func (*Expert) Form(params *BasicParams, other *config.IdentityForExpert) error {
mManageExpert := model.NewManageExpert()
if params.ID > 0 {
mManageExpert.ID = params.ID
isExist, err := model2.FirstField(mManageExpert.ManageExpert, []string{"id", "examine_status", "created_at"})
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，专家信息不存在或已被删除")
}
}
mManageExpert.TenantID = params.TenantID
mManageExpert.ResearchID = other.ConvertResearch()
mManageExpert.LaboratoryID = other.ConvertLaboratory()
mManageExpert.Image.Image = params.Image
mManageExpert.Area = model2.Area{
Province: params.Area.Province, City: params.Area.City, District: params.Area.District, Address: params.Area.Address,
}
mManageExpert.School = other.School
mManageExpert.Major = other.Major
mManageExpert.Job = other.Job
mManageExpert.Title = other.Title
mManageExpert.Gender = model2.Gender{Gender: model2.GenderKind(other.Gender)}
mManageExpert.WorkAt = utils.DataTimeToDate(other.WorkAt)
mManageExpert.SetIndustryAttribute(params.Industrys)
mManageExpert.SetKeywordAttribute(params.Keywords)
mManageExpert.SetResearchAttribute(other.Researchs)
mManageExpert.Introduce = params.Introduce
if mManageExpert.ID > 0 {
return model2.Updates(mManageExpert.ManageExpert, mManageExpert.ManageExpert)
}
mManageExpert.Name = params.Name
mManageExpert.Mobile = params.Mobile
return model2.Create(mManageExpert.ManageExpert)
}
func NewExpert() ExpertHandle {
return func(session *session.Admin) *Expert {
return &Expert{session}
}
}

191
app/api/admin/controller/manage/instance.go
View File

@ -1,191 +0,0 @@
package manage
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/config"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"errors"
"gorm.io/gorm"
"strings"
"time"
)
type Instance struct {
*session.Admin
gorm.Model
tenantID uint64
}
type InstanceHandle func(session *session.Admin, tenantID uint64) *Instance
type (
// InstanceForCompany 公司企业信息
InstanceForCompany struct {
ID string `json:"id"`
*model.ManageCompanyInfo
Industrys []string `json:"industrys"`
Area string `json:"area"`
}
// InstanceForCompanyDetail 公司企业详细信息
InstanceForCompanyDetail struct {
ID string `json:"id"`
*model2.ManageCompany
Industrys []string `json:"industrys"`
Keywords []string `json:"keywords"`
Directions []string `json:"directions"`
Area string `json:"area"`
}
// InstanceForExpert 专家信息
InstanceForExpert struct {
ID string `json:"id"`
Name string `json:"name"`
Industrys []string `json:"industrys"`
ResearchName string `json:"research_name"`
LaboratoryName string `json:"laboratory_name"`
Address string `json:"address"`
ExamineStatus model2.ExamineStatusKind `json:"examine_status"`
CreatedAt time.Time `json:"created_at"`
Area string `json:"area"`
}
// InstanceForExpertDetail 专家详细信息
InstanceForExpertDetail struct {
ID string `json:"id"`
*model2.ManageExpert
Industrys []string `json:"industrys"`
Keywords []string `json:"keywords"`
Researchs []string `json:"researchs"`
Area string `json:"area"`
}
)
// Company 公司企业信息
func (c *Instance) Company(tenantID uint64, name string, status int, page, pageSize int) (*controller.ReturnPages, error) {
mManageCompany := model.NewManageCompany()
where := make([]*model2.ModelWhere, 0)
if c.TenantID > 0 {
where = append(where, model2.NewWhere("c.tenant_id", c.TenantID))
}
if tenantID > 0 {
where = append(where, model2.NewWhere("c.tenant_id", tenantID))
}
if name != "" {
where = append(where, model2.NewWhereLike("c.name", name))
}
if status > 0 {
where = append(where, model2.NewWhere("c.examine_status", status))
}
var count int64
out, err := mManageCompany.Companys(page, pageSize, &count)
if err != nil {
return nil, err
}
list := make([]*InstanceForCompany, 0)
for _, v := range out {
mManageCompany.Industry = v.Industry
list = append(list, &InstanceForCompany{
ID: v.GetEncodeID(), ManageCompanyInfo: v, Industrys: mManageCompany.GetIndustryAttribute(), Area: v.FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// CompanyDetail 公司企业详细信息
func (c *Instance) CompanyDetail(id uint64) (*InstanceForCompanyDetail, error) {
mManageCompany := model.NewManageCompany()
out, err := mManageCompany.Company(id)
if err != nil {
return nil, err
} else if out.ManageCompany == nil {
return nil, errors.New("操作错误，公司企业信息不存在或已被删除")
}
return &InstanceForCompanyDetail{
ID: out.GetEncodeID(),
ManageCompany: out.ManageCompany,
Industrys: out.GetIndustryAttribute(),
Keywords: out.GetKeywordAttribute(),
Area: out.FormatBasic(),
}, nil
}
// Expert 专家信息
func (c *Instance) Expert(tenantID uint64, name string, examineStatus int, page, pageSize int) (*controller.ReturnPages, error) {
mManageExpert := model.NewManageExpert()
where := make([]*model2.ModelWhere, 0)
if c.TenantID > 0 {
where = append(where, model2.NewWhere("e.tenant_id", c.TenantID))
}
if tenantID > 0 {
where = append(where, model2.NewWhere("e.tenant_id", tenantID))
}
if name != "" {
where = append(where, model2.NewWhereLike("e.name", name))
}
if examineStatus > 0 {
where = append(where, model2.NewWhere("e.examine_status", examineStatus))
}
var count int64
out, err := mManageExpert.Experts(page, pageSize, &count, where...)
if err != nil {
return nil, err
}
list := make([]*InstanceForExpert, 0)
for _, v := range out {
_industrys := make([]string, 0)
for _, v := range strings.Split(v.Industry, ";") {
_industrys = append(_industrys, config.GetIndustryInfo(v, "-", "/"))
}
// 研究机构，实验室
list = append(list, &InstanceForExpert{ID: v.GetEncodeID(), Name: v.Name, Industrys: _industrys,
ResearchName: v.ResearchName, LaboratoryName: v.LaboratoryName, ExamineStatus: v.ExamineStatus,
Address: v.FormatBasic(), CreatedAt: v.CreatedAt, Area: v.FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// ExpertDetail 专家详细信息
func (*Instance) ExpertDetail(id uint64) (*InstanceForExpertDetail, error) {
mManageExpert := model.NewManageExpert()
out, err := mManageExpert.Expert(id)
if err != nil {
return nil, err
} else if out.ManageExpert == nil {
return nil, errors.New("操作错误，专家信息不存在或已被删除")
}
return &InstanceForExpertDetail{
ID: out.GetEncodeID(),
ManageExpert: out.ManageExpert,
Industrys: out.GetIndustryAttribute(),
Keywords: out.GetKeywordAttribute(),
Researchs: out.GetResearchAttribute(),
Area: out.FormatBasic(),
}, nil
}
func NewInstance() InstanceHandle {
return func(session *session.Admin, tenantID uint64) *Instance {
return &Instance{
Admin: session,
tenantID: tenantID,
}
}
}