Merge branch 'master' of http://jiecheng2024.tpddns.cn:3000/liyuezong/SmartPDCode

pro/src/app.c

@@ -1065,8 +1065,8 @@ void AlarmCtrlChn(int nChID, int nCtrl)
                                                 nCtrl, false);
             }
 
-            sprintf(buff, "$开启$|$通道$|%d", _globalPowerMangerTemp->product_ch_id);
-            dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, 2, buff);
+            sprintf(buff, "Over limit protection $关闭$|$通道$|%d", _globalPowerMangerTemp->product_ch_id);
+            dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, ALARM_TYPE_SENSOR, buff);
             break;
         }
     }
@@ -1088,8 +1088,8 @@ void AlarmCtrlAll(int nCtrl)
             int rec=g_switch_set_all_ctrl(&__globalDeviceManage._globalRelaySampManger,_globalPowerMangerTemp->product_ch_type,_globalPowerMangerTemp->product_saddr,nCtrl);
             if(rec<0)log_i("Close All address:%d rec:%d:%s",nSendAddr,rec,modbus_strerror(errno));
         }      
-        sprintf(buff,"$关闭$|$所有$|$通道$");
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,2,buff);
+        sprintf(buff,"Over limit protection $关闭$|$所有$|$通道$");
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,ALARM_TYPE_SENSOR,buff);
 }
 /**
  * @brief 传感器报警函数
@@ -1176,7 +1176,7 @@ void sensor_alarm(GlobalSensorManger *_globalSensorMangerTemp, int nAlarmType)
                         pCHlist = strtok_r(NULL, ",", &pCHListSave);
                     }                    
                 }
-                else if (*nCtrlType == ALARM_CTRL_CLOSE_CH)
+                else if (*nCtrlType == ALARM_CTRL_CLOSE_ALLCH)
                 {
                     AlarmCtrlAll(0);
                 }
@@ -1207,7 +1207,7 @@ void sensor_alarm(GlobalSensorManger *_globalSensorMangerTemp, int nAlarmType)
                         AlarmCtrlChn(atoi(pCHlist), 0);
                         pCHlist = strtok_r(NULL, ",", &pCHListSave);
                     }
-                }else if (*nCtrlType == ALARM_CTRL_CLOSE_CH)
+                }else if (*nCtrlType == ALARM_CTRL_CLOSE_ALLCH)
                 {
                     AlarmCtrlAll(0);
                 }

pro/src/appweb_handle.c

@@ -560,7 +560,7 @@ static void overallStatusMonitoring(void* conn)
             
         }
         sprintf(buff,"$开启$|$所有$|$通道$");
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,3,buff);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,ALARM_TYPE_OPRATION,buff);
         ack_str = ctrl_sts_ack_to_json();
     }   
     //关闭所有开关
@@ -593,7 +593,7 @@ static void overallStatusMonitoring(void* conn)
             if(rec<0)log_i("Close All address:%d rec:%d:%s",nSendAddr,rec,modbus_strerror(errno));
         }      
         sprintf(buff,"$关闭$|$所有$|$通道$");
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,3,buff);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,ALARM_TYPE_OPRATION,buff);
         ack_str = ctrl_sts_ack_to_json();
     }
     //查询历史记录   
@@ -1085,7 +1085,7 @@ static void channelStatusMonitoring(void* conn)
                                                     1);
                     }
                     sprintf(buff, "$开启$|$通道$|%d Naught wire!", _globalPowerMangerTemp->product_ch_id);
-                    dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, 3, buff);
+                    dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, ALARM_TYPE_OPRATION, buff);
                     break;
                 }
             }
@@ -1130,7 +1130,7 @@ static void channelStatusMonitoring(void* conn)
                                                     0);
                     }
                     sprintf(buff, "$关闭$|$通道$|%d Naught wire!", _globalPowerMangerTemp->product_ch_id);
-                    dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, 3, buff);
+                    dev_insert_alarm_ctrl(__globalDeviceManage.db, _globalPowerMangerTemp->product_id, ALARM_TYPE_OPRATION, buff);
                     break;
                 }
             }
@@ -1288,7 +1288,7 @@ static void channelStatusMonitoring(void* conn)
                 }
                 char buff[256];
                 sprintf(buff,"$开启$|$通道$|%d",_globalPowerMangerTemp->product_ch_id);
-                dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,3,buff);
+                dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,ALARM_TYPE_OPRATION,buff);
                 break;
             }
         }
@@ -1339,7 +1339,7 @@ static void channelStatusMonitoring(void* conn)
                 }
 
                 sprintf(buff,"$关闭$|$通道$|%d",_globalPowerMangerTemp->product_ch_id);
-                dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,3,buff);
+                dev_insert_alarm_ctrl(__globalDeviceManage.db,_globalPowerMangerTemp->product_id,ALARM_TYPE_OPRATION,buff);
                 break;
             }
         }
@@ -1781,7 +1781,6 @@ static void channelStatusMonitoring(void* conn)
         // 其他版本功能
         while (pCHlist != NULL)
         {
-            
             int g_pwr_ch_id = atoi(pCHlist);
             _globalPowerMangerTemp=NULL;
             list_for_each_entry(_globalPowerMangerTemp, &__globalDeviceManage._globalPowerManger.list, list)
@@ -1799,7 +1798,6 @@ static void channelStatusMonitoring(void* conn)
                     GlobalTreeACManager *_globalTACManager = NULL;
                     list_for_each_entry(_globalTACManager, &_globalPowerMangerTemp->list_Tree_AC, list_Tree_AC)
                     {
-
                         if (g_switch_set_t_ac_phchn_reset(&__globalDeviceManage._globalRelaySampManger, _globalTACManager->product_saddr, _globalTACManager->product_ch_addr) < 0)
                         {
                             log_e("Error: phchn_reset");
@@ -1808,6 +1806,7 @@ static void channelStatusMonitoring(void* conn)
                  }
             }
             pCHlist = strtok_r(NULL, ",", &pCHListSave);
+            usleep(30000);//延时50ms，等待控制板串口写完
         }
     }
 quit:
@@ -1967,7 +1966,7 @@ static void sensorStatusMonitoring(void* conn)
         char temp[100];
         //sprintf(temp,"$删除$|$传感器$|%d",sensor_id_temp);
         sprintf(temp,"Delete sensor %d",sensor_id_temp);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         ack_str = ctrl_sts_ack_to_json();
     }
@@ -2092,7 +2091,7 @@ static void sensorStatusMonitoring(void* conn)
         char temp[100];
        // sprintf(temp,"$修改$|$传感器$|%d",sensor_id_temp);
         sprintf(temp,"Update sensor %d",sensor_id_temp);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         ack_str = ctrl_sts_ack_to_json();
     }
@@ -2205,7 +2204,7 @@ static void sensorStatusMonitoring(void* conn)
         char temp[100];
        // sprintf(temp,"$新增$|$传感器$|%d",_over_all_sensor_request.sensorId);
         sprintf(temp,"Add sensor %d",_over_all_sensor_request.sensorId);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         ack_str = ctrl_sts_ack_to_json();
     }
@@ -2464,72 +2463,76 @@ char* setThresholdToCh(_AlarmRequestInfo* _alarm_request_info,int nChID)
         }
     }
 
-    // 更新参数
+    // 更新参数，使能全部放在控制板上判断，表头不做判断，统一发1
     if (_alarm_request_info->_pwr_info.voltageUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_threshold = atof(_alarm_request_info->_pwr_info.voltageUpperValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_threshold != 0)
+     _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_upper_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.voltageDownValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_threshold = atof(_alarm_request_info->_pwr_info.voltageDownValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_vol_lower_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.currentUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_threshold = atof(_alarm_request_info->_pwr_info.currentUpperValue);
     }
-
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_cur_upper_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.powerUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_threshold = atof(_alarm_request_info->_pwr_info.powerUpperValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_enable = 1;
+    /*if (_globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwr_upper_enable = 0;
-    }
+    }*/
 
     if (_alarm_request_info->_pwr_info.alarmContentUpperValue)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_threshold = atof(_alarm_request_info->_pwr_info.alarmContentUpperValue);
     }
