diff --git a/dsBaseRpc/DataEx/DataEx.go b/dsBaseRpc/DataEx/DataEx.go index aa9b82a2..daf8e51e 100644 --- a/dsBaseRpc/DataEx/DataEx.go +++ b/dsBaseRpc/DataEx/DataEx.go @@ -19,8 +19,13 @@ var sqlDict = []string{"t_base_organization", "t_base_class"} */ func DataExchange() { for { + //本轮上报的数量,如果是0,休息10秒后再继续上传 + count:=0 //遍历所有的配置节,进行循环 for i := range sqlDict { + //判断日志目录下的记录是不是存在? + + //存在则读取last_updated_time+id_int进行分页获取 paramMap := map[string]interface{}{"last_updated_time": "2020-07-15 00:00:00"} list, err := db.SqlMapClient(sqlDict[i], ¶mMap).Query().List() if err != nil { diff --git a/dsBaseRpc/Sql/ds_base.xml b/dsBaseRpc/Sql/ds_base.xml index 6ecef962..6016d265 100644 --- a/dsBaseRpc/Sql/ds_base.xml +++ b/dsBaseRpc/Sql/ds_base.xml @@ -1,40 +1,4 @@ - - SELECT - cast( `t_base_class`.`class_id` AS CHAR ( 36 ) charset utf8 ) AS `class_id`, - `t_base_class`.`id_int` AS `id_int`, - `t_base_class`.`bh` AS `bh`, - `t_base_class`.`class_code` AS `class_code`, - `t_base_class`.`class_name` AS `class_name`, - `t_base_class`.`class_alias` AS `class_alias`, - `t_base_class`.`rxnf` AS `rxnf`, - `t_base_class`.`rxjj` AS `rxjj`, - `t_base_class`.`schooling_length` AS `schooling_length`, - `t_base_class`.`stage_id` AS `stage_id`, - cast( `t_base_class`.`teacher_id` AS CHAR ( 36 ) charset utf8 ) AS `teacher_id`, - cast( `t_base_class`.`org_id` AS CHAR ( 36 ) charset utf8 ) AS `org_id`, - cast( `t_base_class`.`bureau_id` AS CHAR ( 36 ) charset utf8 ) AS `bureau_id`, - cast( `t_base_class`.`b_use` AS signed ) AS `b_use`, - `t_base_class`.`province_code` AS `province_code`, - `t_base_class`.`city_code` AS `city_code`, - `t_base_class`.`district_code` AS `district_code`, - cast( `t_base_class`.`main_school_id` AS CHAR ( 36 ) charset utf8 ) AS `main_school_id`, - DATE_FORMAT(`t_base_class`.`create_time`,'%Y/%m/%d %H:%i:%s') AS `create_time`, - `t_base_class`.`last_updated_time` AS `last_updated_time`, - `t_dm_stage`.`stage_name` AS `stage_name`, - `t_base_organization`.`org_name` AS `org_name` , - case `t_base_class`.`b_use` when -1 then 1 else 0 end AS `del_flag` - FROM - (( - `t_base_class` - JOIN `t_dm_stage` ON ( `t_base_class`.`stage_id` = `t_dm_stage`.`stage_id` )) - JOIN `t_base_organization` ON ( `t_base_class`.`bureau_id` = `t_base_organization`.`org_id` )) - WHERE - `t_base_class`.`last_updated_time`>?last_updated_time - ORDER BY - `t_base_class`.`last_updated_time` - - SELECT cast( `t_base_organization`.`org_id` AS CHAR ( 36 ) charset utf8 ) AS `org_id`, @@ -76,4 +40,40 @@ ORDER BY `t_base_organization`.`last_updated_time` + + + SELECT + cast( `t_base_class`.`class_id` AS CHAR ( 36 ) charset utf8 ) AS `class_id`, + `t_base_class`.`id_int` AS `id_int`, + `t_base_class`.`bh` AS `bh`, + `t_base_class`.`class_code` AS `class_code`, + `t_base_class`.`class_name` AS `class_name`, + `t_base_class`.`class_alias` AS `class_alias`, + `t_base_class`.`rxnf` AS `rxnf`, + `t_base_class`.`rxjj` AS `rxjj`, + `t_base_class`.`schooling_length` AS `schooling_length`, + `t_base_class`.`stage_id` AS `stage_id`, + cast( `t_base_class`.`teacher_id` AS CHAR ( 36 ) charset utf8 ) AS `teacher_id`, + cast( `t_base_class`.`org_id` AS CHAR ( 36 ) charset utf8 ) AS `org_id`, + cast( `t_base_class`.`bureau_id` AS CHAR ( 36 ) charset utf8 ) AS `bureau_id`, + cast( `t_base_class`.`b_use` AS signed ) AS `b_use`, + `t_base_class`.`province_code` AS `province_code`, + `t_base_class`.`city_code` AS `city_code`, + `t_base_class`.`district_code` AS `district_code`, + cast( `t_base_class`.`main_school_id` AS CHAR ( 36 ) charset utf8 ) AS `main_school_id`, + DATE_FORMAT(`t_base_class`.`create_time`,'%Y/%m/%d %H:%i:%s') AS `create_time`, + `t_base_class`.`last_updated_time` AS `last_updated_time`, + `t_dm_stage`.`stage_name` AS `stage_name`, + `t_base_organization`.`org_name` AS `org_name` , + case `t_base_class`.`b_use` when -1 then 1 else 0 end AS `del_flag` + FROM + (( + `t_base_class` + JOIN `t_dm_stage` ON ( `t_base_class`.`stage_id` = `t_dm_stage`.`stage_id` )) + JOIN `t_base_organization` ON ( `t_base_class`.`bureau_id` = `t_base_organization`.`org_id` )) + WHERE + `t_base_class`.`last_updated_time`>?last_updated_time + ORDER BY + `t_base_class`.`last_updated_time` +