diff --git a/dsBaseRpc/DataExchange/DataExchange.go b/dsBaseRpc/DataExchange/DataExchange.go index 9afd7dc5..78fa113b 100644 --- a/dsBaseRpc/DataExchange/DataExchange.go +++ b/dsBaseRpc/DataExchange/DataExchange.go @@ -72,9 +72,11 @@ type logStruct struct { } //系统token -var SystemToken="" +var SystemToken = "" + //是否成功 -var success =false +var success = false + /** 功能:初始化目录 */ @@ -164,8 +166,8 @@ func InitFull() { */ func DataExchange() { //获取系统token - success,SystemToken=getSystemToken() - if !success{ + success, SystemToken = getSystemToken() + if !success { return } //死循环上报中 @@ -255,7 +257,7 @@ type authStruct struct { 功能:获取系统token 作者:黄海 时间:2020-07-22 - */ +*/ func getSystemToken() (bool, string) { //(1)计算出system_token=MD5.hash(MD5.hash(system_id+auth_time)+system_key) var as authStruct @@ -279,9 +281,9 @@ func getSystemToken() (bool, string) { p := httpDo("POST", ConfigUtil.DataExchangeSystemAuthUrl, string(jsonBytes)) if !p.Success { fmt.Println(CommonUtil.GetCurrentTime() + "获取认证签名失败!") - return false,"获取认证签名失败!" + return false, "获取认证签名失败!" } - return true,p.Message + return true, p.Message } /** @@ -308,6 +310,9 @@ func PostToServer(t tableStruct, list []map[string]interface{}) bool { break } ds.DelFlag = list[k]["del_flag"].(int64) + //在内层中需要手动删除掉del_flag + delete(list[k], "del_flag") + ds.OrgId = list[k]["bureau_id"].(string) dsMap = append(dsMap, ds) } diff --git a/dsBaseRpc/Sql/t_base_class.sql b/dsBaseRpc/Sql/t_base_class.sql index 786e3eee..8428af39 100644 --- a/dsBaseRpc/Sql/t_base_class.sql +++ b/dsBaseRpc/Sql/t_base_class.sql @@ -21,7 +21,7 @@ SELECT DATE_FORMAT(t1.`last_updated_time`,'%Y/%m/%d %H:%i:%s') AS `last_updated_time`, `t_dm_stage`.`stage_name` AS `stage_name`, `t_base_organization`.`org_name` AS `org_name` , - case t1.`b_use` when -1 then 1 else 0 end AS `del_flag` + case t1.`b_use` when -2 then 1 else 0 end AS `del_flag` FROM ((t_base_class as t1 JOIN `t_dm_stage` ON ( t1.`stage_id` = `t_dm_stage`.`stage_id` )) JOIN `t_base_organization` ON ( t1.`bureau_id` = `t_base_organization`.`org_id` )) diff --git a/dsBaseRpc/Sql/t_base_organization.sql b/dsBaseRpc/Sql/t_base_organization.sql index 8bf74501..66afb136 100644 --- a/dsBaseRpc/Sql/t_base_organization.sql +++ b/dsBaseRpc/Sql/t_base_organization.sql @@ -31,7 +31,7 @@ SELECT t1.`area_code` AS `area_code`, DATE_FORMAT(t1.`last_updated_time`,'%Y/%m/%d %H:%i:%s') AS `last_updated_time`, DATE_FORMAT(t1.`create_time`,'%Y/%m/%d %H:%i:%s') AS `create_time`, - case t1.`b_use` when -1 then 1 else 0 end AS `del_flag` + case t1.`b_use` when -2 then 1 else 0 end AS `del_flag` FROM `t_base_organization` as t1 where t1.b_use in (1,-2) ) as t1 \ No newline at end of file diff --git a/dsBaseRpc/Sql/t_base_student.sql b/dsBaseRpc/Sql/t_base_student.sql index e8562c3d..a46cebea 100644 --- a/dsBaseRpc/Sql/t_base_student.sql +++ b/dsBaseRpc/Sql/t_base_student.sql @@ -32,7 +32,7 @@ SELECT `t_base_organization`.`szdcxlxm` AS `szdcxlxm`, `t_base_class`.`stage_id` AS `stage_id`, `t_base_class`.`rxnf` AS `rxnf`, - case t1.`b_use` when -1 then 1 else 0 end AS `del_flag` + case t1.`b_use` when -2 then 1 else 0 end AS `del_flag` FROM (( `t_base_student` as t1 diff --git a/dsBaseRpc/Sql/t_base_teacher.sql b/dsBaseRpc/Sql/t_base_teacher.sql index e4429906..7b937129 100644 --- a/dsBaseRpc/Sql/t_base_teacher.sql +++ b/dsBaseRpc/Sql/t_base_teacher.sql @@ -25,7 +25,7 @@ t1.`state_id` AS `state_id`, DATE_FORMAT(t1.`last_updated_time`,'%Y/%m/%d %H:%i:%s') AS `last_updated_time`, DATE_FORMAT(t1.`cjny`,'%Y/%m/%d %H:%i:%s') AS `cjny`, DATE_FORMAT(t1.`create_time`,'%Y/%m/%d %H:%i:%s') AS `create_time`, -case t1.`b_use` when -1 then 1 else 0 end AS `del_flag`, +case t1.`b_use` when -2 then 1 else 0 end AS `del_flag`, `t_base_organization`.`main_school_type` AS `main_school_type`, `t_base_organization`.`xxbbm` AS `xxbbm`, `t_base_organization`.`xxbxlxm` AS `xxbxlxm`, diff --git a/dsBaseRpc/Sql/t_sys_dict.sql b/dsBaseRpc/Sql/t_sys_dict.sql index 627f92f4..95c9a83c 100644 --- a/dsBaseRpc/Sql/t_sys_dict.sql +++ b/dsBaseRpc/Sql/t_sys_dict.sql @@ -8,6 +8,6 @@ SELECT t1.`sort_id` AS `sort_id`, cast( t1.`b_use` AS signed ) AS `b_use`, '-1' as bureau_id, - case t1.`b_use` when -1 then 1 else 0 end AS `del_flag` + case t1.`b_use` when -2 then 1 else 0 end AS `del_flag` FROM `t_sys_dict` as t1 \ No newline at end of file diff --git a/dsBaseRpc/main.go b/dsBaseRpc/main.go index f252d532..a372b27b 100644 --- a/dsBaseRpc/main.go +++ b/dsBaseRpc/main.go @@ -1,6 +1,7 @@ package main import ( + "dsBaseRpc/DataExchange" "dsBaseRpc/RpcService/BaseClass/BaseClassProto" "dsBaseRpc/RpcService/BaseClass/BaseClassService" "dsBaseRpc/RpcService/BaseGlobal/BaseGlobalProto" @@ -110,9 +111,9 @@ func main() { BaseRolePersonProto.RegisterBaseRolePersonManageServer(s, &BaseRolePersonService.Rpc{}) //五、开启一个数据上报的协程 - //go func() { - // DataExchange.DataExchange() - //}() + go func() { + DataExchange.DataExchange() + }() //六、 注册反射服务 这个服务是CLI使用的 跟服务本身没有关系 reflection.Register(s) //七、启动