-    if (_globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_threshold != 0)
+    _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 1;
+   /* if (_globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_threshold != 0)
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 1;
     }
     else
     {
         _globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 0;
-    }
+    }*/
     //_globalPowerMangerSaveTemp->global_over_manager->product_pwrcon_upper_enable = 1 ;
 
     char Alarm_Ctrl_type[16];
@@ -2938,6 +2941,7 @@ static void alarmProtect(void *conn)
             int g_pwr_ch_id = atoi(pCHlist);
             ack_str = setThresholdToCh(&_alarm_request_info, g_pwr_ch_id);
             pCHlist = strtok_r(NULL, ",", &pCHListSave);
+            usleep(30000);//延时30ms，等待控制板串口写完
         }
     }
     else if(strcmp(_alarm_request_info.type,"sensorThresholdList")==0)//传感器阈值查询
@@ -3354,7 +3358,7 @@ static void communicationManagement(void *conn)
         {
             sprintf(buff, "$%s$|$%s$|addr:%d BD:%d",language_RS485_install[0],language_alarm_RS485_slave[0],info->product_modbus_addr,info->product_modbus_baud);
         }
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalPowerManger.product_id,3,buff);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalPowerManger.product_id,ALARM_TYPE_OPRATION,buff);
 
         ack_str = ctrl_sts_ack_to_json();
     }
