delete useless funtion

2025-04-30 10:22:57 +08:00
parent 59079da4be
commit 92117de97e
10 changed files with 26 additions and 1056 deletions
--- a/mms/db_interface.h
+++ b/mms/db_interface.h
@@ -42,9 +42,6 @@
 #define SHOULD_UNREGISTER				2
 ///////////////////////////////////////////////////////////////////////////////

-
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -80,50 +77,28 @@ void add_mvl_type_ctrl(char doname[], int ctrl);
 int sel_mvl_type_ctrl_flag(char doname[]);
 void del_mvl_type_ctrl();
 //<2F><><EFBFBD><EFBFBD>ģʽ<C4A3>Ż<EFBFBD> end
+
 #ifndef DB_INTERFACE_H
 #define DB_INTERFACE_H
 // ǰ<><C7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LD_info_t
 typedef struct LD_info_t LD_info_t;
 int	urcbRealDataHasReceived(int dev_index, LD_info_t* LD_info, long long Time); //lnk20241223
 #endif
-
-int is_rpt_Time_exact_hour() ;
 
 apr_status_t app_get_private_config(const char *myfilename);

 void parse_log_switch_ini(unsigned int* error,unsigned int* warn,unsigned int* info);
-
-
-int parse_device_cfg_json_test();
-int parse_line_cfg_pg_test();
-
-int parse_device_cfg_json();
-int parse_device_cfg_pg();
-int parse_line_cfg_pg();
 void init_config();
 int GetServerIndexFromDB();
-
 int parse_device_cfg();
 int parse_line_cfg();
 int parse_rpt_log_ini();
-int parse_json_cfg();
-
 void clear_all_LD_real_soe_report_shoud_register();
-
 void add_comm_log(char* log_str);
-void prcess_monitor_comm_2_json(int monitor_id,int status,long long tm);
-
 void clear_old_comtrade_files();
-
 int process_login_verify();

 //////////////////////////////WW 20230819<31><39><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-int OTLConnect(); //OTL<54><4C><EFBFBD><EFBFBD>Oracle<6C><65><EFBFBD>ݿ<EFBFBD>
-int OTLDisconnect(); //OTL<54>Ͽ<EFBFBD>Oracle<6C><65><EFBFBD>ݿ<EFBFBD>
-int OTLState(); //OTL<54><4C><EFBFBD><EFBFBD>Oracle<6C><65><EFBFBD>ݿ<EFBFBD>״̬
-int OTLDbconnected();
-int write_to_db(const char* sqlstm); //<2F><><EFBFBD>ݿ<EFBFBD>д<EFBFBD><D0B4>
-int OTLTestSelect();//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>ȡ
 void TestToken();
 void TestBodyPost();//WW <20><><EFBFBD><EFBFBD>qt post
 void TestSMSPost();//WW <20><><EFBFBD><EFBFBD>qt post
@@ -137,7 +112,6 @@ void coutTest();//CZY 2023-09-11 test
 void TestOBS();//WW 20230921 <20><><EFBFBD>Ի<EFBFBD>Ϊ<EFBFBD>Ʒ<EFBFBD><C6B7><EFBFBD><EFBFBD><EFBFBD>
 void OBSFile(char* localpath, char* cloudpath,const char* code);
 void OBSFile_del(char* cloudpath, const char* code);
-
 void DataHub_Send_Datahub(char* topic, char* data);//datahubͨѶ
 void Nacos_GetParam(char* postgres_uid, char* postgres_pwd, char* web_clientid, char* web_clientsecret);//nacos
 void Nacos_GetParam_Ptr(const char* code, char** ptr);
