From 3f3e452f3f22ce952df999e3ff26f642e1166175 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Tue, 1 Sep 2020 09:24:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B020020090001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataAccess/DataaccessDAO/DataaccessDAO.go | 5 +-- .../DataaccessService/DataaccessService.go | 33 ++++++++++++++----- .../DatastatisticOpenAPI.go | 4 +-- .../DatastatisticService.go | 4 +-- .../MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go | 2 +- dsSupport/MyModel/MySwagger/DataaccessSwag.go | 1 + .../OrgtreeController/OrgtreeController.go | 8 ++--- .../OrgTree/OrgtreeOpenAPI/OrgtreeOpenAPI.go | 8 ++--- 8 files changed, 42 insertions(+), 23 deletions(-) diff --git a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go index 70e77d17..0955c1a6 100644 --- a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go +++ b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go @@ -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 } } diff --git a/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go b/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go index 242ec761..54039591 100644 --- a/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go +++ b/dsSupport/MyModel/DataAccess/DataaccessService/DataaccessService.go @@ -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 diff --git a/dsSupport/MyModel/DataStatistic/DatastatisticOpenAPI/DatastatisticOpenAPI.go b/dsSupport/MyModel/DataStatistic/DatastatisticOpenAPI/DatastatisticOpenAPI.go index f9c3d934..c945f50d 100644 --- a/dsSupport/MyModel/DataStatistic/DatastatisticOpenAPI/DatastatisticOpenAPI.go +++ b/dsSupport/MyModel/DataStatistic/DatastatisticOpenAPI/DatastatisticOpenAPI.go @@ -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 "数据源" diff --git a/dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go b/dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go index 63c0c104..d4508e47 100644 --- a/dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go +++ b/dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go @@ -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) } diff --git a/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go b/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go index 6befc161..cafdb32e 100644 --- a/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go +++ b/dsSupport/MyModel/JYT2012/Jyt2012DAO/Jyt2012DAO.go @@ -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 } } diff --git a/dsSupport/MyModel/MySwagger/DataaccessSwag.go b/dsSupport/MyModel/MySwagger/DataaccessSwag.go index d849c5cc..1a978b5c 100644 --- a/dsSupport/MyModel/MySwagger/DataaccessSwag.go +++ b/dsSupport/MyModel/MySwagger/DataaccessSwag.go @@ -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)"` diff --git a/dsSupport/MyModel/OrgTree/OrgtreeController/OrgtreeController.go b/dsSupport/MyModel/OrgTree/OrgtreeController/OrgtreeController.go index a0abd73f..006de564 100644 --- a/dsSupport/MyModel/OrgTree/OrgtreeController/OrgtreeController.go +++ b/dsSupport/MyModel/OrgTree/OrgtreeController/OrgtreeController.go @@ -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 } diff --git a/dsSupport/MyModel/OrgTree/OrgtreeOpenAPI/OrgtreeOpenAPI.go b/dsSupport/MyModel/OrgTree/OrgtreeOpenAPI/OrgtreeOpenAPI.go index ed6c7251..8796749b 100644 --- a/dsSupport/MyModel/OrgTree/OrgtreeOpenAPI/OrgtreeOpenAPI.go +++ b/dsSupport/MyModel/OrgTree/OrgtreeOpenAPI/OrgtreeOpenAPI.go @@ -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")