@@ -3674,7 +3678,7 @@ static void serviceManagement(void *conn)
            // sprintf(temp,"$设置$|$时间$|NTP %s",  _globalNTPManager.ntpaddress);
             sprintf(temp,"Set Date & Time sync from NTP %s", _globalNTPManager.ntpaddress);
         }
-        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db,__globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
 
         ack_str = ctrl_sts_ack_to_json();
@@ -3766,7 +3770,7 @@ static void serviceManagement(void *conn)
         char temp[100];
         //sprintf(temp, "$设置$|定时$");
         sprintf(temp, "Add scheduled tasks");
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         ack_str = ctrl_sts_ack_to_json();
     }
@@ -3812,7 +3816,7 @@ static void serviceManagement(void *conn)
         char temp[100];
        // sprintf(temp, "$删除$|定时$");
         sprintf(temp, "Delete scheduled tasks");
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
         ack_str = ctrl_sts_ack_to_json();
     }
     // 时序设置
@@ -4104,7 +4108,7 @@ static void serviceManagement(void *conn)
         char temp[100];
         //sprintf(temp, "$打开$|$分组$|%d", ngroup);
         sprintf(temp, "Open group %d", ngroup);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         ack_str = ctrl_sts_ack_to_json();
     }
@@ -4207,7 +4211,7 @@ static void serviceManagement(void *conn)
         char temp[100];
        // sprintf(temp, "$关闭$|$分组$|%d", ngroup);
         sprintf(temp, "Close group %d", ngroup);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
         ack_str = ctrl_sts_ack_to_json();
     }
     
@@ -4320,7 +4324,7 @@ static void systemManagent(void *conn)
             char temp[100];
             // sprintf(temp, "$删除$|$用户$|%d", _UserRoleManageRequestInfo.userIds);
             sprintf(temp, "Delete user %d", _UserRoleManageRequestInfo.userIds);
-            dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+            dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
             ack_str = ctrl_sts_ack_to_json();
         }
         else
@@ -4382,7 +4386,7 @@ static void systemManagent(void *conn)
         char temp[100];
         //sprintf(temp, "$添加$|$用户$|%s", _UserRoleManageRequestInfo.userName);
         sprintf(temp, "Add user %s", _UserRoleManageRequestInfo.userName);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         ack_str=ctrl_sts_ack_to_json();
     }   
@@ -4410,7 +4414,7 @@ static void systemManagent(void *conn)
         char temp[100];
         //sprintf(temp, "$修改$|$用户$|%s", _UserRoleManageRequestInfo.userName);
          sprintf(temp, "Update user %s", _UserRoleManageRequestInfo.userName);
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         ack_str=ctrl_sts_ack_to_json();
     }    
@@ -4507,7 +4511,7 @@ static void equipmentMintenance(void *conn)
         char temp[100];
         //sprintf(temp, "$系统$|$重启$");
         sprintf(temp, "System Reboot!");
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         sys_reboot();
     }else if(strcmp(_Over_equipment_mintenance.type,"listKgSbQuery")==0)    // part of device infomation 
@@ -4865,7 +4869,7 @@ static void equipmentMintenance(void *conn)
         char temp[100];
         //sprintf(temp, "$系统$|$恢复出厂设置$");
         sprintf(temp, "System Reset!");
-        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, 3, temp);
+        dev_insert_alarm_ctrl(__globalDeviceManage.db, __globalDeviceManage._globalDevInfo.product_id, ALARM_TYPE_OPRATION, temp);
 
         for (size_t i = 0; i < MAX_CHN_COUNT; i++)
         {

pro/src/cascade.c

@@ -1657,7 +1657,7 @@ static void* cmd_thread(void *arg)
     else {
         sprintf(temp,"$关闭$|$所有$|$通道$");
     }
-    dev_insert_alarm_ctrl(dm->db, dm->_globalDevInfo.product_id,3,temp);
+    dev_insert_alarm_ctrl(dm->db, dm->_globalDevInfo.product_id,ALARM_TYPE_OPRATION,temp);
     free(pcmd);
 
     pthread_exit(NULL);
@@ -1698,7 +1698,7 @@ static void* cmd_NF_thread(void *arg)
     else {
         sprintf(temp, "$关闭$|$通道$|%d Naught wire!", pcmd->chId);
     }
-    dev_insert_alarm_ctrl(dm->db, dm->_globalDevInfo.product_id,3,temp);
+    dev_insert_alarm_ctrl(dm->db, dm->_globalDevInfo.product_id,ALARM_TYPE_OPRATION,temp);
     free(pcmd);
 
     pthread_exit(NULL);