@@ -147,13 +121,12 @@ void Read_Nacos_Param_Web(char** client_id, char** client_secret, char** token_u
 void Read_Nacos_Param_Flag(int*  file_flag, int* send_flag, int* front_inst, char** front_ip);
 void Read_Nacos_Param_Recall(int* recall_len, int* recall_sta, int* recall_daily);
 void Read_Nacos_Param_Uds(char** uds_upload_url, char** uds_download_url, char** uds_delete_url);//nacos<6F><73>ȡuds<64><73><EFBFBD><EFBFBD>
-int WebAPI_Uds_Upload(char* strUrl, char* loacl_path, char* uuid,char* filename);
+int  WebAPI_Uds_Upload(char* strUrl, char* loacl_path, char* uuid,char* filename);
 void WebAPI_Uds_Download(char* strUrl, char* uuid, char* local_path,char* filename);
-int base64_decode(const char* indata, int inlen, char* outdata, long* outlen);
-int testbase64();
+int  base64_decode(const char* indata, int inlen, char* outdata, long* outlen);
+int  testbase64();
 /////////////////////////////WW end

-
 //////////////////////////////WW 20230822<32><32><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>WebSocket<65>߳<EFBFBD>
 void try_start_socket_thread(); //<2F><><EFBFBD><EFBFBD>Web Socket<65>߳<EFBFBD>
 void try_start_ontimer_thread();//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>߳<EFBFBD>s
@@ -162,37 +135,18 @@ void try_start_ontimer_thread();//
 //lnk20241029<32><39><EFBFBD><EFBFBD>http<74>߳<EFBFBD>////////////////////////////////////////
 void try_start_web_http_thread(); //<2F><><EFBFBD><EFBFBD>Webhttp<74>߳<EFBFBD>
 void try_start_http_thread(); //<2F><><EFBFBD><EFBFBD>http<74>߳<EFBFBD>
-
 int try_start_mqtest_thread(int argc, char *argv[]); //20241202
-//////////////////////////////////////////////////////////////////////
-
-int OTL_Select_xmlModel(); //xmlģ<6C><C4A3><EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD><DDBF><EFBFBD>ȡ
-void OTL_Select_recall(char* time, char* id);
-int OTL_Select_DecideRecall(char* time, char* id);//<2F>ж<EFBFBD><D0B6>Ƿ<EFBFBD><C7B7><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD>
-char* getoneday(int num);
-void deletechar(char* day);
 void CreateRecallXml();
 void DeletcRecallXml();

-
 /*lnk10-11*////////////////////////////////////////////////////////////////////////
 void rocketmq_test();
 void rocketmq_test_300(int mpnum,int front_index);
 void SOEFileWeb_test();
 void qvvr_test();
 void comflag_test();
-
-int parse_device_web_test_ext();
-int parse_device_web_test_dev();
-int parse_line_web_test();
-int parse_model_web_test();
-int parse_intact_web_test_read();
-int parse_device_web_test_front_read();
-int parse_device_web_test_front_write();
-
 int parse_device_cfg_web();
 int parse_model_cfg_web();
-
 void SOEFileWeb(char* localpath,char* cloudpath,char* wavepath);
 //////////////////////////////////////////////////////////////////////////////////////

--- a/mms/mms_process.c
+++ b/mms/mms_process.c
@@ -10,16 +10,11 @@
 * @latest:  $Id: mms_process.c,v 1.28 2022/11/28 07:13:13 lizhongming Exp $
 */
 #include <string.h>
-
 #include "rdb_client.h"
-
-//#include "../misc/utf8_to_gb.h"
-//#include "../misc/gb_to_utf8.h"
 #include <stdlib.h>
 #include "db_interface.h"
 #include "node.h"
 #include "ied.h"
-
 #include "../json/mms_json_inter.h" 
 #include "../cfg_parse/custom_printf.h"//lnk20250225

--- a/mms/mmscli_rpt.c
+++ b/mms/mmscli_rpt.c
@@ -1098,7 +1098,6 @@ ST_VOID u_iec_rpt_ind_data_by_devtype(MVL_VAR_ASSOC** info_va,
 					else if (mms_dec_data.data_item[ii].type == DATA_STR_TYPE)
 						v = strtol(mms_dec_data.data_item[ii].u.data_str, NULL, 2);

-					//set_db_value(RPT_IDX,FULL_FCDA_Name,v, is_rpt_Time_exact_hour() );
 					if (strstr(rcb_info->RptID, "QVVR")) {//CZY 2023-08-17 WW 2022-11-14 <20>޸<EFBFBD><DEB8>ж<EFBFBD>LLN0$BR$brcbQVVR
 						processQVVR_data(LD_info, FULL_FCDA_Name, v);
 					}
@@ -1486,7 +1485,6 @@ ST_VOID u_iec_rpt_ind_data(MVL_VAR_ASSOC** info_va,
 					else if (mms_dec_data.data_item[ii].type == DATA_STR_TYPE)
 						v = strtol(mms_dec_data.data_item[ii].u.data_str, NULL, 2);

-					//set_db_value(RPT_IDX,FULL_FCDA_Name,v, is_rpt_Time_exact_hour() );
 					if (strstr(rcb_info->RptID, "QVVR")) {//CZY 2023-08-17 WW 2022-11-14 <20>޸<EFBFBD><DEB8>ж<EFBFBD>LLN0$BR$brcbQVVR
 						processQVVR_data(LD_info, FULL_FCDA_Name, v);
 					}
--- a/mms/parse_xml.c
+++ b/mms/parse_xml.c
@@ -13,23 +13,18 @@
 #include "rdb_client.h" 
 #include "xmltools.h"
 #include "../cfg_parse/custom_printf.h"//lnk20250225
-//int comtrade_remain_file_num = 2147483647;
+
 int comtrade_remain_file_num = 0;

-//extern rdb_t*			g_rdb  ;
 extern node_t*			g_node ;
 extern char 			g_my_conf_fname[256];
 extern apr_pool_t*		g_init_pool;
 extern apr_pool_t*		g_run_pool;
 extern pt61850app_t*	g_pt61850app;
-//extern apr_time_t		g_file_valid_time;
-//extern byte_t			g_file_name_len;
-//extern byte_t			g_file_time_from;
- 
 
 apr_status_t app_get_private_config(const char *myfilename)
 {
-	//apr_status_t	 rv = APR_SUCCESS;
+
 	char			*v = NULL;
 	char			*str = NULL;

@@ -98,28 +93,6 @@ apr_status_t app_get_private_config(const char *myfilename)
 <ReportControlCount>104,1,2</ReportControlCount>
 */
 //lnk20250122start
-#if 0
-int init_rptctrl_by_count(LD_info_t* LD_info,int rptcount) 
-{ 
-	int		j,i;   
-	LD_info->rptcount = rptcount;
-	LD_info->rptinfo = apr_pcalloc( g_init_pool,rptcount*sizeof(rptinfo_t*) ); 
-	for(j=0; j<rptcount; j++)	{
-		LD_info->rptinfo[j] = apr_pcalloc( g_init_pool,sizeof(rptinfo_t) );
-		LD_info->rptinfo[j]->LD_info = LD_info;
-		LD_info->rptinfo[j]->m_LastRegisterFailedTime = sGetMsTime() -10*60*1000;
-		LD_info->rptinfo[j]->m_LastUnRegisterFailedTime = sGetMsTime() -10*60*1000;
-		LD_info->rptinfo[j]->IntgPd = 60;
-		LD_info->rptinfo[j]->m_rcb_info = NULL;
-		LD_info->rptinfo[j]->rpt_registered = FALSE;
-		LD_info->rptinfo[j]->m_curRptSuffix = -1;
-		for(i=0; i<8; i++)
-			LD_info->rptinfo[j]->m_EntryID[i] = 0xff;
-	}
-
-	return 0;
-} 
-#endif

 #define MAX_RPT_COUNT 20

@@ -252,24 +225,6 @@ int fill_rptctrl_by_cfg(LD_info_t* LD_info,int rptno,char *buf)
 <LogControlCount>104,1,2</LogControlCount>
 */

-//lnk20250122start
-#if 0
-int init_logctrl_by_count(LD_info_t* LD_info,int logcount) 
-{ 
-	int j;
-	LD_info->logcount = logcount;
-	LD_info->loginfo = apr_pcalloc(g_init_pool, logcount * sizeof(loginfo_t*)); //new loginfo_t*[logcount];
-	for(j=0; j<logcount; j++)	{
-		LD_info->loginfo[j] = apr_pcalloc(g_init_pool, sizeof(loginfo_t));//new loginfo_t[1];
-		LD_info->loginfo[j]->LD_info = LD_info;
-
-		LD_info->loginfo[j]->IntgPd = 600;
-		//LD_info->loginfo[j]->m_lcb_info = NULL;
-	}
-
-	return 0;
-}
-#endif

 #define MAX_LOG_COUNT 20

@@ -319,7 +274,6 @@ int fill_logctrl_by_cfg(LD_info_t* LD_info,int logno,char *buf,char* devtype)

 	if(!(str = strtok(NULL,","))) 
 		return 1; 		
-	//tmp_str = apr_pstrdup(g_init_pool,str);
 	apr_snprintf(loginfo->logName,sizeof(loginfo->logName), devtype,LD_info->cpuno);//<2F><><EFBFBD><EFBFBD>PQM1

 	if((str = strtok(NULL,","))) loginfo->reasonCode = atoi(str);  else return 1;
@@ -340,11 +294,9 @@ int fill_logctrl_by_cfg(LD_info_t* LD_info,int logno,char *buf,char* devtype)

 	loginfo->start_time = apr_time_now();// - apr_time_from_sec(600);//
 	loginfo->end_time   = apr_time_now();
-	//loginfo->last_checktime = 0.0f;//-160*1000;//0.0f;
 	loginfo->need_steady = 0;
 	loginfo->need_voltage = 0;

-	//printf(" loginfo->logName=%s \n", loginfo->logName);
 	return 0;
 }
 
--- a/mms/rdb_client.c
+++ b/mms/rdb_client.c
@@ -63,7 +63,6 @@ extern int		three_secs_enabled;

 //WW 2023-08-22 start
 int server_socket = -1;
-extern int g_iOTLFlag;
 //WW 2023-08-22 end
 ///////////////////////////////////////////////////////////////////////////////

--- a/mms/rdb_client.h
+++ b/mms/rdb_client.h
@@ -490,7 +490,6 @@ int get_real_report_count(LD_info_t	*LD_info);
 int delete_recall_xml(char* id);
 int parse_recall_xml(recall_xml_t* recall_xml,char *id);
 void process_recall_config(recall_xml_t* recall_xml);
-int remove_recall_xml(); 

 int init_rptctrl_by_count(LD_info_t* LD_info,int rptcount);
 int fill_rptctrl_by_cfg(LD_info_t* LD_info,int rptno,char *buf);
@@ -509,8 +508,6 @@ void processRDRE_end(LD_info_t* LD_info);

 int extract_timestamp_from_cfg_file(char *comtrade_fn,long long *start_tm,long long *trig_tm);

-int parse_file_names(char *file_match_str,char **filenames,int filenum,int *cfg_idx,int *dat_idx,char *file_base_name,char *file_yyyymm);
-
 int parse_file_names_by_fltnum(int fltnum, char* domname, char** filenames, int filenum, int* cfg_idx, int* dat_idx, char* file_base_name, char* file_yyyymm);
 QVVR_t*  find_qvvr_by_trig_tm(LD_info_t* LD_info,long long trig_tm);