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-13 15:23:27 +08:00
parent e3909112ce
commit 0494bbf5d0
18 changed files with 396 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/admin/controller/activity/apply.go
View File

@ -5,6 +5,7 @@ import (
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"SciencesServer/config"
"SciencesServer/serve/orm"
"errors"
"gorm.io/gorm"
@ -62,6 +63,7 @@ func (c *Apply) Instance(tenantID uint64, title, contact string, page, pageSize
list := make([]*ApplyInfo, 0)
for _, v := range out {
v.Image.Image = v.Analysis(config.SettingInfo.Domain)
list = append(list, &ApplyInfo{
ID: v.GetEncodeID(),
TenantID: v.GetEncodeTenantID(),
@ -80,6 +82,8 @@ func (c *Apply) Detail(id uint64) (*ApplyDetailInfo, error) {
if err != nil {
return nil, err
}
out.Image.Image = out.Analysis(config.SettingInfo.Domain)
return &ApplyDetailInfo{
ID: out.GetEncodeID(),
TenantID: out.GetEncodeTenantID(),
@ -114,6 +118,7 @@ func (c *Apply) Handle(id uint64, remark string) error {
return err
}
mActivityApplyLog := model.NewActivityApplyLog()
mActivityApplyLog.UID = c.UID
mActivityApplyLog.ApplyID = mActivityApply.ID
mActivityApplyLog.Remark = remark
return model2.Create(mActivityApplyLog.ActivityApplyLog, tx)

12
app/api/admin/controller/activity/instance.go
View File

@ -91,7 +91,7 @@ func (c *Instance) Index(tenantID uint64, title, contact, contactMobile string,
_industry := make([]string, 0)
for _, v := range v.GetIndustryAttribute() {
_industry = append(_industry, config.GetIndustryInfo(v, "-"))
_industry = append(_industry, config.GetIndustryInfo(v, "-", "/"))
}
list = append(list, &InstanceInfo{
ID: v.GetEncodeID(),
@ -226,11 +226,17 @@ func (c *Instance) Delete(id uint64) error {
return model2.Delete(mActivityInstance.ActivityInstance)
}
func (c *Instance) Joins(activityID uint64, page, pageSize int) (*controller.ReturnPages, error) {
func (c *Instance) Joins(activityID uint64, name string, page, pageSize int) (*controller.ReturnPages, error) {
mActivityJoin := model.NewActivityJoin()
where := []*model2.ModelWhere{model2.NewWhere("j.activity_id", activityID)}
if name != "" {
where = append(where, model2.NewWhereLike("u_i.name", name))
}
var count int64
out, err := mActivityJoin.Join(page, pageSize, &count, model2.NewWhere("j.activity_id", activityID))
out, err := mActivityJoin.Join(page, pageSize, &count, where...)
if err != nil {
return nil, err

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

@ -68,7 +68,7 @@ func (c *Instance) Expert(name string, status int, page, pageSize int) (*control
industry := make([]string, 0)
for _, v := range strings.Split(v.Industry, ";") {
industry = append(industry, config.GetIndustryInfo(v, "-"))
industry = append(industry, config.GetIndustryInfo(v, "-", "/"))
}
// 研究机构，实验室
researchName := v.LaboratoryName

221
app/api/admin/controller/sys/banner.go Normal file
View File

@ -0,0 +1,221 @@
package sys
import (
"SciencesServer/app/api/admin/model"
"SciencesServer/app/basic/controller"
model2 "SciencesServer/app/common/model"
"SciencesServer/app/session"
"SciencesServer/config"
"SciencesServer/utils"
"errors"
"strings"
)
type Banner struct {
*session.Admin
}
type BannerHandle func(session *session.Admin) *Banner
type (
// BannerInfo 轮播图信息
BannerInfo struct {
ID string `json:"id"`
*model2.SysBanner
Area string `json:"area"`
Images []string `json:"images"`
}
// BannerLocalInfo 轮播图位置信息
BannerLocalInfo struct {
Title string `json:"title"`
Children []*BannerLocalInfo `json:"children"`
}
// BannerMarkLocalInfo 轮播图临时位置信息
BannerMarkLocalInfo struct {
Title string `json:"title"`
Children []string `json:"children"`
}
// BannerParams 轮播图参数信息
BannerParams struct {
ID, TenantID uint64
Title, Local, Size, Remark string
Images []string
IsMultiple int
}
)
const (
defaultFirstLevelKey string = "+home"
)
// tree 树状
func (c *Banner) tree(src map[string][]string, key string) []*BannerLocalInfo {
out := make([]*BannerLocalInfo, 0)
data, has := src[key]
if !has {
return nil
}
for _, v := range data {
out = append(out, &BannerLocalInfo{
Title: v,
Children: c.tree(src, v),
})
}
return out
}
// merge 合并
func (c *Banner) merge(obj, parentObj string, out map[string][]string) {
if _, has := out[parentObj]; !has {
out[parentObj] = []string{obj}
return
}
if !utils.InArray(obj, out[parentObj]) {
out[parentObj] = append(out[parentObj], obj)
}
}
// filter 筛选
func (c *Banner) filter(src []string, sep string) map[string][]string {
// 解决方案>中小型企业
// 解决方案>政府区域
out := make(map[string][]string, 0)
for _, v := range src {
objs := strings.Split(v, sep)
for i := 0; i < len(objs); i++ {
parent := defaultFirstLevelKey
if i > 0 {
parent = objs[i-1]
}
c.merge(objs[i], parent, out)
}
}
return out
}
// Instance 列表信息
func (c *Banner) Instance(tenantID uint64, title, local string, page, pageSize int) (*controller.ReturnPages, error) {
mSysBanner := model.NewSysBanner()
where := make([]*model2.ModelWhere, 0)
if c.TenantID > 0 {
where = append(where, model2.NewWhere("b.tenant_id", c.TenantID))
}
if tenantID > 0 {
where = append(where, model2.NewWhere("b.tenant_id", tenantID))
}
if title != "" {
where = append(where, model2.NewWhereLike("b.title", title))
}
if local != "" {
where = append(where, model2.NewWhereLike("b.local", local))
}
var count int64
out, err := mSysBanner.Banner(page, pageSize, &count, where...)
if err != nil {
return nil, err
}
list := make([]*BannerInfo, 0)
for _, v := range out {
list = append(list, &BannerInfo{
ID: v.GetEncodeID(),
SysBanner: v.SysBanner,
Area: v.FormatBasic(),
Images: v.Images.AnalysisSlice(config.SettingInfo.Domain),
})
}
return &controller.ReturnPages{Data: list, Count: count}, nil
}
// Form 数据操作
func (c *Banner) Form(params *BannerParams) error {
mSysBanner := model.NewSysBanner()
if params.ID > 0 {
mSysBanner.ID = params.ID
isExist, err := model2.FirstField(mSysBanner.SysBanner, []string{"id", "tenant_id", "created_at"})
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，轮播图信息不存在或已被删除")
}
if c.TenantID > 0 && c.TenantID != mSysBanner.TenantID {
return errors.New("操作错误，无权限操作")
}
}
mSysBanner.Title = params.Title
mSysBanner.Local = params.Local
mSysBanner.Images.SetImagesAttribute(params.Images)
mSysBanner.Size = params.Size
mSysBanner.IsMultiple = params.IsMultiple
mSysBanner.Remark = params.Remark
if mSysBanner.ID > 0 {
if c.TenantID <= 0 {
mSysBanner.TenantID = params.TenantID
}
return model2.Updates(mSysBanner.SysBanner, mSysBanner.SysBanner)
}
mSysBanner.TenantID = params.TenantID
if c.TenantID > 0 {
mSysBanner.TenantID = c.TenantID
}
return model2.Create(mSysBanner.SysBanner)
}
// Local 位置信息
func (c *Banner) Local(tenantID uint64) ([]*BannerLocalInfo, error) {
mSysBanner := model.NewSysBanner()
out := make([]string, 0)
where := make([]*model2.ModelWhere, 0)
if tenantID > 0 {
where = append(where, model2.NewWhere("tenant_id", tenantID))
} else {
where = append(where, model2.NewWhere("tenant_id", c.TenantID))
}
if err := model2.Pluck(mSysBanner.SysBanner, "local", &out, where...); err != nil {
return nil, err
}
c.filter(out, ">")
return nil, nil
}
// Delete 删除操作
func (c *Banner) Delete(id uint64) error {
mSysBanner := model.NewSysBanner()
mSysBanner.ID = id
isExist, err := model2.FirstField(mSysBanner.SysBanner, []string{"id", "tenant_id"})
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，轮播图信息不存在或已被删除")
} else if c.TenantID > 0 && mSysBanner.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
return model2.Delete(mSysBanner.SysBanner)
}
func NewBanner() BannerHandle {
return func(session *session.Admin) *Banner {
return &Banner{session}
}
}

22
app/api/admin/controller/sys/banner_test.go Normal file
View File

@ -0,0 +1,22 @@
package sys
import (
"SciencesServer/utils"
"testing"
)
func TestNewBanner(t *testing.T) {
banner := new(Banner)
out := []string{
"首页banner",
"登录注册",
"解决方案>中小型企业",
"解决方案>大型企业",
"找专家>专家列表",
"找专家>专家列表1",
"找专家>专家列表>专家详情",
}
_out := banner.filter(out, ">")
t.Log(_out)
t.Log(utils.AnyToJSON(banner.tree(_out, defaultFirstLevelKey)))
}

2
app/api/admin/controller/sys/navigation.go
View File

@ -20,6 +20,7 @@ type (
TenantID string `json:"tenant_id"`
ParentID string `json:"parent_id"`
*model2.SysNavigation
Area string `json:"area"`
Children []*NavigationInfo `json:"children"`
}
// NavigationParams 导航参数信息
@ -40,6 +41,7 @@ func (c *Navigation) tree(src []*model.SysNavigationInfo, parentID uint64) []*Na
TenantID: v.GetEncodeTenantID(),
ParentID: (&model2.Model{ID: parentID}).GetEncodeID(),
SysNavigation: v.SysNavigation,
Area: v.FormatBasic(),
Children: c.tree(src, v.ID),
})
}