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-17 13:23:49 +08:00
parent 8fd5283b0e
commit 4850f6348f
6 changed files with 200 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/api/admin/api/technology.go
View File

@ -201,3 +201,39 @@ func (*Technology) ProductDelete(c *gin.Context) {
err := technology.NewProduct()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
api.APIResponse(err)(c)
}
func (*Technology) Achievement(c *gin.Context) {
form := &struct {
api.TenantIDStringForm
Title string `json:"title" form:"title"`
api.PageForm
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := technology.NewAchievement()(api.GetSession()(c).(*session.Admin)).Instance(form.Convert(), form.Title, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
func (*Technology) AchievementDetail(c *gin.Context) {
form := new(api.IDStringForm)
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
data, err := technology.NewAchievement()(api.GetSession()(c).(*session.Admin)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}
func (*Technology) AchievementDelete(c *gin.Context) {
form := new(api.IDStringForm)
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
err := technology.NewAchievement()(api.GetSession()(c).(*session.Admin)).Delete(form.Convert())
api.APIResponse(err)(c)
}

105
app/api/admin/controller/technology/achievement.go Normal file
View File

@ -0,0 +1,105 @@
package technology
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"errors"
)
type Achievement struct {
*session.Admin
}
type AchievementHandle func(session *session.Admin) *Achievement
type (
// AchievementInfo 成果信息
AchievementInfo struct {
ID string `json:"id"`
*model.TechnologyAchievementInfo
Area string `json:"area"`
}
// AchievementDetailInfo 成果详细信息
AchievementDetailInfo struct {
ID string `json:"id"`
TenantID string `json:"tenant_id"`
*model2.TechnologyAchievement
}
)
// Instance 首页信息
func (c *Achievement) Instance(tenantID uint64, title string, page, pageSize int) (*controller.ReturnPages, error) {
mTechnologyAchievement := model.NewTechnologyAchievement()
where := make([]*model2.ModelWhere, 0)
if c.TenantID > 0 {
where = append(where, model2.NewWhere("p.tenant_id", c.TenantID))
}
if tenantID > 0 {
where = append(where, model2.NewWhere("p.tenant_id", tenantID))
}
if title != "" {
where = append(where, model2.NewWhereLike("p.title", title))
}
var count int64
out, err := mTechnologyAchievement.Achievement(page, pageSize, &count, where...)
if err != nil {
return nil, err
}
list := make([]*AchievementInfo, 0)
for _, v := range out {
list = append(list, &AchievementInfo{
ID: v.GetEncodeID(),
TechnologyAchievementInfo: v,
Area: v.FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Detail 详细信息
func (c *Achievement) Detail(id uint64) (*AchievementDetailInfo, error) {
mTechnologyAchievement := model.NewTechnologyAchievement()
mTechnologyAchievement.ID = id
isExist, err := model2.First(mTechnologyAchievement.TechnologyAchievement)
if err != nil {
return nil, err
} else if !isExist {
return nil, errors.New("操作错误，成果信息不存在或已被删除")
}
return &AchievementDetailInfo{
ID: mTechnologyAchievement.GetEncodeID(),
TenantID: mTechnologyAchievement.GetEncodeTenantID(),
TechnologyAchievement: mTechnologyAchievement.TechnologyAchievement,
}, nil
}
func (c *Achievement) Delete(id uint64) error {
mTechnologyAchievement := model.NewTechnologyAchievement()
mTechnologyAchievement.ID = id
isExist, err := model2.First(mTechnologyAchievement.TechnologyAchievement)
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，成果信息不存在或已被删除")
} else if c.TenantID > 0 && mTechnologyAchievement.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
return nil
}
func NewAchievement() AchievementHandle {
return func(session *session.Admin) *Achievement {
return &Achievement{session}
}
}

2
app/api/admin/controller/technology/patent.go
View File

@ -241,6 +241,8 @@ func (c *Patent) Delete(id uint64) error {
return err
} else if !isExist {
return errors.New("操作错误，专利信息不存在或已被删除")
} else if c.TenantID > 0 && mSysPatent.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
return model2.Delete(mSysPatent.SysPatent)
}

10
app/api/admin/controller/technology/product.go
View File

@ -17,7 +17,8 @@ type ProductHandle func(session *session.Admin) *Product
type (
// ProductInfo 产品信息
ProductInfo struct {
ID string `json:"id"`
ID string `json:"id"`
Area string `json:"area"`
}
// ProductDetailInfo 产品详细信息
ProductDetailInfo struct {
@ -51,7 +52,10 @@ func (c *Product) Instance(tenantID uint64, title string, page, pageSize int) (*
list := make([]*ProductInfo, 0)
for _, v := range out {
list = append(list, &ProductInfo{ID: v.GetEncodeID()})
list = append(list, &ProductInfo{
ID: v.GetEncodeID(),
Area: v.FormatBasic(),
})
}
return &controller.ReturnPages{Data: list, Count: count}, err
}
@ -90,6 +94,8 @@ func (c *Product) Delete(id uint64) error {
return err
} else if !isExist {
return errors.New("操作错误，产品信息不存在或已被删除")
} else if c.TenantID > 0 && mTechnologyProduct.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
return model2.Delete(mTechnologyProduct.TechnologyProduct)
}

46
app/api/admin/model/technology_achievement.go Normal file
View File

@ -0,0 +1,46 @@
package model
import (
"SciencesServer/app/common/model"
"SciencesServer/serve/orm"
"fmt"
"time"
)
type TechnologyAchievement struct {
*model.TechnologyAchievement
}
type TechnologyAchievementInfo struct {
model.Model
Title string `json:"title"`
model.Image
model.Area
CreatedAt time.Time
}
// Achievement 成果信息
func (m *TechnologyAchievement) Achievement(page, pageSize int, count *int64, where ...*model.ModelWhere) ([]*TechnologyAchievementInfo, error) {
db := orm.GetDB().Table(m.TableName()+" As a").
Select("a.id", "a.tenant_id", "a.image", "t.province", "t.city", "a.created_at").
Joins(fmt.Sprintf("LEFT JOIN %s AS t ON a.tenant_id = t.id", model.NewSysTenant().TableName()))
if len(where) > 0 {
for _, v := range where {
db = db.Where(v.Condition, v.Value)
}
}
out := make([]*TechnologyAchievementInfo, 0)
if err := db.Count(count).Error; err != nil {
return nil, err
}
if err := db.Order("a.id " + model.OrderModeToDesc).Offset((page - 1) * pageSize).Limit(pageSize).Scan(&out).Error; err != nil {
return nil, err
}
return out, nil
}
func NewTechnologyAchievement() *TechnologyAchievement {
return &TechnologyAchievement{model.NewTechnologyAchievement()}
}

3
router/address.go
View File

@ -322,6 +322,9 @@ func registerAdminAPI(app *gin.Engine) {
technology.POST("/product", _api.Product)
technology.POST("/product/detail", _api.ProductDetail)
technology.POST("/product/delete", _api.ProductDelete)
technology.POST("/achievement", _api.Achievement)
technology.POST("/achievement/detail", _api.AchievementDetail)
technology.POST("/achievement/delete", _api.AchievementDelete)
}
// Activity 活动管理
activity := v1.Group("/activity")