fix: 工单流程信息展示问题修复

This commit is contained in:
meilin.huang
2024-06-24 17:17:57 +08:00
parent f43851698e
commit 10630847df
14 changed files with 62 additions and 50 deletions

View File

@@ -17,7 +17,7 @@ require (
github.com/go-sql-driver/mysql v1.8.1
github.com/golang-jwt/jwt/v5 v5.2.1
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.1
github.com/gorilla/websocket v1.5.3
github.com/kanzihuang/vitess/go/vt/sqlparser v0.0.0-20231018071450-ac8d9f0167e9
github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20230712084735-068dc2aee82d
github.com/may-fly/cast v1.6.1
@@ -26,7 +26,7 @@ require (
github.com/pkg/errors v0.9.1
github.com/pkg/sftp v1.13.6
github.com/pquerna/otp v1.4.0
github.com/redis/go-redis/v9 v9.5.1
github.com/redis/go-redis/v9 v9.5.3
github.com/robfig/cron/v3 v3.0.1 //
github.com/sijms/go-ora/v2 v2.8.19
github.com/stretchr/testify v1.9.0

View File

@@ -66,6 +66,7 @@ func (d *Db) Dbs(rc *req.Ctx) {
for _, dbvo := range dbvos {
di := instancesMap[dbvo.InstanceId]
if di != nil {
dbvo.InstanceCode = di.Code
dbvo.InstanceType = di.Type
dbvo.Host = di.Host
dbvo.Port = di.Port

View File

@@ -15,6 +15,7 @@ type DbListVO struct {
InstanceId uint64 `json:"instanceId"`
AuthCertName string `json:"authCertName"`
InstanceCode string `json:"instanceCode" gorm:"-"`
InstanceType string `json:"type" gorm:"-"`
Host string `json:"host" gorm:"-"`
Port int `json:"port" gorm:"-"`

View File

@@ -17,6 +17,6 @@ func newDbRepo() repository.Db {
// 分页获取数据库信息列表
func (d *dbRepoImpl) GetDbList(condition *entity.DbQuery, pageParam *model.PageParam, toEntity any, orderBy ...string) (*model.PageResult[any], error) {
pd := model.NewCond().Eq("instance_id", condition.InstanceId).In("code", condition.Codes)
pd := model.NewCond().Eq("instance_id", condition.InstanceId).In("code", condition.Codes).Eq("id", condition.Id)
return d.PageByCondToAny(pd, pageParam, toEntity)
}

View File

@@ -82,6 +82,11 @@ func (p *TagTree) ListByQuery(rc *req.Ctx) {
cond.CodePaths = strings.Split(tagPaths, ",")
}
cond.Id = uint64(rc.QueryInt("id"))
cond.Type = entity.TagType(rc.QueryInt("type"))
codes := rc.Query("codes")
if codes != "" {
cond.Codes = strings.Split(codes, ",")
}
var tagTrees []entity.TagTree
p.TagTreeApp.ListByQuery(cond, &tagTrees)

View File

@@ -4,7 +4,7 @@ import "fmt"
const (
AppName = "mayfly-go"
Version = "v1.8.7"
Version = "v1.8.8"
)
func GetAppInfo() string {