Merge branch 'master' of http://10.10.14.250:3000/huanghai/dsMin

dsSupport/MyModel/DataStatistic/DatastatisticService/DatastatisticService.go

@@ -1,3 +1,64 @@
+<<<<<<< HEAD
+package DatastatisticService
+
+import (
+	"dsSupport/MyModel/AccessSystem/AccessSystemDao"
+	"dsSupport/MyModel/DataSource/DatasourceService"
+	"dsSupport/MyModel/MySwagger"
+	"dsSupport/Utils/ES7Util"
+	"fmt"
+)
+
+type ESDataContent struct {
+	Address  string `json:"address"`
+	AreaCode string `json:"area_code"`
+	OrgName  string `json:"org_name"`
+}
+
+func GetESDocCount() (bool, []map[string]interface{}) {
+	var datas []map[string]interface{}
+	var data map[string]interface{}
+
+	linksystems, c, _ := AccessSystemDao.ListApp("", 1, 1000)
+	if c > 0 {
+		for _, v := range linksystems {
+			var num int64 = 0
+			var sw MySwagger.DatasourceSwag
+			sw.SystemId = v["app_id"].(string)
+			rr, _, _, datasources, _ := DatasourceService.GetDatasourceResults(sw)
+			if rr == true {
+				for _, vv := range datasources {
+					fmt.Println(vv["datasource_code"])
+					fmt.Println(vv["datasource_name"])
+					result, _ := ES7Util.GetDocCount(vv["datasource_code"].(string))
+					num += result
+					_, _, esdata := ES7Util.GetLatestDoc(vv["datasource_code"].(string))
+					fmt.Println(esdata.BeginTime)
+
+					data = make(map[string]interface{})
+					data["system_name"] = v["app_name"]
+					data["system_id"] = v["app_id"]
+					data["datasource_code"] = vv["datasource_code"]
+					data["datasource_name"] = vv["datasource_name"]
+					data["storage_time"] = esdata.BeginTime
+					data["num"] = result
+					datas = append(datas, data)
+				}
+			}
+
+			//data = make(map[string]interface{})
+			//data["system_name"] = v["app_name"]
+			//data["system_id"] = v["app_id"]
+			//data["num"] = num
+			//datas = append(datas, data)
+		}
+	} else {
+		return false, datas
+	}
+
+	return true, datas
+}
+=======
 package DatastatisticService
 
 import (
@@ -54,3 +115,4 @@ func GetESDocCount() (bool, []map[string]interface{}) {
 
 	return true, datas
 }
+>>>>>>> ed13a56a674e22558c9fde7fef8d8bd7df80d00b

dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go

@@ -1,3 +1,137 @@
+<<<<<<< HEAD
+package Jyt2012Service
+
+import (
+	"dsSupport/MyModel/JYT2012/Jyt2012DAO"
+	"dsSupport/MyModel/MySwagger"
+	"dsSupport/Utils/CacheUtil"
+	"dsSupport/Utils/CommonUtil"
+	"dsSupport/models"
+	"html"
+	"strconv"
+	"strings"
+	"time"
+)
+
+func GetJyt2012Results(swag MySwagger.Jyt2012Swag) (bool, string, int32, []map[string]interface{}, error) {
+	var condition string
+	var conditions []string
+	var page int
+	var query MySwagger.Jyt2012Query
+
+	if swag.DicName != "" {
+		conditions = append(conditions, "dic_name="+"'"+html.EscapeString(swag.DicName)+"'")
+	}
+	if swag.DicValue != "" {
+		conditions = append(conditions, "dic_value="+"'"+html.EscapeString(swag.DicValue)+"'")
+	}
+	if swag.DicType != 0 {
+		conditions = append(conditions, "dic_type="+"'"+strconv.Itoa(swag.DicType)+"'")
+	}
+	if swag.DicInfo != "" {
+		conditions = append(conditions, "dic_info="+"'"+html.EscapeString(swag.DicInfo)+"'")
+	}
+	if swag.RootFlag != 0 {
+		conditions = append(conditions, "root_flag="+"'"+strconv.Itoa(swag.RootFlag)+"'")
+	}
+	if swag.JytFlag != 0 {
+		conditions = append(conditions, "jyt_flag="+"'"+strconv.Itoa(swag.JytFlag)+"'")
+	}
+	if swag.ParentId != "" {
+		conditions = append(conditions, "parent_id="+"'"+html.EscapeString(swag.ParentId)+"'")
+	}
+	if swag.DeleteFlag != 0 {
+		conditions = append(conditions, "delete_flag="+"'"+strconv.Itoa(swag.DeleteFlag)+"'")
+	}
+	if swag.EnableFlag != 0 {
+		conditions = append(conditions, "enable_flag="+"'"+strconv.Itoa(swag.EnableFlag)+"'")
+	}
+	if swag.Page != 0 {
+		page = swag.Page
+		query.Page = (page - 1) * 100
+	} else {
+		query.Page = 0
+	}
+
+	if len(conditions) > 0 {
+		condition = " AND " + strings.Join(conditions, " AND ")
+	} else {
+		condition = ""
+	}
+	query.Conditions = condition
+
+	result, message, count, data, failResult := Jyt2012DAO.GetJyt2012Results(query)
+
+	return result, message, count, data, failResult
+}
+
+func CreateJyt2012(model models.TDataexJyt2012) (bool, string, error) {
+	business := new(models.TDataexJyt2012)
+	business.Id = CommonUtil.GetUUID()
+	business.DicName = html.EscapeString(model.DicName)
+	business.DicValue = html.EscapeString(model.DicValue)
+	business.DicType = model.DicType
+	business.DicInfo = html.EscapeString(model.DicInfo)
+	business.RootFlag = model.RootFlag
+	business.JytFlag = model.JytFlag
+	business.ParentId = html.EscapeString(model.ParentId)
+	business.CreateTime = time.Now()
+	business.DeleteFlag = -1
+	business.EnableFlag = 1
+
+	result, message, error := Jyt2012DAO.CreateJyt2012(business)
+
+	return result, message, error
+}
+
+func UpdateJyt2012(id string, model models.TDataexJyt2012) (bool, string, error) {
+	business := new(models.TDataexJyt2012)
+
+	//清除Redis缓存
+	var ids = []string{id}
+	var selector = CacheUtil.GetBean("t_dataex_jyt2012")
+	CacheUtil.DeleteCacheByIds(ids, selector)
+
+	business.ChangeTime = time.Now()
+	business.DicName = html.EscapeString(model.DicName)
+	business.DicValue = html.EscapeString(model.DicValue)
+	business.DicType = model.DicType
+	business.DicInfo = html.EscapeString(model.DicInfo)
+	business.RootFlag = model.RootFlag
+	business.JytFlag = model.JytFlag
+	business.ParentId = html.EscapeString(model.ParentId)
+	business.EnableFlag = model.EnableFlag
+
+	result, message, error := Jyt2012DAO.UpdateJyt2012(id, business)
+
+	return result, message, error
+}
+
+func RemoveJyt2012(id string) (bool, string, error) {
+	business := new(models.TDataexJyt2012)
+
+	//清除Redis缓存
+	var ids = []string{id}
+	var selector = CacheUtil.GetBean("t_dataex_jyt2012")
+	CacheUtil.DeleteCacheByIds(ids, selector)
+
+	business.Id = html.EscapeString(id)
+	business.ChangeTime = time.Now()
+	business.DeleteTime = time.Now()
+	business.DeleteFlag = 1
+	business.EnableFlag = -1
+
+	result, message, error := Jyt2012DAO.RemoveJyt2012(id, business)
+
+	return result, message, error
+}
+
+func IsJyt2012ExistsById(id string) bool {
+	result := Jyt2012DAO.IsJyt2012ExistsById(id)
+
+	return result
+}
+=======
 package Jyt2012Service
 
 import (
@@ -130,3 +264,4 @@ func IsJyt2012ExistsById(id string) bool {
 
 	return result
 }
+>>>>>>> 45f3e9adb8df950c7777dd7b3b0d45c245f98fa2

dsSupport/MyModel/MySwagger/DatasourceESSwag.go

@@ -1,3 +1,14 @@
+<<<<<<< HEAD
+package MySwagger
+
+type DatasourceESSwag struct {
+	DatasourceCode	string		`json:"datasource_code" xorm:"not null comment('数据源编码') VARCHAR(8)" example:"org_tree"`
+	OrgIDs      	[]string    `json:"orgids" xorm:"not null comment('提供数据范围【1：本机构，2：本机构以及下属机构，-1：不限制】') VARCHAR(36)" example:""`
+	BeginTime		string		`json:"begin_time" example:"2020-06-22 17:26:53"`
+	Conditions		map[string]interface{} `json:"conditions" example:""`
+	Sort			map[string]interface{} `json:"sort" example:""`
+	Page			int 	   	`json:"page" example:"1"`
+=======
 package MySwagger
 
 type DatasourceESSwag struct {
@@ -7,4 +18,5 @@ type DatasourceESSwag struct {
 	Conditions		map[string]interface{} `json:"conditions" example:"[{res_id:12300,res_name:初一语文一单元作业,teacher_id:123001,time_spend:100s}]"`
 	Sort			map[string]interface{} `json:"sort" example:"[{res_id:12300,res_name:初一语文一单元作业,teacher_id:123001,time_spend:100s}]"`
 	Page			int 	   	`json:"page" example:"1"`
+>>>>>>> 45f3e9adb8df950c7777dd7b3b0d45c245f98fa2
 }

dsSupport/MyModel/MySwagger/Jyt2012Swag.go

@@ -1,3 +1,34 @@
+<<<<<<< HEAD
+/**
+ * @Title:
+ * @Description:
+ * @Author: Yuki Wong(iyuki0430@msn.com)
+ * @Update:
+ * @Date: 2020/7/9 10:24
+ * @File: Jyt2012Swag.go
+ * @Software: GoLand
+ **/
+package MySwagger
+
+import "time"
+
+type Jyt2012Swag struct {
+	Id         string    `json:"id" xorm:"not null pk comment('ID') VARCHAR(36)" example:"F38BD0DB-0142-4356-8F2B-623813FC2578"`
+	DicName    string    `json:"dic_name" xorm:"not null comment('字典/字典项名称') VARCHAR(100)" example:"sex"`
+	DicValue    string    `json:"dic_name" xorm:"not null comment('字典/字典项值') VARCHAR(100)" example:"10"`
+	DicType    int       `json:"dic_type" xorm:"not null default 1 comment('字典类型【1：国标数据、关联数据源，2：国标字典、关联元数据】') INT(11)" example:"1"`
+	DicInfo    string    `json:"dic_info" xorm:"default ''NULL'' comment('字典项说明') VARCHAR(500)" example:"我是字典项说明"`
+	RootFlag   int       `json:"root_flag" xorm:"not null default -1 comment('是否是字典【1：是，-1：否】') INT(11)" example:"1"`
+	JytFlag    int       `json:"jyt_flag" xorm:"not null default 1 comment('是否国标【1：是，-1：自定义】') INT(11)" example:"1"`
+	ParentId   string    `json:"parent_id" xorm:"default ''NULL'' comment('字典ID【字典项父节点】') VARCHAR(36)" example:"38BD0DB-0142-4356-8F2B-623813FC2578"`
+	CreateTime time.Time `json:"create_time" xorm:"default 'NULL' created comment('建立时间') DATETIME" example:"2020-06-22 17:26:53"`
+	ChangeTime time.Time `json:"change_time" xorm:"default 'NULL' updated comment('最近修改时间') DATETIME" example:"2020-06-22 17:26:53"`
+	DeleteTime time.Time `json:"delete_time" xorm:"default 'NULL' deleted comment('删除时间') DATETIME" example:"2020-06-22 17:26:53"`
+	DeleteFlag int       `json:"delete_flag" xorm:"not null default -1 comment('删除标志【默认-1，1：删除，-1：正常】') INT(11)" example:"1"`
+	EnableFlag int       `json:"enable_flag" xorm:"not null default 1 comment('启用标志【默认1，1：启用，-1：禁用】') INT(11)" example:"1"`
+	Page 	   int 	     `json:"page" example:"1"`
+}
+=======
 /**
  * @Title:
  * @Description:
@@ -27,3 +58,4 @@ type Jyt2012Swag struct {
 	EnableFlag int       `json:"enable_flag" xorm:"not null default 1 comment('启用标志【默认1，1：启用，-1：禁用】') INT(11)" example:"1"`
 	Page 	   int 	     `json:"page" example:"1"`
 }
+>>>>>>> 45f3e9adb8df950c7777dd7b3b0d45c245f98fa2

dsSupport/Test/CreatePgTable/CreatePgTable.go

@@ -0,0 +1,70 @@
+package main
+
+import (
+	"dsSupport/Utils/CommonUtil"
+	"dsSupport/Utils/DbUtil"
+	"fmt"
+)
+
+var db = DbUtil.Engine
+
+func main() {
+	//1、读取每一张需要创建的表
+	sql := "select * from t_dw_table"
+	list, _ := db.SQL(sql).Query().List()
+
+	for i := range list {
+		tableId := list[i]["table_id"].(int64)
+		tableName := list[i]["table_name"].(string)
+		createTableSql := `DROP TABLE IF EXISTS "public"."` + tableName + `";` + "\r\n"
+		createTableSql += `CREATE TABLE "public"."` + tableName + `" (` + "\r\n"
+		//2、根据表名，获取相应的创建表的信息
+		sql = `select * from t_dw_table_field where table_id=?`
+		list2, _ := db.SQL(sql, tableId).Query().List()
+		for i2 := range list2 {
+			dataType := list2[i2]["data_type"].(string)
+			fieldLength := list2[i2]["field_length"].(int64)
+			isNull := list2[i2]["is_null"].(int64)
+			fieldName := list2[i2]["field_name"].(string)
+			var c = ""
+			if dataType == "int" {
+				c = "int" + CommonUtil.ConvertInt64ToString(fieldLength)
+			} else {
+				c = dataType + "(" + CommonUtil.ConvertInt64ToString(fieldLength) + ") " + ` COLLATE "pg_catalog"."default"`
+			}
+			if isNull == 0 {
+				c += " NOT NULL,"
+			} else {
+				if i2 < len(list2)-1 {
+					c += ","
+				}
+			}
+			createTableSql += `"` + fieldName + `" ` + c + "\r\n"
+		}
+		createTableSql += `);` + "\r\n"
+		//添加生成字段描述信息
+		for i2 := range list2 {
+			fieldName := list2[i2]["field_name"].(string)
+			comment := list2[i2]["comment"]
+			if comment != nil && len(comment.(string)) > 0 {
+				createTableSql += `COMMENT ON COLUMN "public"."` + tableName + `"."` + fieldName + `" IS '` + comment.(string) + `';` + "\r\n"
+			}
+		}
+		//主键有哪些
+		var pks = ""
+		for i2 := range list2 {
+			fieldName := list2[i2]["field_name"].(string)
+			isPk := list2[i2]["is_pk"].(int64)
+			if isPk == 1 {
+				pks += fieldName + ","
+			}
+		}
+		//去掉最后一个逗号
+		pks = pks[0 : len(pks)-1]
+		//添加主键描述
+		createTableSql += `-- 设置主键` + "\r\n"
+		createTableSql += `ALTER TABLE "public"."` + tableName + `" ADD CONSTRAINT "` + tableName + `_dw_pkey" PRIMARY KEY ("` + pks + `");` + "\r\n"
+
+		fmt.Println(createTableSql)
+	}
+}

dsSupport/go.sum

@@ -98,6 +98,7 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -129,6 +130,7 @@ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYr
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/sftp v1.12.0 h1:/f3b24xrDhkhddlaobPe2JgBqfdt+gC/NYl0QY9IOuI=
 github.com/pkg/sftp v1.12.0/go.mod h1:fUqqXB5vEgVCZ131L+9say31RAri6aF6KDViawhxKK8=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -170,6 +172,7 @@ github.com/xormplus/xorm v0.0.0-20200731130200-6811f3bde592 h1:uZkSqOig4izJR611D
 github.com/xormplus/xorm v0.0.0-20200731130200-6811f3bde592/go.mod h1:+v6b10b4x5IcQmp1/Cbo9IqaknxVeuhQng+fhya6bdI=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -206,6 +209,7 @@ golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200821140526-fda516888d29 h1:mNuhGagCf3lDDm5C0376C/sxh6V7fy9WbdEu/YDNA04=
 golang.org/x/sys v0.0.0-20200821140526-fda516888d29/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=