bigdata
/
dsMin
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新20020090001

Browse Source
master
wangshuai 5 years ago
parent 2b954726ed
commit 3f3e452f3f
8 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File

5
dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go
Unescape View File

@ -14,7 +14,8 @@ import (
var db = DbUtil.Engine
func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32, []map[string]interface{}, error) {
sql := "SELECT id FROM t_dataex_dataaccess WHERE 1 = 1" + query.Conditions
//sql := "SELECT id FROM t_dataex_dataaccess WHERE 1 = 1" + query.Conditions
sql := "SELECT ls.id source_systemid, ls.system_name source_systemname, ls1.system_name consume_systemname, da.* FROM t_dataex_dataaccess da LEFT JOIN t_dataex_datasource ds ON da.datasource_id = ds.id LEFT JOIN t_dataex_linksystem ls ON ls.id = ds.system_id LEFT JOIN t_dataex_linksystem ls1 ON ls1.id = da.consume_systemid" + query.Conditions
fmt.Println("sql=", sql)
//通过SQL获取带缓存的数据
@ -23,7 +24,7 @@ func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32,
if count > 0 {
return true, "数据获取成功", count, list, nil
} else {
return false, "数据获取失败，systemID对应的数据源类型不存在", count, nil, nil
return false, "数据获取失败，数据不存在", count, nil, nil
}
}

33
dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go
Unescape View File

