From a0dc5edf33ceb3439d3784f583d39f602354f1d1 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Tue, 1 Sep 2020 15:49:33 +0800 Subject: [PATCH] 'commit' --- Logs/dsSupport.log | 16 ++++++++++++++++ .../DataAccess/DataaccessDAO/DataaccessDAO.go | 2 +- .../JYT2012/Jyt2012Service/Jyt2012Service.go | 4 ++++ dsSupport/MyModel/MySwagger/Jyt2012Swag.go | 1 + dsSupport/models/t_dataex_jyt2012.go | 1 + 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Logs/dsSupport.log b/Logs/dsSupport.log index 9eb61c09..7a258f98 100644 --- a/Logs/dsSupport.log +++ b/Logs/dsSupport.log @@ -61,3 +61,19 @@ [Error]2020/09/01 14:25:45 SqlQueryError Error 1054: Unknown column 'id' in 'field list' [Error]2020/09/01 14:45:55 SqlQueryError Error 1054: Unknown column 'id' in 'field list' [Error]2020/09/01 14:45:55 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:20:34 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Params type error +[Error]2020/09/01 15:24:43 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:24:43 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:27:48 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:27:48 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:28:22 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:28:22 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:30:22 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:30:22 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:39:09 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:39:09 SqlQueryError Error 1054: Unknown column 'id' in 'field list' +[Error]2020/09/01 15:41:46 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value +[Error]2020/09/01 15:42:29 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value +[Error]2020/09/01 15:42:42 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value +[Error]2020/09/01 15:44:09 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value +[Error]2020/09/01 15:45:10 SqlUpdateError 接入系统authToken Update，数据库操作发生严重错误：Error 1364: Field 'dic_value' doesn't have a default value diff --git a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go index 02350ca7..55a5c188 100644 --- a/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go +++ b/dsSupport/MyModel/DataAccess/DataaccessDAO/DataaccessDAO.go @@ -40,7 +40,7 @@ func GetDataaccessResults(query MySwagger.DataaccessQuery) (bool, string, int32, joinList, _, _ = CacheUtil.Page(sql, 10000, 1) joinListJson, _ = json.Marshal(joinList) - mergedList = CommonUtil.ListMerge(mergedList, string(joinListJson), " consume_systemid", "app_id", "consume_systemname", "app_name") + mergedList = CommonUtil.ListMerge(mergedList, string(joinListJson), "consume_systemid", "app_id", "consume_systemname", "app_name") fmt.Println(mergedList) var datas []map[string]interface{} diff --git a/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go b/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go index 547e177b..e7b30a73 100644 --- a/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go +++ b/dsSupport/MyModel/JYT2012/Jyt2012Service/Jyt2012Service.go @@ -21,6 +21,9 @@ func GetJyt2012Results(swag MySwagger.Jyt2012Swag) (bool, string, int32, []map[s 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)+"'") } @@ -65,6 +68,7 @@ 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 diff --git a/dsSupport/MyModel/MySwagger/Jyt2012Swag.go b/dsSupport/MyModel/MySwagger/Jyt2012Swag.go index 4479a7bb..f1be9e22 100644 --- a/dsSupport/MyModel/MySwagger/Jyt2012Swag.go +++ b/dsSupport/MyModel/MySwagger/Jyt2012Swag.go @@ -14,6 +14,7 @@ import "time" type Jyt2012Swag struct { Id string `json:"id" xorm:"not null pk comment('ID') VARCHAR(36)"` DicName string `json:"dic_name" xorm:"not null comment('字典/字典项名称') VARCHAR(100)"` + DicValue string `json:"dic_name" xorm:"not null comment('字典/字典项值') VARCHAR(100)"` DicType int `json:"dic_type" xorm:"not null default 1 comment('字典类型【1：国标数据、关联数据源，2：国标字典、关联元数据】') INT(11)"` DicInfo string `json:"dic_info" xorm:"default ''NULL'' comment('字典相信说明') VARCHAR(500)"` RootFlag int `json:"root_flag" xorm:"not null default -1 comment('是否是字典【1：是，-1：否】') INT(11)"` diff --git a/dsSupport/models/t_dataex_jyt2012.go b/dsSupport/models/t_dataex_jyt2012.go index 901c6f82..8a8e1cbb 100644 --- a/dsSupport/models/t_dataex_jyt2012.go +++ b/dsSupport/models/t_dataex_jyt2012.go @@ -7,6 +7,7 @@ import ( type TDataexJyt2012 struct { Id string `json:"id" xorm:"not null pk comment('ID') VARCHAR(36)"` DicName string `json:"dic_name" xorm:"not null comment('字典/字典项名称') VARCHAR(100)"` + DicValue string `json:"dic_value" xorm:"not null comment('字典/字典项值') VARCHAR(100)"` DicType int `json:"dic_type" xorm:"not null default 1 comment('字典类型【1：国标数据、关联数据源，2：国标字典、关联元数据】') INT(11)"` DicInfo string `json:"dic_info" xorm:"default ''NULL'' comment('字典相信说明') VARCHAR(500)"` RootFlag int `json:"root_flag" xorm:"not null default -1 comment('是否是字典【1：是，-1：否】') INT(11)"`