@ -3,6 +3,7 @@ package DataaccessService
import (
"dsSupport/MyModel/AccessSystem/AccessSystemDao"
"dsSupport/MyModel/DataAccess/DataaccessDAO"
"dsSupport/MyModel/DataSource/DatasourceDAO"
"dsSupport/MyModel/DataSource/DatasourceService"
"dsSupport/MyModel/MySwagger"
"dsSupport/MyModel/OrgTree/OrgtreeService"
@ -22,28 +23,44 @@ func GetDataaccessResults(swag MySwagger.DataaccessSwag) (bool, string, int32, [
var query MySwagger.DataaccessQuery
if swag.DatasourceId != "" {
conditions = append(conditions, "datasource_id="+"'"+html.EscapeString(swag.DatasourceId)+"'")
conditions = append(conditions, "da.datasource_id="+"'"+html.EscapeString(swag.DatasourceId)+"'")
}
if swag.SourceSystemid != "" {
var query MySwagger.DatasourceQuery
query.Conditions = "system_id=" + "'" + html.EscapeString(swag.SourceSystemid) + "'"
result, _, _, datasources, _ := DatasourceDAO.GetDatasourceResults(query)
if result == true {
var SourceSystemIdString string
for k, v := range datasources {
if k == 0 {
SourceSystemIdString = "'" + v["id"].(string) + "'"
} else {
SourceSystemIdString += ", '" + v["id"].(string) + "'"
}
}
conditions = append(conditions, "da.datasource_id in "+"("+html.EscapeString(SourceSystemIdString)+")")
}
}
if swag.ConsumeSystemid != "" {
conditions = append(conditions, "consume_systemid="+"'"+html.EscapeString(swag.ConsumeSystemid)+"'")
conditions = append(conditions, "da.consume_systemid="+"'"+html.EscapeString(swag.ConsumeSystemid)+"'")
}
if swag.QueryFlag != 0 {
conditions = append(conditions, "query_flag="+"'"+strconv.Itoa(swag.QueryFlag)+"'")
conditions = append(conditions, "da.query_flag="+"'"+strconv.Itoa(swag.QueryFlag)+"'")
}
if swag.SetFlag != 0 {
conditions = append(conditions, "set_flag="+"'"+strconv.Itoa(swag.SetFlag)+"'")
conditions = append(conditions, "da.set_flag="+"'"+strconv.Itoa(swag.SetFlag)+"'")
}
if swag.ConsumeType != 0 {
conditions = append(conditions, "consume_type="+"'"+strconv.Itoa(swag.ConsumeType)+"'")
conditions = append(conditions, "da.consume_type="+"'"+strconv.Itoa(swag.ConsumeType)+"'")
}
if swag.ConsumeOrgid != "" {
conditions = append(conditions, "consume_orgid="+"'"+html.EscapeString(swag.ConsumeOrgid)+"'")
conditions = append(conditions, "da.consume_orgid="+"'"+html.EscapeString(swag.ConsumeOrgid)+"'")
}
if swag.DeleteFlag != 0 {
conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'")
conditions = append(conditions, "da.delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'")
}
if swag.EnableFlag != 0 {
conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'")
conditions = append(conditions, "da.enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'")
}
if swag.Page != 0 {
page = swag.Page

4
dsSupport/MyModel/DataStatistic/DatastatisticOpenAPI/DatastatisticOpenAPI.go
Unescape View File

@ -10,8 +10,8 @@ import (
// 获取数据源列表 godoc
// @Summary 获取数据源列表
// @Description 获取数据源列表
// @Tags datasource
// @ID readDatasource
// @Tags datastatistic
// @ID readESDocAmount
// @Accept json
// @Produce json
// @Param input body MySwagger.DatasourceSwag true "数据源"

4
dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go
Unescape View File

@ -34,8 +34,8 @@ func GetESDocCount() (bool, []map[string]interface{}) {
}
data = make(map[string]interface{})
data["system_name"] = v["system_name"]
data["system_id"] = v["id"]
data["system_name"] = v["app_name"]
data["system_id"] = v["app_id"]
data["num"] = num
datas = append(datas, data)
}

2
dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go
Unescape View File

@ -23,7 +23,7 @@ func GetJyt2012Results(query MySwagger.Jyt2012Query) (bool, string, int32, []map
if count > 0 {
return true, "数据获取成功", count, list, nil
} else {
return false, "数据获取失败，systemID对应的数据源类型不存在", count, nil, nil
return false, "数据获取失败，数据不存在", count, nil, nil
}
}

1
dsSupport/MyModel/MySwagger/DataaccessSwag.go
Unescape View File

@ -4,6 +4,7 @@ import "time"
type DataaccessSwag struct {
DatasourceId string `json:"datasource_id" xorm:"not null comment('数据源ID') index VARCHAR(36)"`
SourceSystemid string `json:"consume_systemid" xorm:"not null comment('源系统ID') index VARCHAR(36)"`
ConsumeSystemid string `json:"consume_systemid" xorm:"not null comment('数据使用系统ID') index VARCHAR(36)"`
QueryFlag int `json:"query_flag" xorm:"not null default 1 comment('可查【1：是，-1：否】') INT(11)"`
SetFlag int `json:"set_flag" xorm:"not null default -1 comment('可修改【1：是，-1：否】') INT(11)"`

8
dsSupport/MyModel/OrgTree/OrgtreeController/OrgtreeController.go
Unescape View File

@ -10,10 +10,10 @@ func Routers(r *gin.RouterGroup) {
//rr.Use(middleware.Cors())
rr.POST("/ReadOrgtree", OrgtreeOpenAPI.ReadOrgtree)
rr.POST("/CreateOrgtree", OrgtreeOpenAPI.CreateOrgtree)
rr.POST("/UpdateOrgtree/:id", OrgtreeOpenAPI.UpdateOrgtree)
rr.POST("/DeleteOrgtree/:id", OrgtreeOpenAPI.DeleteOrgtree)
rr.POST("/orgtree/ReadOrgtree", OrgtreeOpenAPI.ReadOrgtree)
rr.POST("/orgtree/CreateOrgtree", OrgtreeOpenAPI.CreateOrgtree)
rr.POST("/orgtree/UpdateOrgtree/:id", OrgtreeOpenAPI.UpdateOrgtree)
rr.POST("/orgtree/DeleteOrgtree/:id", OrgtreeOpenAPI.DeleteOrgtree)
return
}

8
dsSupport/MyModel/OrgTree/OrgtreeOpenAPI/OrgtreeOpenAPI.go
Unescape View File

@ -19,7 +19,7 @@ import (
// @Param input body MySwagger.OrgtreeSwag true "机构"
// @Success 200 {object} MySwagger.Result
// @Failure 400 {object} MySwagger.Result
// @Router /v1/openapi/ReadOrgtree [post]
// @Router /v1/openapi/orgtree/ReadOrgtree [post]
func ReadOrgtree(c *gin.Context) {
var raw MySwagger.OrgtreeSwag
if err := c.ShouldBindJSON(&raw); err != nil {
@ -61,7 +61,7 @@ func ReadOrgtree(c *gin.Context) {
// @Param input body MySwagger.OrgtreeSwag true "机构"
// @Success 200 {object} MySwagger.Result
// @Failure 400 {object} MySwagger.Result
// @Router /v1/openapi/CreateOrgtree [post]
// @Router /v1/openapi/orgtree/CreateOrgtree [post]
func CreateOrgtree(c *gin.Context) {
var raw models.TDataexOrgtree
@ -104,7 +104,7 @@ func CreateOrgtree(c *gin.Context) {
// @Param input body MySwagger.OrgtreeSwag true "机构"
// @Success 200 {object} MySwagger.Result
// @Failure 400 {object} MySwagger.Result
// @Router /v1/openapi/UpdateOrgtree/{id} [post]
// @Router /v1/openapi/orgtree/UpdateOrgtree/{id} [post]
func UpdateOrgtree(c *gin.Context) {
var raw models.TDataexOrgtree
@ -148,7 +148,7 @@ func UpdateOrgtree(c *gin.Context) {
// @Param id path string true "机构ID"
// @Success 200 {object} MySwagger.Result
// @Failure 400 {object} MySwagger.Result
// @Router /v1/openapi/DeleteOrgtree/{id} [post]
// @Router /v1/openapi/orgtree/DeleteOrgtree/{id} [post]
func DeleteOrgtree(c *gin.Context) {
ID := c.Param("id")

Write Preview
Loading…
Cancel
Save