[ref]同步711
This commit is contained in:
parent
60b7dc10c6
commit
9f42cbaa12
BIN
platform/common/database/initdata/en/basedata/p_dict.xlsx
Normal file
BIN
platform/common/database/initdata/en/basedata/p_dict.xlsx
Normal file
Binary file not shown.
BIN
platform/common/database/initdata/en/basedata/p_dict_sort.xlsx
Normal file
BIN
platform/common/database/initdata/en/basedata/p_dict_sort.xlsx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
platform/common/database/initdata/fr/basedata/web_page.xlsx
Normal file
BIN
platform/common/database/initdata/fr/basedata/web_page.xlsx
Normal file
Binary file not shown.
BIN
platform/common/database/initdata/fr/basedata/web_primitive.xlsx
Normal file
BIN
platform/common/database/initdata/fr/basedata/web_primitive.xlsx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1063,13 +1063,13 @@ BEGIN
|
||||
END;
|
||||
END IF;
|
||||
|
||||
IF NEW.RTU_NO <> OLD.RTU_NO THEN
|
||||
SELECT TAG_NAME INTO rtuTag FROM fes_rtu_para WHERE fes_rtu_para.RTU_NO = NEW.RTU_NO;
|
||||
UPDATE accuml SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND accuml.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE analog SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND analog.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE digital SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND digital.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE mix SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND mix.DEVICE = dev_info.TAG_NAME;
|
||||
END IF;
|
||||
-- IF NEW.RTU_NO <> OLD.RTU_NO THEN
|
||||
-- SELECT TAG_NAME INTO rtuTag FROM fes_rtu_para WHERE fes_rtu_para.RTU_NO = NEW.RTU_NO;
|
||||
-- UPDATE accuml SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND accuml.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE analog SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND analog.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE digital SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND digital.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE mix SET RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND mix.DEVICE = dev_info.TAG_NAME;
|
||||
-- END IF;
|
||||
|
||||
|
||||
IF getTriggerFlag() = TRUE THEN
|
||||
@ -5216,6 +5216,17 @@ BEGIN
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_ana
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
FES_TEMP_OUT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_ana.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_ana.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA_CTRL')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
--digital,只关联第一个分量
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
@ -5227,7 +5238,18 @@ BEGIN
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
FES_TEMP_OUT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_dig.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_dig.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG_CTRL')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
FES_TEMP_POINT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME
|
||||
@ -5239,6 +5261,16 @@ BEGIN
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
FES_TEMP_OUT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_mix.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_mix.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX_CTRL')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
END;
|
||||
$$LANGUAGE PLPGSQL;
|
||||
|
||||
@ -5305,6 +5337,18 @@ BEGIN
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_ana
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
FES_TEMP_OUT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_ana.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_ana.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA_CTRL')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
--digital,只关联第一个分量
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
@ -5317,6 +5361,18 @@ BEGIN
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
FES_TEMP_OUT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_dig.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_dig.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG_CTRL')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
@ -5330,6 +5386,17 @@ BEGIN
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
FES_TEMP_OUT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_mix.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_mix.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX_CTRL')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
END;
|
||||
$$LANGUAGE PLPGSQL;
|
||||
|
||||
@ -6427,7 +6494,6 @@ BEGIN
|
||||
END IF;
|
||||
--预处理阶段
|
||||
--首先把background_x_fes表中提到的后台点与前置的映射关系取消掉,这里会触发触发器,会比较耗时,去优化触发器
|
||||
--CALL kbdDebugInfo('begin 消除后台点的映射关系','');
|
||||
update accuml
|
||||
SET RTU_TAG = ''
|
||||
from background_x_fes_accuml
|
||||
@ -6452,9 +6518,7 @@ BEGIN
|
||||
WHERE concat('mix','.',mix.TAG_NAME) = background_x_fes_mix.BG_POINT_TAG;
|
||||
|
||||
|
||||
--update完毕,会驱动触发器,更新对应map_to_fes和Control表中的RTU
|
||||
--CALL kbdDebugInfo('end 消除后台点的映射关系','');
|
||||
|
||||
--update完毕,会驱动触发器,更新对应map_to_fes和Control表中的RTU
|
||||
|
||||
--预处理, acc,ana,dig,mix 中后台与前置的关联有两种方法确定前置点,分别是1:RTU_TAG和RTU_DOT_NO可以确定一个点
|
||||
--2:通过RTU_DEV_TAG去前置模板和后台模板寻找实例的对应点,再写入对应的RTU_tag和RTU_DOT_NO
|
||||
@ -6462,7 +6526,6 @@ BEGIN
|
||||
--不符合以上两点的记录删除
|
||||
--ana_ctrl,dig_ctrl,mix_ctrl只能用一种方法确定,即rtu_tag, RTU_DOT_NO,RTU_DEV_TAG都需要填写, rtu_tag, RTU_DOT_NO,RTU_DEV_TAG都对得上的使用实例的设备,否则使用默认设备
|
||||
--首先,对于acc,ana,dig,mix,把RTU_TAG或者RTU_DOT_NO为空, RTU_DEV_TAG不为空的记录,去模板找对应关系,填入RTU_TAG和RTU_DOT_NO信息
|
||||
--CALL kbdDebugInfo('begin update RTU_TAG or dot_no NULL','');
|
||||
|
||||
--acc
|
||||
UPDATE background_x_fes_accuml
|
||||
@ -6560,11 +6623,8 @@ BEGIN
|
||||
AND mix_map_to_fes.POINT_TP_NAME = mix_temp_define.TAG_NAME
|
||||
AND fes_mix.DEV_TAG = background_x_fes_mix.RTU_DEV_TAG
|
||||
AND fes_mix.SEQ_NO = mix_temp_define.SEC_SEQ_NO;
|
||||
|
||||
--CALL kbdDebugInfo('end update RTU_TAG or dot_no NULL','');
|
||||
|
||||
|
||||
--删除RTU_TAG和DOT_NO仍为空的
|
||||
--CALL kbdDebugInfo('begin delete RTU_TAG or dot_no NULL','');
|
||||
DELETE FROM background_x_fes_accuml WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_analog WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_digtal WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
@ -6573,10 +6633,7 @@ BEGIN
|
||||
DELETE FROM background_x_fes_ana_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_dig_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_mix_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
|
||||
--CALL kbdDebugInfo('end delete RTU_TAG or dot_no NULL','');
|
||||
|
||||
--CALL kbdDebugInfo('begin reUpdate RTU_DEV_TAG','');
|
||||
|
||||
--再次更新,对于RTU_TAG,DOT_NO和RTU_DEV_TAG对不上的点归类到默认设备
|
||||
UPDATE background_x_fes_accuml
|
||||
SET RTU_DEV_TAG = concat(background_x_fes_accuml.RTU_TAG, '.', 'defaultDev')
|
||||
@ -6633,13 +6690,11 @@ BEGIN
|
||||
WHERE fes_mix_ctrl.TAG_NAME =concat(background_x_fes_mix_ctrl.RTU_TAG,'.',background_x_fes_mix_ctrl.RTU_DOT_NO)
|
||||
AND fes_mix_ctrl.DEV_TAG = background_x_fes_mix_ctrl.RTU_DEV_TAG
|
||||
);
|
||||
--CALL kbdDebugInfo('end reUpdate RTU_DEV_TAG','');
|
||||
--预处理完毕,此时background_x_fes表中的字段情况有以下几种情况.
|
||||
--1:RTU_TAG,DOT_NO,RTU_DEV_TAG都对得上的(即对应表上有的),这些事前置实例设备中的点
|
||||
--2:RTU_TAG,DOT_NO与RTU_DEV_TAG可能对不上,这类点归类到默认设备中
|
||||
|
||||
--先删除默认设备点
|
||||
--CALL kbdDebugInfo('begin 删除默认设备点','');
|
||||
DELETE FROM fes_accuml
|
||||
USING fes_dev_info,background_x_fes_accuml
|
||||
WHERE fes_accuml.DEV_TAG = fes_dev_info.TAG_NAME
|
||||
@ -6681,11 +6736,8 @@ BEGIN
|
||||
WHERE fes_mix_ctrl.DEV_TAG = fes_dev_info.TAG_NAME
|
||||
AND fes_dev_info.TAG_NAME = concat(fes_mix_ctrl.RTU_TAG,'.', 'defaultDev')
|
||||
AND fes_mix_ctrl.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
|
||||
--CALL kbdDebugInfo('end 删除默认设备点','');
|
||||
|
||||
|
||||
--对于非默认设备将所有FES与后台的联系清除
|
||||
--CALL kbdDebugInfo('begin 对于非默认设备将所有FES与后台的联系清除','');
|
||||
update fes_accuml
|
||||
SET APP_TABLE_NAME='',APP_TAG_NAME='',APP_COLUMN_NAME='', RES_PARA_INT1=RTU_RES_PARA_INT1,RES_PARA_INT2=RTU_RES_PARA_INT2,RES_PARA_INT3=RTU_RES_PARA_INT3,RES_PARA_INT4=RTU_RES_PARA_INT4
|
||||
from background_x_fes_accuml
|
||||
@ -6727,11 +6779,9 @@ BEGIN
|
||||
from background_x_fes_mix_ctrl
|
||||
where fes_mix_ctrl.TAG_NAME = concat(background_x_fes_mix_ctrl.RTU_TAG,'.',background_x_fes_mix_ctrl.RTU_DOT_NO);
|
||||
|
||||
--CALL kbdDebugInfo('end 对于非默认设备将所有FES与后台的联系清除','');
|
||||
--ana_ctrl,dig_ctrl,mix_ctrl不用清除
|
||||
|
||||
--重新生成默认设备
|
||||
--CALL kbdDebugInfo('begin 重新生成默认设备','');
|
||||
INSERT INTO fes_accuml (
|
||||
TAG_NAME, LOCATION_ID, SUB_SYSTEM, DOT_NO, RTU_TAG, DEV_TAG, SEQ_NO, APP_TABLE_NAME, APP_TAG_NAME, APP_COLUMN_NAME, BASE, COEFF, RTU_NO, RES_PARA_INT1, RES_PARA_INT2, RES_PARA_INT3, RES_PARA_INT4, DESCRIPTION, FES_POINT_TP_NAME) SELECT
|
||||
concat(background_x_fes_accuml.RTU_TAG,'.',background_x_fes_accuml.RTU_DOT_NO), fes_dev_info.LOCATION_ID, fes_dev_info.SUB_SYSTEM, background_x_fes_accuml.RTU_DOT_NO, background_x_fes_accuml.RTU_TAG, fes_dev_info.TAG_NAME,background_x_fes_accuml.RTU_DOT_NO, '', '', '', '0', '1', fes_rtu_para.RTU_NO, background_x_fes_accuml.RTU_RES_PARA_INT1, background_x_fes_accuml.RTU_RES_PARA_INT2, background_x_fes_accuml.RTU_RES_PARA_INT3, background_x_fes_accuml.RTU_RES_PARA_INT4, background_x_fes_accuml.RTU_DOT_DESC, ''
|
||||
@ -6794,12 +6844,10 @@ BEGIN
|
||||
AND fes_rtu_para.TAG_NAME=background_x_fes_mix_ctrl.RTU_TAG
|
||||
AND fes_dev_info.TAG_NAME = background_x_fes_mix_ctrl.RTU_DEV_TAG
|
||||
AND fes_dev_info.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
--CALL kbdDebugInfo('end 重新生成默认设备','');
|
||||
--NOTE:默认设备处理完毕
|
||||
|
||||
--重新写入FES与后台的关系 直接写入基础属性表和map_to_fes表,通过该表的触发器写入联系
|
||||
--重新写入,先写acc,ana,dig,再写map_to_fes,ctrl表
|
||||
--CALL kbdDebugInfo('begin 重新写入 set RTU','');
|
||||
update accuml
|
||||
SET RTU_TAG = background_x_fes_accuml.RTU_TAG
|
||||
from background_x_fes_accuml
|
||||
@ -6871,11 +6919,7 @@ BEGIN
|
||||
from background_x_fes_mix
|
||||
WHERE mix_map_to_fes.KEY_ID_TAG = background_x_fes_mix.BG_POINT_TAG AND mix_map_to_fes.RTU_TAG = background_x_fes_mix.RTU_TAG;
|
||||
|
||||
|
||||
--CALL kbdDebugInfo('end 重新写入 set RTU, DOT','');
|
||||
|
||||
--写入ctrl表,注意此时background_x_fes__ctrl中的RTU必须和analog_control中的RTU保持一致,确保该点是同一个RTU
|
||||
--CALL kbdDebugInfo('begin 写入ctrl表','');
|
||||
update analog_control
|
||||
SET OFFSET_NO = background_x_fes_ana_ctrl.RTU_DOT_NO
|
||||
from background_x_fes_ana_ctrl
|
||||
@ -6917,7 +6961,6 @@ BEGIN
|
||||
from background_x_fes_mix_ctrl
|
||||
WHERE mix_control.TAG_NAME = background_x_fes_mix_ctrl.BG_POINT_TAG AND mix_control.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
|
||||
--CALL kbdDebugInfo('end 写入ctrl表','');
|
||||
--写入完毕,下面为描述的处理
|
||||
|
||||
--可选,保持实例前置设备(非默认设备)和excel文件中的一致
|
||||
@ -7014,7 +7057,6 @@ BEGIN
|
||||
UPDATE sys_trigger_flag SET FLAG_ID = 1;
|
||||
END IF;
|
||||
|
||||
--CALL kbdDebugInfo('end all','');
|
||||
END;
|
||||
$$LANGUAGE PLPGSQL;
|
||||
|
||||
@ -7597,6 +7639,12 @@ BEGIN
|
||||
fes_analog_ctrl.TAG_NAME LIKE concat(rtuTag,'.','%') AND
|
||||
fes_analog_ctrl.DEV_TAG = fesDevTag AND
|
||||
fes_analog_ctrl.POINT_TP_NAME = concat(FES_TEMP_NAME,'.',FES_TEMP_OUT_NAME);
|
||||
|
||||
--修改如果没有采集点，有遥控点也要新建测点
|
||||
update analog
|
||||
SET RTU_TAG = rtuTag
|
||||
from tmprelationbyplugintbl
|
||||
WHERE TAG_NAME = KEY_ID_TAG;
|
||||
|
||||
update analog_control
|
||||
SET OFFSET_NO = tmpRelationByPluginTbl.DOT_NO
|
||||
@ -7617,6 +7665,12 @@ BEGIN
|
||||
fes_mix_ctrl.TAG_NAME LIKE concat(rtuTag,'.','%') AND
|
||||
fes_mix_ctrl.DEV_TAG = fesDevTag AND
|
||||
fes_mix_ctrl.POINT_TP_NAME = concat(FES_TEMP_NAME,'.',FES_TEMP_OUT_NAME);
|
||||
|
||||
--修改如果没有采集点，有遥控点也要新建测点
|
||||
update mix
|
||||
SET RTU_TAG = rtuTag
|
||||
from tmprelationbyplugintbl
|
||||
WHERE TAG_NAME = KEY_ID_TAG;
|
||||
|
||||
update mix_control
|
||||
SET OFFSET_NO = tmpRelationByPluginTbl.DOT_NO
|
||||
@ -8166,7 +8220,7 @@ BEGIN
|
||||
INSERT INTO digital(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, VALUE_NUM, GRAY, CONTRAST, QCOLOR, VALUE, STATUS, LAST_UPDATE_TIME, VALUE1, STATUS1, LAST_CHANGE_TIME1, VALUE2, STATUS2, LAST_CHANGE_TIME2, VALUE3, STATUS3, LAST_CHANGE_TIME3, VALUE4, STATUS4, LAST_CHANGE_TIME4, VALUE5, STATUS5, LAST_CHANGE_TIME5, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, INPUT_DELAY_TIME, IS_WATER_ALM, IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, IS_ALARM_FREQ, ALARM_FREQ, ALARM_FREQ_DESC, IS_ALARM_TIME, ALARM_TIME, ALARM_TIME_DESC, ALARM_FREQ_RANGE, INFER_NAME, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID )
|
||||
SELECT
|
||||
tblPsc3000PointToAdd.TAG_NAME, tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, '', '0', 'PSCADA不告警', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '1', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '400', '', ''
|
||||
tblPsc3000PointToAdd.TAG_NAME, tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, '', '0', '', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '1', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '400', '', ''
|
||||
FROM tblPsc3000PointToAdd,dev_info
|
||||
WHERE tblPsc3000PointToAdd.DEV_TAG = dev_info.TAG_NAME ;
|
||||
|
||||
@ -8201,7 +8255,7 @@ BEGIN
|
||||
|
||||
INSERT INTO mix(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, GRAY, CONTRAST, QCOLOR, RAW_VALUE, VALUE, STATUS, LAST_UPDATE_TIME, LAST_CHANGE_TIME, METHOD, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, IS_WATER_ALM,IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID) SELECT
|
||||
tblPsc3000PointToAdd.TAG_NAME,tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'mix')+1,locationId, subsystemId, '', '0', 'PSCADA中断/正常', GRAY, CONTRAST, QCOLOR, '0', VALUE, STATUS, '0', '0', '', '3', '', '', '', '', 0, 1, 0, 0, 0, regionId, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, '', 0, 0, 5, 2, 0, 0, 701, '', ''
|
||||
tblPsc3000PointToAdd.TAG_NAME,tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'mix')+1,locationId, subsystemId, '', '0', '', GRAY, CONTRAST, QCOLOR, '0', VALUE, STATUS, '0', '0', '', '3', '', '', '', '', 0, 1, 0, 0, 0, regionId, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, '', 0, 0, 5, 2, 0, 0, 701, '', ''
|
||||
FROM tblPsc3000PointToAdd,dev_info
|
||||
WHERE tblPsc3000PointToAdd.DEV_TAG = dev_info.TAG_NAME ;
|
||||
|
||||
@ -8562,7 +8616,7 @@ BEGIN
|
||||
INSERT INTO digital(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, VALUE_NUM, GRAY, CONTRAST, QCOLOR, VALUE, STATUS, LAST_UPDATE_TIME, VALUE1, STATUS1, LAST_CHANGE_TIME1, VALUE2, STATUS2, LAST_CHANGE_TIME2, VALUE3, STATUS3, LAST_CHANGE_TIME3, VALUE4, STATUS4, LAST_CHANGE_TIME4, VALUE5, STATUS5, LAST_CHANGE_TIME5, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, INPUT_DELAY_TIME, IS_WATER_ALM, IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, IS_ALARM_FREQ, ALARM_FREQ, ALARM_FREQ_DESC, IS_ALARM_TIME, ALARM_TIME, ALARM_TIME_DESC, ALARM_FREQ_RANGE, INFER_NAME, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID )
|
||||
SELECT
|
||||
tmpRelationControlTbl.TAG_NAME, tmpRelationControlTbl.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, rtuTag, '1', 'PSCADA中断/正常', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '0', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '300', '', ''
|
||||
tmpRelationControlTbl.TAG_NAME, tmpRelationControlTbl.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, rtuTag, '1', '', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '0', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '300', '', ''
|
||||
FROM tmpRelationControlTbl,dev_info
|
||||
WHERE tmpRelationControlTbl.DEVICE = dev_info.TAG_NAME ;
|
||||
--关联digital_control
|
||||
|
||||
@ -814,16 +814,16 @@ BEGIN
|
||||
END;
|
||||
END IF;
|
||||
|
||||
IF NEW.RTU_NO <> COALESCE(OLD.RTU_NO,-1) THEN
|
||||
BEGIN
|
||||
DECLARE rtuTag varchar(64) DEFAULT '';
|
||||
SELECT TAG_NAME INTO rtuTag FROM fes_rtu_para WHERE fes_rtu_para.RTU_NO = NEW.RTU_NO;
|
||||
UPDATE accuml,dev_info SET accuml.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND accuml.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE analog,dev_info SET analog.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND analog.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE digital,dev_info SET digital.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND digital.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE mix,dev_info SET mix.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND mix.DEVICE = dev_info.TAG_NAME;
|
||||
END;
|
||||
END IF;
|
||||
-- IF NEW.RTU_NO <> COALESCE(OLD.RTU_NO,-1) THEN
|
||||
-- BEGIN
|
||||
-- DECLARE rtuTag varchar(64) DEFAULT '';
|
||||
-- SELECT TAG_NAME INTO rtuTag FROM fes_rtu_para WHERE fes_rtu_para.RTU_NO = NEW.RTU_NO;
|
||||
-- UPDATE accuml,dev_info SET accuml.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND accuml.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE analog,dev_info SET analog.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND analog.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE digital,dev_info SET digital.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND digital.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE mix,dev_info SET mix.RTU_TAG = rtuTag WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND mix.DEVICE = dev_info.TAG_NAME;
|
||||
-- END;
|
||||
-- END IF;
|
||||
|
||||
|
||||
IF getTriggerFlag() = TRUE THEN
|
||||
@ -3846,35 +3846,22 @@ BEGIN
|
||||
* FES_ANA_CTRL:4
|
||||
* FES_DIG_CTRL:5
|
||||
* FES_MIX_CTRL:6
|
||||
* FES_CONST:7
|
||||
*/
|
||||
DECLARE tempVar decimal(10,0) DEFAULT 0;
|
||||
|
||||
IF flag='FES_ACC' THEN SET tempVar =0;
|
||||
END IF;
|
||||
|
||||
IF flag='FES_ANA' THEN SET tempVar =1;
|
||||
END IF;
|
||||
|
||||
IF flag='FES_DIG' THEN SET tempVar =2;
|
||||
END IF;
|
||||
|
||||
IF flag='FES_MIX' THEN SET tempVar =3;
|
||||
END IF;
|
||||
|
||||
IF flag='FES_ANA_CTRL' THEN SET tempVar =4;
|
||||
END IF;
|
||||
|
||||
IF flag='FES_DIG_CTRL' THEN SET tempVar =5;
|
||||
END IF;
|
||||
|
||||
IF flag='FES_MIX_CTRL' THEN SET tempVar =6;
|
||||
END IF;
|
||||
|
||||
IF flag='FES_CONST' THEN SET tempVar =7;
|
||||
END IF;
|
||||
|
||||
|
||||
RETURN tempVar;
|
||||
|
||||
RETURN
|
||||
CASE flag
|
||||
WHEN 'FES_ACC' THEN 0
|
||||
WHEN 'FES_ANA' THEN 1
|
||||
WHEN 'FES_DIG' THEN 2
|
||||
WHEN 'FES_MIX' THEN 3
|
||||
WHEN 'FES_ANA_CTRL' THEN 4
|
||||
WHEN 'FES_DIG_CTRL' THEN 5
|
||||
WHEN 'FES_MIX_CTRL' THEN 6
|
||||
WHEN 'FES_CONST' THEN 7
|
||||
ELSE 0
|
||||
END;
|
||||
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
||||
@ -4188,7 +4175,18 @@ body:BEGIN
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_ana.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_ana.FES_TEMP_POINT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME;
|
||||
|
||||
|
||||
#analog ctrl,只关联第一个分量
|
||||
UPDATE
|
||||
(temp_plugin_point_map_ana INNER JOIN temp_plugin_fes_dev_map
|
||||
ON temp_plugin_point_map_ana.PLUGIN_NAME = pluginName AND temp_plugin_point_map_ana.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
)INNER JOIN fes_dev_pt_temp_def
|
||||
ON DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME AND POINT_TYPE = getFesPointType('FES_ANA_CTRL')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_ana.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_ana.FES_TEMP_OUT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME;
|
||||
|
||||
#digital,只关联第一个分量
|
||||
UPDATE
|
||||
(temp_plugin_point_map_dig INNER JOIN temp_plugin_fes_dev_map
|
||||
@ -4199,7 +4197,18 @@ body:BEGIN
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_dig.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_dig.FES_TEMP_POINT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME;
|
||||
|
||||
|
||||
#digital ctrl,只关联第一个分量
|
||||
UPDATE
|
||||
(temp_plugin_point_map_dig INNER JOIN temp_plugin_fes_dev_map
|
||||
ON temp_plugin_point_map_dig.PLUGIN_NAME = pluginName AND temp_plugin_point_map_dig.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
)INNER JOIN fes_dev_pt_temp_def
|
||||
ON DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME AND POINT_TYPE = getFesPointType('FES_DIG_CTRL')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_dig.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_dig.FES_TEMP_OUT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME;
|
||||
|
||||
UPDATE
|
||||
(temp_plugin_point_map_mix INNER JOIN temp_plugin_fes_dev_map
|
||||
ON temp_plugin_point_map_mix.PLUGIN_NAME = pluginName AND temp_plugin_point_map_mix.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
@ -4209,7 +4218,17 @@ body:BEGIN
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_POINT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME;
|
||||
|
||||
|
||||
UPDATE
|
||||
(temp_plugin_point_map_mix INNER JOIN temp_plugin_fes_dev_map
|
||||
ON temp_plugin_point_map_mix.PLUGIN_NAME = pluginName AND temp_plugin_point_map_mix.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
)INNER JOIN fes_dev_pt_temp_def
|
||||
ON DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME AND POINT_TYPE = getFesPointType('FES_MIX_CTRL')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_OUT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME;
|
||||
|
||||
/*以下操作转到代码实现
|
||||
#经过以上操作后台和前置同名的测点已经关联,下面处理特殊的点 wz-->posOn,posOff
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS tmpAutoRelationPluginTbl(
|
||||
@ -4316,6 +4335,18 @@ body:BEGIN
|
||||
SET temp_plugin_point_map_ana.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_ana.FES_TEMP_POINT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME;
|
||||
|
||||
UPDATE
|
||||
(temp_plugin_point_map_ana INNER JOIN temp_plugin_fes_dev_map
|
||||
ON temp_plugin_point_map_ana.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_ana.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
)INNER JOIN fes_dev_pt_temp_def
|
||||
ON DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME AND POINT_TYPE = getFesPointType('FES_ANA_CTRL')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_ana.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_ana.FES_TEMP_OUT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME;
|
||||
|
||||
#digital,只关联第一个分量
|
||||
UPDATE
|
||||
(temp_plugin_point_map_dig INNER JOIN temp_plugin_fes_dev_map
|
||||
@ -4328,6 +4359,18 @@ body:BEGIN
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_dig.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_dig.FES_TEMP_POINT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME;
|
||||
|
||||
UPDATE
|
||||
(temp_plugin_point_map_dig INNER JOIN temp_plugin_fes_dev_map
|
||||
ON temp_plugin_point_map_dig.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_dig.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
)INNER JOIN fes_dev_pt_temp_def
|
||||
ON DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME AND POINT_TYPE = getFesPointType('FES_DIG_CTRL')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_dig.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_dig.FES_TEMP_OUT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME;
|
||||
|
||||
UPDATE
|
||||
(temp_plugin_point_map_mix INNER JOIN temp_plugin_fes_dev_map
|
||||
@ -4340,6 +4383,18 @@ body:BEGIN
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_POINT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME;
|
||||
|
||||
UPDATE
|
||||
(temp_plugin_point_map_mix INNER JOIN temp_plugin_fes_dev_map
|
||||
ON temp_plugin_point_map_mix.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_mix.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
)INNER JOIN fes_dev_pt_temp_def
|
||||
ON DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME AND POINT_TYPE = getFesPointType('FES_MIX_CTRL')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME)
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_OUT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME;
|
||||
|
||||
/*以下操作转代码实现
|
||||
#经过以上操作后台和前置同名的测点已经关联,下面处理特殊的点 wz-->posOn,posOff
|
||||
@ -5423,7 +5478,6 @@ BEGIN
|
||||
END IF;
|
||||
#预处理阶段
|
||||
#首先把background_x_fes表中提到的后台点与前置的映射关系取消掉,这里会触发触发器,会比较耗时,去优化触发器
|
||||
#CALL kbdDebugInfo('begin 消除后台点的映射关系','');
|
||||
UPDATE accuml INNER JOIN background_x_fes_accuml
|
||||
ON concat('accuml','.',accuml.TAG_NAME) = background_x_fes_accuml.BG_POINT_TAG
|
||||
SET accuml.RTU_TAG = '';
|
||||
@ -5440,9 +5494,7 @@ BEGIN
|
||||
ON concat('mix','.',mix.TAG_NAME) = background_x_fes_mix.BG_POINT_TAG
|
||||
SET mix.RTU_TAG = '';
|
||||
|
||||
#update完毕,会驱动触发器,更新对应map_to_fes和Control表中的RTU
|
||||
#CALL kbdDebugInfo('end 消除后台点的映射关系','');
|
||||
|
||||
#update完毕,会驱动触发器,更新对应map_to_fes和Control表中的RTU
|
||||
|
||||
#预处理, acc,ana,dig,mix 中后台与前置的关联有两种方法确定前置点,分别是1:RTU_TAG和RTU_DOT_NO可以确定一个点
|
||||
#2:通过RTU_DEV_TAG去前置模板和后台模板寻找实例的对应点,再写入对应的RTU_tag和RTU_DOT_NO
|
||||
@ -5450,7 +5502,6 @@ BEGIN
|
||||
#不符合以上两点的记录删除
|
||||
#ana_ctrl,dig_ctrl,mix_ctrl只能用一种方法确定,即rtu_tag, RTU_DOT_NO,RTU_DEV_TAG都需要填写, rtu_tag, RTU_DOT_NO,RTU_DEV_TAG都对得上的使用实例的设备,否则使用默认设备
|
||||
#首先,对于acc,ana,dig,mix,把RTU_TAG或者RTU_DOT_NO为空, RTU_DEV_TAG不为空的记录,去模板找对应关系,填入RTU_TAG和RTU_DOT_NO信息
|
||||
#CALL kbdDebugInfo('begin update RTU_TAG or dot_no NULL','');
|
||||
#acc
|
||||
UPDATE
|
||||
(
|
||||
@ -5539,11 +5590,8 @@ BEGIN
|
||||
SET
|
||||
background_x_fes_mix.RTU_TAG = fes_mix.RTU_TAG,
|
||||
background_x_fes_mix.RTU_DOT_NO = fes_mix.DOT_NO;
|
||||
|
||||
#CALL kbdDebugInfo('end update RTU_TAG or dot_no NULL','');
|
||||
|
||||
|
||||
#删除RTU_TAG和DOT_NO仍为空的
|
||||
#CALL kbdDebugInfo('begin delete RTU_TAG or dot_no NULL','');
|
||||
DELETE FROM background_x_fes_accuml WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_analog WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_digtal WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
@ -5552,10 +5600,7 @@ BEGIN
|
||||
DELETE FROM background_x_fes_ana_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_dig_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_mix_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
|
||||
#CALL kbdDebugInfo('end delete RTU_TAG or dot_no NULL','');
|
||||
|
||||
#CALL kbdDebugInfo('begin reUpdate RTU_DEV_TAG','');
|
||||
|
||||
#再次更新,对于RTU_TAG,DOT_NO和RTU_DEV_TAG对不上的点归类到默认设备
|
||||
UPDATE background_x_fes_accuml
|
||||
SET background_x_fes_accuml.RTU_DEV_TAG = concat(background_x_fes_accuml.RTU_TAG, '.', 'defaultDev')
|
||||
@ -5612,13 +5657,11 @@ BEGIN
|
||||
WHERE fes_mix_ctrl.TAG_NAME =concat(background_x_fes_mix_ctrl.RTU_TAG,'.',background_x_fes_mix_ctrl.RTU_DOT_NO)
|
||||
AND fes_mix_ctrl.DEV_TAG = background_x_fes_mix_ctrl.RTU_DEV_TAG
|
||||
);
|
||||
#CALL kbdDebugInfo('end reUpdate RTU_DEV_TAG','');
|
||||
#预处理完毕,此时background_x_fes表中的字段情况有以下几种情况.
|
||||
#1:RTU_TAG,DOT_NO,RTU_DEV_TAG都对得上的(即对应表上有的),这些事前置实例设备中的点
|
||||
#2:RTU_TAG,DOT_NO与RTU_DEV_TAG可能对不上,这类点归类到默认设备中
|
||||
|
||||
#先删除默认设备点
|
||||
#CALL kbdDebugInfo('begin 删除默认设备点','');
|
||||
DELETE fes_accuml
|
||||
FROM (
|
||||
fes_accuml INNER JOIN fes_dev_info
|
||||
@ -5659,11 +5702,8 @@ BEGIN
|
||||
fes_mix_ctrl INNER JOIN fes_dev_info
|
||||
ON fes_mix_ctrl.DEV_TAG = fes_dev_info.TAG_NAME AND fes_dev_info.TAG_NAME = concat(fes_mix_ctrl.RTU_TAG,'.', 'defaultDev')
|
||||
) INNER JOIN background_x_fes_mix_ctrl ON fes_mix_ctrl.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
|
||||
#CALL kbdDebugInfo('end 删除默认设备点','');
|
||||
|
||||
|
||||
#对于非默认设备将所有FES与后台的联系清除
|
||||
#CALL kbdDebugInfo('begin 对于非默认设备将所有FES与后台的联系清除','');
|
||||
UPDATE fes_accuml INNER JOIN background_x_fes_accuml ON
|
||||
fes_accuml.TAG_NAME = concat(background_x_fes_accuml.RTU_TAG,'.',background_x_fes_accuml.RTU_DOT_NO)
|
||||
SET APP_TABLE_NAME='',APP_TAG_NAME='',APP_COLUMN_NAME='',
|
||||
@ -5695,11 +5735,9 @@ BEGIN
|
||||
UPDATE fes_mix_ctrl INNER JOIN background_x_fes_mix_ctrl ON
|
||||
fes_mix_ctrl.TAG_NAME = concat(background_x_fes_mix_ctrl.RTU_TAG,'.',background_x_fes_mix_ctrl.RTU_DOT_NO)
|
||||
SET RES_PARA_INT1=RTU_RES_PARA_INT1,RES_PARA_INT2=RTU_RES_PARA_INT2,RES_PARA_INT3=RTU_RES_PARA_INT3,RES_PARA_INT4=RTU_RES_PARA_INT4;
|
||||
#CALL kbdDebugInfo('end 对于非默认设备将所有FES与后台的联系清除','');
|
||||
#ana_ctrl,dig_ctrl,mix_ctrl不用清除
|
||||
|
||||
#重新生成默认设备
|
||||
#CALL kbdDebugInfo('begin 重新生成默认设备','');
|
||||
INSERT INTO fes_accuml (
|
||||
TAG_NAME, LOCATION_ID, SUB_SYSTEM, DOT_NO, RTU_TAG, DEV_TAG, SEQ_NO, APP_TABLE_NAME, APP_TAG_NAME, APP_COLUMN_NAME, BASE, COEFF, RTU_NO, RES_PARA_INT1, RES_PARA_INT2, RES_PARA_INT3, RES_PARA_INT4, DESCRIPTION, FES_POINT_TP_NAME) SELECT
|
||||
concat(background_x_fes_accuml.RTU_TAG,'.',background_x_fes_accuml.RTU_DOT_NO), fes_dev_info.LOCATION_ID, fes_dev_info.SUB_SYSTEM, background_x_fes_accuml.RTU_DOT_NO, background_x_fes_accuml.RTU_TAG, fes_dev_info.TAG_NAME,background_x_fes_accuml.RTU_DOT_NO, '', '', '', '0', '1', fes_rtu_para.RTU_NO, background_x_fes_accuml.RTU_RES_PARA_INT1, background_x_fes_accuml.RTU_RES_PARA_INT2, background_x_fes_accuml.RTU_RES_PARA_INT3, background_x_fes_accuml.RTU_RES_PARA_INT4, background_x_fes_accuml.RTU_DOT_DESC, ''
|
||||
@ -5762,12 +5800,10 @@ BEGIN
|
||||
AND fes_rtu_para.TAG_NAME=background_x_fes_mix_ctrl.RTU_TAG
|
||||
AND fes_dev_info.TAG_NAME = background_x_fes_mix_ctrl.RTU_DEV_TAG
|
||||
AND fes_dev_info.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
#CALL kbdDebugInfo('end 重新生成默认设备','');
|
||||
#NOTE:默认设备处理完毕
|
||||
|
||||
#重新写入FES与后台的关系 直接写入基础属性表和map_to_fes表,通过该表的触发器写入联系
|
||||
#重新写入,先写acc,ana,dig,再写map_to_fes,ctrl表
|
||||
#CALL kbdDebugInfo('begin 重新写入 set RTU','');
|
||||
UPDATE accuml INNER JOIN background_x_fes_accuml
|
||||
ON concat('accuml','.',accuml.TAG_NAME) = background_x_fes_accuml.BG_POINT_TAG
|
||||
SET accuml.RTU_TAG = background_x_fes_accuml.RTU_TAG;
|
||||
@ -5820,11 +5856,8 @@ BEGIN
|
||||
UPDATE mix_map_to_fes INNER JOIN background_x_fes_mix
|
||||
ON mix_map_to_fes.KEY_ID_TAG = background_x_fes_mix.BG_POINT_TAG AND mix_map_to_fes.RTU_TAG = background_x_fes_mix.RTU_TAG
|
||||
SET mix_map_to_fes.DOT_NO = background_x_fes_mix.RTU_DOT_NO;
|
||||
|
||||
#CALL kbdDebugInfo('end 重新写入 set RTU, DOT','');
|
||||
|
||||
|
||||
#写入ctrl表,注意此时background_x_fes__ctrl中的RTU必须和analog_control中的RTU保持一致,确保该点是同一个RTU
|
||||
#CALL kbdDebugInfo('begin 写入ctrl表','');
|
||||
UPDATE analog_control INNER JOIN background_x_fes_ana_ctrl
|
||||
ON analog_control.TAG_NAME = background_x_fes_ana_ctrl.BG_POINT_TAG AND analog_control.RTU_TAG = background_x_fes_ana_ctrl.RTU_TAG
|
||||
SET analog_control.OFFSET_NO = background_x_fes_ana_ctrl.RTU_DOT_NO;
|
||||
@ -5857,7 +5890,6 @@ BEGIN
|
||||
UPDATE mix_control INNER JOIN background_x_fes_mix_ctrl
|
||||
ON mix_control.TAG_NAME = background_x_fes_mix_ctrl.BG_POINT_TAG AND mix_control.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG
|
||||
SET mix_control.OFFSET_NO = background_x_fes_mix_ctrl.RTU_DOT_NO;
|
||||
#CALL kbdDebugInfo('end 写入ctrl表','');
|
||||
#写入完毕,下面为描述的处理
|
||||
|
||||
#可选,保持实例前置设备(非默认设备)和excel文件中的一致
|
||||
@ -5933,7 +5965,6 @@ BEGIN
|
||||
UPDATE sys_trigger_flag SET FLAG_ID = 1;
|
||||
END IF;
|
||||
|
||||
#CALL kbdDebugInfo('end all','');
|
||||
END$$
|
||||
DELIMITER ;
|
||||
|
||||
@ -6668,7 +6699,7 @@ body:BEGIN
|
||||
INSERT IGNORE INTO digital(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, VALUE_NUM, GRAY, CONTRAST, QCOLOR, VALUE, STATUS, LAST_UPDATE_TIME, VALUE1, STATUS1, LAST_CHANGE_TIME1, VALUE2, STATUS2, LAST_CHANGE_TIME2, VALUE3, STATUS3, LAST_CHANGE_TIME3, VALUE4, STATUS4, LAST_CHANGE_TIME4, VALUE5, STATUS5, LAST_CHANGE_TIME5, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, INPUT_DELAY_TIME, IS_WATER_ALM, IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, IS_ALARM_FREQ, ALARM_FREQ, ALARM_FREQ_DESC, IS_ALARM_TIME, ALARM_TIME, ALARM_TIME_DESC, ALARM_FREQ_RANGE, INFER_NAME, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID )
|
||||
SELECT
|
||||
tblPsc3000PointToAdd.TAG_NAME, tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, '', '0', 'PSCADA不告警', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '1', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '400', '', ''
|
||||
tblPsc3000PointToAdd.TAG_NAME, tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, '', '0', '', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '1', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '400', '', ''
|
||||
FROM tblPsc3000PointToAdd,dev_info
|
||||
WHERE tblPsc3000PointToAdd.DEV_TAG = dev_info.TAG_NAME ;
|
||||
|
||||
@ -6699,7 +6730,7 @@ body:BEGIN
|
||||
|
||||
INSERT IGNORE INTO mix(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, GRAY, CONTRAST, QCOLOR, RAW_VALUE, VALUE, STATUS, LAST_UPDATE_TIME, LAST_CHANGE_TIME, METHOD, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, IS_WATER_ALM,IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID) SELECT
|
||||
tblPsc3000PointToAdd.TAG_NAME,tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'mix')+1,locationId, subsystemId, '', '0', 'PSCADA中断/正常', GRAY, CONTRAST, QCOLOR, '0', VALUE, STATUS, '0', '0', '', '3', '', '', '', '', 0, 1, 0, 0, 0, regionId, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, '', 0, 0, 5, 2, 0, 0, 701, '', ''
|
||||
tblPsc3000PointToAdd.TAG_NAME,tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'mix')+1,locationId, subsystemId, '', '0', '', GRAY, CONTRAST, QCOLOR, '0', VALUE, STATUS, '0', '0', '', '3', '', '', '', '', 0, 1, 0, 0, 0, regionId, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, '', 0, 0, 5, 2, 0, 0, 701, '', ''
|
||||
FROM tblPsc3000PointToAdd,dev_info
|
||||
WHERE tblPsc3000PointToAdd.DEV_TAG = dev_info.TAG_NAME ;
|
||||
|
||||
@ -7011,7 +7042,7 @@ body:BEGIN
|
||||
INSERT IGNORE INTO digital(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, VALUE_NUM, GRAY, CONTRAST, QCOLOR, VALUE, STATUS, LAST_UPDATE_TIME, VALUE1, STATUS1, LAST_CHANGE_TIME1, VALUE2, STATUS2, LAST_CHANGE_TIME2, VALUE3, STATUS3, LAST_CHANGE_TIME3, VALUE4, STATUS4, LAST_CHANGE_TIME4, VALUE5, STATUS5, LAST_CHANGE_TIME5, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, INPUT_DELAY_TIME, IS_WATER_ALM, IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, IS_ALARM_FREQ, ALARM_FREQ, ALARM_FREQ_DESC, IS_ALARM_TIME, ALARM_TIME, ALARM_TIME_DESC, ALARM_FREQ_RANGE, INFER_NAME, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID )
|
||||
SELECT
|
||||
tmpRelationControlTbl.TAG_NAME, tmpRelationControlTbl.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, rtuTag, '1', 'PSCADA中断/正常', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '0', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '300', '', ''
|
||||
tmpRelationControlTbl.TAG_NAME, tmpRelationControlTbl.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, rtuTag, '1', '', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '0', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '300', '', ''
|
||||
FROM tmpRelationControlTbl,dev_info
|
||||
WHERE tmpRelationControlTbl.DEVICE = dev_info.TAG_NAME ;
|
||||
#关联digital_control
|
||||
@ -8170,6 +8201,10 @@ body:BEGIN
|
||||
fes_analog_ctrl.TAG_NAME LIKE concat(rtuTag,'.','%') AND
|
||||
fes_analog_ctrl.DEV_TAG = fesDevTag AND
|
||||
fes_analog_ctrl.POINT_TP_NAME = concat(FES_TEMP_NAME,'.',FES_TEMP_OUT_NAME);
|
||||
|
||||
#修改如果没有采集点，有遥控点也要新建测点
|
||||
UPDATE analog INNER JOIN tmpRelationByPluginTbl
|
||||
ON TAG_NAME = KEY_ID_TAG SET RTU_TAG = rtuTag ;
|
||||
|
||||
UPDATE analog_control INNER JOIN tmpRelationByPluginTbl
|
||||
ON analog_control.TAG_NAME = tmpRelationByPluginTbl.KEY_ID_TAG
|
||||
@ -8188,6 +8223,10 @@ body:BEGIN
|
||||
fes_mix_ctrl.TAG_NAME LIKE concat(rtuTag,'.','%') AND
|
||||
fes_mix_ctrl.DEV_TAG = fesDevTag AND
|
||||
fes_mix_ctrl.POINT_TP_NAME = concat(FES_TEMP_NAME,'.',FES_TEMP_OUT_NAME);
|
||||
|
||||
#修改如果没有采集点，有遥控点也要新建测点
|
||||
UPDATE mix INNER JOIN tmpRelationByPluginTbl
|
||||
ON TAG_NAME = KEY_ID_TAG SET RTU_TAG = rtuTag ;
|
||||
|
||||
UPDATE mix_control INNER JOIN tmpRelationByPluginTbl
|
||||
ON mix_control.TAG_NAME = tmpRelationByPluginTbl.KEY_ID_TAG
|
||||
|
||||
@ -5,12 +5,16 @@ RETURNS text
|
||||
AS $$
|
||||
BEGIN
|
||||
IF num > 0 THEN
|
||||
ret = array_to_string((string_to_array(str, delim))[:num], delim);
|
||||
ret = array_to_string((string_to_array(str, delim))[1:num], delim);
|
||||
ELSE
|
||||
DECLARE _array TEXT[];
|
||||
DECLARE start_index INTEGER;
|
||||
DECLARE end_index INTEGER;
|
||||
BEGIN
|
||||
_array = string_to_array(str, delim);
|
||||
ret = array_to_string(_array[array_length(_array, 1) + num + 1:], delim);
|
||||
start_index=array_length(_array, 1) + num + 1;
|
||||
end_index=array_length(_array, 1);
|
||||
ret = array_to_string(_array[start_index:end_index], delim);
|
||||
END;
|
||||
END IF;
|
||||
END;
|
||||
@ -1036,13 +1040,13 @@ BEGIN
|
||||
END;
|
||||
END IF;
|
||||
|
||||
IF NEW.RTU_NO <> COALESCE(OLD.RTU_NO,-1) THEN
|
||||
SELECT TAG_NAME INTO rtuTag FROM fes_rtu_para WHERE fes_rtu_para.RTU_NO = NEW.RTU_NO;
|
||||
UPDATE accuml SET accuml.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND accuml.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE analog SET analog.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND analog.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE digital SET digital.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND digital.DEVICE = dev_info.TAG_NAME;
|
||||
UPDATE mix SET mix.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND mix.DEVICE = dev_info.TAG_NAME;
|
||||
END IF;
|
||||
-- IF NEW.RTU_NO <> COALESCE(OLD.RTU_NO,-1) THEN
|
||||
-- SELECT TAG_NAME INTO rtuTag FROM fes_rtu_para WHERE fes_rtu_para.RTU_NO = NEW.RTU_NO;
|
||||
-- UPDATE accuml SET accuml.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND accuml.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE analog SET analog.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND analog.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE digital SET digital.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND digital.DEVICE = dev_info.TAG_NAME;
|
||||
-- UPDATE mix SET mix.RTU_TAG = rtuTag from dev_info WHERE dev_info.GROUP_TAG_NAME = NEW.TAG_NAME AND mix.DEVICE = dev_info.TAG_NAME;
|
||||
--END IF;
|
||||
|
||||
|
||||
IF getTriggerFlag() = TRUE THEN
|
||||
@ -5135,6 +5139,17 @@ BEGIN
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_ana
|
||||
SET temp_plugin_point_map_ana.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_ana.FES_TEMP_OUT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_ana.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_ana.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA_CTRL')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
--digital,只关联第一个分量
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
@ -5147,7 +5162,18 @@ BEGIN
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
SET temp_plugin_point_map_dig.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_dig.FES_TEMP_OUT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_dig.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_dig.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG_CTRL')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_POINT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME
|
||||
@ -5158,7 +5184,18 @@ BEGIN
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_OUT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_mix.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_mix.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX_CTRL')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
END;
|
||||
$$LANGUAGE PLPGSQL;
|
||||
|
||||
@ -5225,6 +5262,19 @@ BEGIN
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
--analog ctrl
|
||||
UPDATE temp_plugin_point_map_ana
|
||||
SET temp_plugin_point_map_ana.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_ana.FES_TEMP_OUT_NAME = temp_plugin_point_map_ana.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_ana.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_ana.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_ana.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_ANA_CTRL')
|
||||
AND temp_plugin_point_map_ana.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
--digital,只关联第一个分量
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
SET temp_plugin_point_map_dig.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
@ -5237,7 +5287,19 @@ BEGIN
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
|
||||
UPDATE temp_plugin_point_map_dig
|
||||
SET temp_plugin_point_map_dig.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_dig.FES_TEMP_OUT_NAME1 = temp_plugin_point_map_dig.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_dig.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_dig.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_dig.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_DIG_CTRL')
|
||||
AND temp_plugin_point_map_dig.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_POINT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME
|
||||
@ -5250,6 +5312,17 @@ BEGIN
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
|
||||
UPDATE temp_plugin_point_map_mix
|
||||
SET temp_plugin_point_map_mix.FES_TEMP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME,
|
||||
temp_plugin_point_map_mix.FES_TEMP_OUT_NAME = temp_plugin_point_map_mix.TEMP_POINT_NAME
|
||||
FROM temp_plugin_fes_dev_map,fes_dev_pt_temp_def
|
||||
WHERE temp_plugin_point_map_mix.PLUGIN_NAME = pluginName
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = devTag
|
||||
AND temp_plugin_point_map_mix.PLUGIN_NAME = temp_plugin_fes_dev_map.PLUGIN_NAME
|
||||
AND temp_plugin_point_map_mix.TEMP_NAME = temp_plugin_fes_dev_map.TEMP_NAME
|
||||
AND DEV_TP_NAME = temp_plugin_fes_dev_map.FES_TEMP_NAME
|
||||
AND POINT_TYPE = getFesPointType('FES_MIX_CTRL')
|
||||
AND temp_plugin_point_map_mix.TEMP_POINT_NAME = getAfterLastDot(TAG_NAME);
|
||||
END;
|
||||
$$LANGUAGE PLPGSQL;
|
||||
|
||||
@ -6357,7 +6430,6 @@ BEGIN
|
||||
END IF;
|
||||
--预处理阶段
|
||||
--首先把background_x_fes表中提到的后台点与前置的映射关系取消掉,这里会触发触发器,会比较耗时,去优化触发器
|
||||
--CALL kbdDebugInfo('begin 消除后台点的映射关系','');
|
||||
update accuml
|
||||
SET accuml.RTU_TAG = ''
|
||||
from background_x_fes_accuml
|
||||
@ -6382,9 +6454,7 @@ BEGIN
|
||||
WHERE concat('mix','.',mix.TAG_NAME) = background_x_fes_mix.BG_POINT_TAG;
|
||||
|
||||
|
||||
--update完毕,会驱动触发器,更新对应map_to_fes和Control表中的RTU
|
||||
--CALL kbdDebugInfo('end 消除后台点的映射关系','');
|
||||
|
||||
--update完毕,会驱动触发器,更新对应map_to_fes和Control表中的RTU
|
||||
|
||||
--预处理, acc,ana,dig,mix 中后台与前置的关联有两种方法确定前置点,分别是1:RTU_TAG和RTU_DOT_NO可以确定一个点
|
||||
--2:通过RTU_DEV_TAG去前置模板和后台模板寻找实例的对应点,再写入对应的RTU_tag和RTU_DOT_NO
|
||||
@ -6392,7 +6462,6 @@ BEGIN
|
||||
--不符合以上两点的记录删除
|
||||
--ana_ctrl,dig_ctrl,mix_ctrl只能用一种方法确定,即rtu_tag, RTU_DOT_NO,RTU_DEV_TAG都需要填写, rtu_tag, RTU_DOT_NO,RTU_DEV_TAG都对得上的使用实例的设备,否则使用默认设备
|
||||
--首先,对于acc,ana,dig,mix,把RTU_TAG或者RTU_DOT_NO为空, RTU_DEV_TAG不为空的记录,去模板找对应关系,填入RTU_TAG和RTU_DOT_NO信息
|
||||
--CALL kbdDebugInfo('begin update RTU_TAG or dot_no NULL','');
|
||||
|
||||
--acc
|
||||
UPDATE background_x_fes_accuml
|
||||
@ -6490,11 +6559,8 @@ BEGIN
|
||||
AND mix_map_to_fes.POINT_TP_NAME = mix_temp_define.TAG_NAME
|
||||
AND fes_mix.DEV_TAG = background_x_fes_mix.RTU_DEV_TAG
|
||||
AND fes_mix.SEQ_NO = mix_temp_define.SEC_SEQ_NO;
|
||||
|
||||
--CALL kbdDebugInfo('end update RTU_TAG or dot_no NULL','');
|
||||
|
||||
|
||||
--删除RTU_TAG和DOT_NO仍为空的
|
||||
--CALL kbdDebugInfo('begin delete RTU_TAG or dot_no NULL','');
|
||||
DELETE FROM background_x_fes_accuml WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_analog WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_digtal WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
@ -6503,10 +6569,7 @@ BEGIN
|
||||
DELETE FROM background_x_fes_ana_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_dig_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
DELETE FROM background_x_fes_mix_ctrl WHERE COALESCE(RTU_TAG,'') = '' OR COALESCE(RTU_DOT_NO,'') ='' ;
|
||||
|
||||
--CALL kbdDebugInfo('end delete RTU_TAG or dot_no NULL','');
|
||||
|
||||
--CALL kbdDebugInfo('begin reUpdate RTU_DEV_TAG','');
|
||||
|
||||
--再次更新,对于RTU_TAG,DOT_NO和RTU_DEV_TAG对不上的点归类到默认设备
|
||||
UPDATE background_x_fes_accuml
|
||||
SET background_x_fes_accuml.RTU_DEV_TAG = concat(background_x_fes_accuml.RTU_TAG, '.', 'defaultDev')
|
||||
@ -6563,13 +6626,11 @@ BEGIN
|
||||
WHERE fes_mix_ctrl.TAG_NAME =concat(background_x_fes_mix_ctrl.RTU_TAG,'.',background_x_fes_mix_ctrl.RTU_DOT_NO)
|
||||
AND fes_mix_ctrl.DEV_TAG = background_x_fes_mix_ctrl.RTU_DEV_TAG
|
||||
);
|
||||
--CALL kbdDebugInfo('end reUpdate RTU_DEV_TAG','');
|
||||
--预处理完毕,此时background_x_fes表中的字段情况有以下几种情况.
|
||||
--1:RTU_TAG,DOT_NO,RTU_DEV_TAG都对得上的(即对应表上有的),这些事前置实例设备中的点
|
||||
--2:RTU_TAG,DOT_NO与RTU_DEV_TAG可能对不上,这类点归类到默认设备中
|
||||
|
||||
--先删除默认设备点
|
||||
--CALL kbdDebugInfo('begin 删除默认设备点','');
|
||||
DELETE FROM fes_accuml
|
||||
USING fes_dev_info,background_x_fes_accuml
|
||||
WHERE fes_accuml.DEV_TAG = fes_dev_info.TAG_NAME
|
||||
@ -6611,11 +6672,8 @@ BEGIN
|
||||
WHERE fes_mix_ctrl.DEV_TAG = fes_dev_info.TAG_NAME
|
||||
AND fes_dev_info.TAG_NAME = concat(fes_mix_ctrl.RTU_TAG,'.', 'defaultDev')
|
||||
AND fes_mix_ctrl.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
|
||||
--CALL kbdDebugInfo('end 删除默认设备点','');
|
||||
|
||||
|
||||
--对于非默认设备将所有FES与后台的联系清除
|
||||
--CALL kbdDebugInfo('begin 对于非默认设备将所有FES与后台的联系清除','');
|
||||
update fes_accuml
|
||||
SET APP_TABLE_NAME='',APP_TAG_NAME='',APP_COLUMN_NAME='', RES_PARA_INT1=RTU_RES_PARA_INT1,RES_PARA_INT2=RTU_RES_PARA_INT2,RES_PARA_INT3=RTU_RES_PARA_INT3,RES_PARA_INT4=RTU_RES_PARA_INT4
|
||||
from background_x_fes_accuml
|
||||
@ -6657,11 +6715,9 @@ BEGIN
|
||||
from background_x_fes_mix_ctrl
|
||||
where fes_mix_ctrl.TAG_NAME = concat(background_x_fes_mix_ctrl.RTU_TAG,'.',background_x_fes_mix_ctrl.RTU_DOT_NO);
|
||||
|
||||
--CALL kbdDebugInfo('end 对于非默认设备将所有FES与后台的联系清除','');
|
||||
--ana_ctrl,dig_ctrl,mix_ctrl不用清除
|
||||
|
||||
--重新生成默认设备
|
||||
--CALL kbdDebugInfo('begin 重新生成默认设备','');
|
||||
INSERT INTO fes_accuml (
|
||||
TAG_NAME, LOCATION_ID, SUB_SYSTEM, DOT_NO, RTU_TAG, DEV_TAG, SEQ_NO, APP_TABLE_NAME, APP_TAG_NAME, APP_COLUMN_NAME, BASE, COEFF, RTU_NO, RES_PARA_INT1, RES_PARA_INT2, RES_PARA_INT3, RES_PARA_INT4, DESCRIPTION, FES_POINT_TP_NAME) SELECT
|
||||
concat(background_x_fes_accuml.RTU_TAG,'.',background_x_fes_accuml.RTU_DOT_NO), fes_dev_info.LOCATION_ID, fes_dev_info.SUB_SYSTEM, background_x_fes_accuml.RTU_DOT_NO, background_x_fes_accuml.RTU_TAG, fes_dev_info.TAG_NAME,background_x_fes_accuml.RTU_DOT_NO, '', '', '', '0', '1', fes_rtu_para.RTU_NO, background_x_fes_accuml.RTU_RES_PARA_INT1, background_x_fes_accuml.RTU_RES_PARA_INT2, background_x_fes_accuml.RTU_RES_PARA_INT3, background_x_fes_accuml.RTU_RES_PARA_INT4, background_x_fes_accuml.RTU_DOT_DESC, ''
|
||||
@ -6724,12 +6780,10 @@ BEGIN
|
||||
AND fes_rtu_para.TAG_NAME=background_x_fes_mix_ctrl.RTU_TAG
|
||||
AND fes_dev_info.TAG_NAME = background_x_fes_mix_ctrl.RTU_DEV_TAG
|
||||
AND fes_dev_info.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
--CALL kbdDebugInfo('end 重新生成默认设备','');
|
||||
--NOTE:默认设备处理完毕
|
||||
|
||||
--重新写入FES与后台的关系 直接写入基础属性表和map_to_fes表,通过该表的触发器写入联系
|
||||
--重新写入,先写acc,ana,dig,再写map_to_fes,ctrl表
|
||||
--CALL kbdDebugInfo('begin 重新写入 set RTU','');
|
||||
update accuml
|
||||
SET accuml.RTU_TAG = background_x_fes_accuml.RTU_TAG
|
||||
from background_x_fes_accuml
|
||||
@ -6800,12 +6854,8 @@ BEGIN
|
||||
SET mix_map_to_fes.DOT_NO = background_x_fes_mix.RTU_DOT_NO
|
||||
from background_x_fes_mix
|
||||
WHERE mix_map_to_fes.KEY_ID_TAG = background_x_fes_mix.BG_POINT_TAG AND mix_map_to_fes.RTU_TAG = background_x_fes_mix.RTU_TAG;
|
||||
|
||||
|
||||
--CALL kbdDebugInfo('end 重新写入 set RTU, DOT','');
|
||||
|
||||
--写入ctrl表,注意此时background_x_fes__ctrl中的RTU必须和analog_control中的RTU保持一致,确保该点是同一个RTU
|
||||
--CALL kbdDebugInfo('begin 写入ctrl表','');
|
||||
update analog_control
|
||||
SET analog_control.OFFSET_NO = background_x_fes_ana_ctrl.RTU_DOT_NO
|
||||
from background_x_fes_ana_ctrl
|
||||
@ -6847,7 +6897,6 @@ BEGIN
|
||||
from background_x_fes_mix_ctrl
|
||||
WHERE mix_control.TAG_NAME = background_x_fes_mix_ctrl.BG_POINT_TAG AND mix_control.RTU_TAG = background_x_fes_mix_ctrl.RTU_TAG;
|
||||
|
||||
--CALL kbdDebugInfo('end 写入ctrl表','');
|
||||
--写入完毕,下面为描述的处理
|
||||
|
||||
--可选,保持实例前置设备(非默认设备)和excel文件中的一致
|
||||
@ -6944,7 +6993,6 @@ BEGIN
|
||||
UPDATE sys_trigger_flag SET FLAG_ID = 1;
|
||||
END IF;
|
||||
|
||||
--CALL kbdDebugInfo('end all','');
|
||||
END;
|
||||
$$LANGUAGE PLPGSQL;
|
||||
|
||||
@ -7527,6 +7575,12 @@ BEGIN
|
||||
fes_analog_ctrl.TAG_NAME LIKE concat(rtuTag,'.','%') AND
|
||||
fes_analog_ctrl.DEV_TAG = fesDevTag AND
|
||||
fes_analog_ctrl.POINT_TP_NAME = concat(FES_TEMP_NAME,'.',FES_TEMP_OUT_NAME);
|
||||
|
||||
--主要为了对应测点只遥控无采集的情况
|
||||
update analog
|
||||
SET RTU_TAG = rtuTag
|
||||
from tmprelationbyplugintbl
|
||||
WHERE TAG_NAME = KEY_ID_TAG;
|
||||
|
||||
update analog_control
|
||||
SET analog_control.OFFSET_NO = tmpRelationByPluginTbl.DOT_NO
|
||||
@ -7553,6 +7607,11 @@ BEGIN
|
||||
from tmprelationbyplugintbl
|
||||
WHERE mix_control.TAG_NAME = tmpRelationByPluginTbl.KEY_ID_TAG;
|
||||
|
||||
--主要为了对应测点只遥控无采集的情况
|
||||
update mix
|
||||
SET RTU_TAG = rtuTag
|
||||
from tmprelationbyplugintbl
|
||||
WHERE TAG_NAME = KEY_ID_TAG;
|
||||
|
||||
--digital_ctrl
|
||||
DELETE FROM tmpRelationByPluginTbl;
|
||||
@ -8097,7 +8156,7 @@ BEGIN
|
||||
INSERT INTO digital(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, VALUE_NUM, GRAY, CONTRAST, QCOLOR, VALUE, STATUS, LAST_UPDATE_TIME, VALUE1, STATUS1, LAST_CHANGE_TIME1, VALUE2, STATUS2, LAST_CHANGE_TIME2, VALUE3, STATUS3, LAST_CHANGE_TIME3, VALUE4, STATUS4, LAST_CHANGE_TIME4, VALUE5, STATUS5, LAST_CHANGE_TIME5, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, INPUT_DELAY_TIME, IS_WATER_ALM, IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, IS_ALARM_FREQ, ALARM_FREQ, ALARM_FREQ_DESC, IS_ALARM_TIME, ALARM_TIME, ALARM_TIME_DESC, ALARM_FREQ_RANGE, INFER_NAME, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID )
|
||||
SELECT
|
||||
tblPsc3000PointToAdd.TAG_NAME, tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, '', '0', 'PSCADA不告警', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '1', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '400', '', ''
|
||||
tblPsc3000PointToAdd.TAG_NAME, tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, '', '0', '', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '1', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '400', '', ''
|
||||
FROM tblPsc3000PointToAdd,dev_info
|
||||
WHERE tblPsc3000PointToAdd.DEV_TAG = dev_info.TAG_NAME ;
|
||||
|
||||
@ -8132,7 +8191,7 @@ BEGIN
|
||||
|
||||
INSERT INTO mix(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, GRAY, CONTRAST, QCOLOR, RAW_VALUE, VALUE, STATUS, LAST_UPDATE_TIME, LAST_CHANGE_TIME, METHOD, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, IS_WATER_ALM,IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID) SELECT
|
||||
tblPsc3000PointToAdd.TAG_NAME,tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'mix')+1,locationId, subsystemId, '', '0', 'PSCADA中断/正常', GRAY, CONTRAST, QCOLOR, '0', VALUE, STATUS, '0', '0', '', '3', '', '', '', '', 0, 1, 0, 0, 0, regionId, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, '', 0, 0, 5, 2, 0, 0, 701, '', ''
|
||||
tblPsc3000PointToAdd.TAG_NAME,tblPsc3000PointToAdd.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'mix')+1,locationId, subsystemId, '', '0', '', GRAY, CONTRAST, QCOLOR, '0', VALUE, STATUS, '0', '0', '', '3', '', '', '', '', 0, 1, 0, 0, 0, regionId, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, '', 0, 0, 5, 2, 0, 0, 701, '', ''
|
||||
FROM tblPsc3000PointToAdd,dev_info
|
||||
WHERE tblPsc3000PointToAdd.DEV_TAG = dev_info.TAG_NAME ;
|
||||
|
||||
@ -8493,7 +8552,7 @@ BEGIN
|
||||
INSERT INTO digital(
|
||||
TAG_NAME, DESCRIPTION, DEVICE, SEQ_NO, LOCATION_ID, SUB_SYSTEM, RTU_TAG, IS_CONTROL, STATE_TEXT_NAME, VALUE_NUM, GRAY, CONTRAST, QCOLOR, VALUE, STATUS, LAST_UPDATE_TIME, VALUE1, STATUS1, LAST_CHANGE_TIME1, VALUE2, STATUS2, LAST_CHANGE_TIME2, VALUE3, STATUS3, LAST_CHANGE_TIME3, VALUE4, STATUS4, LAST_CHANGE_TIME4, VALUE5, STATUS5, LAST_CHANGE_TIME5, ALARM_PRIORITY, PIC_NAME, SOUND_NAME1, SOUND_NAME2, SOUND_NAME3, ALARM_DELAY_TIME, INPUT_DELAY_TIME, IS_WATER_ALM, IS_ACK_ON_RTN, DEL_ACT_ON_ACK, IS_NEVER_ALM_ON_RTN, REGION_ID, OPT_HANDOVER_GROUP, IS_SUMMARY, SUMMARY_VALUE, SUMMARY_STATUS, DEV_TYPE, POINT_TP_NAME, IS_SAMPLE, IS_STATISTICS, SAMPLE_PERIOD, IS_ALARM_FREQ, ALARM_FREQ, ALARM_FREQ_DESC, IS_ALARM_TIME, ALARM_TIME, ALARM_TIME_DESC, ALARM_FREQ_RANGE, INFER_NAME, POINT_TYPE, POINT_CLASS, POINT_PROPERTY, POINT_SORT, CAMERA_TAG, PRESET_ID )
|
||||
SELECT
|
||||
tmpRelationControlTbl.TAG_NAME, tmpRelationControlTbl.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, rtuTag, '1', 'PSCADA中断/正常', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '0', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '300', '', ''
|
||||
tmpRelationControlTbl.TAG_NAME, tmpRelationControlTbl.DESCRIPTION,dev_info.TAG_NAME,getMaxSeq(dev_info.TAG_NAME,'digital')+1, locationId, subsystemId, rtuTag, '1', '', '1', dev_info.GRAY, dev_info.CONTRAST, dev_info.QCOLOR,dev_info.VALUE, dev_info.STATUS, 0, 0, 0, '0', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '1', '', '', '', '', '5', '1', '0', '1', '0', '0', regionId, dev_info.OPT_HANDOVER_GROUP, '0', '0', '0', dev_info.DEV_TYPE, '', '0', '0', '5', '0', '10', '计次报警描述', '0', '5', '计时报警描述', '30', '', '1', '0', '0', '300', '', ''
|
||||
FROM tmpRelationControlTbl,dev_info
|
||||
WHERE tmpRelationControlTbl.DEVICE = dev_info.TAG_NAME ;
|
||||
--关联digital_control
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
<DatabaseStruct>
|
||||
<Table name="accuml" description="累计量参数表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="标签名" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -404,7 +404,7 @@
|
||||
</Table>
|
||||
<Table name="analog" description="模拟量参数表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="5000" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="5000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="标签名" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -544,7 +544,7 @@
|
||||
</Table>
|
||||
<Table name="bas_craft_def" description="工艺定义" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="20" subsystem_flag="16" select_by_location="yes" select_by_subsystem="no"/>
|
||||
<Rdb max_record_num="20" subsystem_flag="0" select_by_location="yes" select_by_subsystem="no"/>
|
||||
<Column name="ID" description="工艺ID" comment="" use_type="db+rdb" is_key="yes" data_type="int" data_length="4">
|
||||
<Db is_null="no" is_index="yes" index_type="unique" index_sort="asc" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -560,7 +560,7 @@
|
||||
</Table>
|
||||
<Table name="bas_mode_def" description="模式定义" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="20" subsystem_flag="16" select_by_location="yes" select_by_subsystem="no"/>
|
||||
<Rdb max_record_num="20" subsystem_flag="0" select_by_location="yes" select_by_subsystem="no"/>
|
||||
<Column name="ID" description="ID" comment="" use_type="db+rdb" is_key="yes" data_type="int" data_length="4">
|
||||
<Db is_null="no" is_index="yes" index_type="unique" index_sort="asc" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -606,7 +606,7 @@
|
||||
</Table>
|
||||
<Table name="dev_group" description="设备分组表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="1" select_by_location="no" select_by_subsystem="no"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="249" select_by_location="no" select_by_subsystem="no"/>
|
||||
<Column name="TAG_NAME" description="设备名称" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -658,7 +658,7 @@
|
||||
</Table>
|
||||
<Table name="dev_info" description="设备信息表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="设备名称" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1018,7 +1018,7 @@
|
||||
</Table>
|
||||
<Table name="digital" description="数字量输入参数表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="5000" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="5000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="标签名" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1387,7 +1387,7 @@
|
||||
</Table>
|
||||
<Table name="ia_disposal_plan" description="处置预案表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="2" select_by_location="yes" select_by_subsystem="no"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="2" select_by_location="yes" select_by_subsystem="no"/>
|
||||
<Column name="KEY_ID_TAG" description="" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="128">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1400,15 +1400,15 @@
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
</Column>
|
||||
</Table>
|
||||
<Table name="kbd_debug" description="后台与Fes点之间的映射表" comment="" use_type="db">
|
||||
<Table name="custom_debug_info" description="sql调试记录" comment="" use_type="db">
|
||||
<Db type="param" is_backup="no"/>
|
||||
<Column name="COL1" description="对应Map_TO_FES的KEY_ID_TAG" comment="" use_type="db" is_key="no" data_type="string" data_length="100">
|
||||
<Column name="COL1" description="" comment="" use_type="db" is_key="no" data_type="string" data_length="100">
|
||||
<Db is_null="yes" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
</Column>
|
||||
<Column name="COL2" description="分量" comment="" use_type="db" is_key="no" data_type="string" data_length="100">
|
||||
<Column name="COL2" description="" comment="" use_type="db" is_key="no" data_type="string" data_length="100">
|
||||
<Db is_null="yes" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
</Column>
|
||||
<Column name="COL3" description="点号" comment="" use_type="db" is_key="no" data_type="string" data_length="100">
|
||||
<Column name="COL3" description="" comment="" use_type="db" is_key="no" data_type="string" data_length="100">
|
||||
<Db is_null="yes" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
</Column>
|
||||
<Column name="COL4" description="" comment="" use_type="db" is_key="no" data_type="int" data_length="4">
|
||||
@ -1418,15 +1418,15 @@
|
||||
<Db is_null="yes" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
</Column>
|
||||
</Table>
|
||||
<Table name="kbd_debug_flag" description="后台与Fes点之间的映射表" comment="" use_type="db">
|
||||
<Table name="custom_debug_flag" description="是否打印sql调试信息标记" comment="" use_type="db">
|
||||
<Db type="param" is_backup="no"/>
|
||||
<Column name="PRINT_DEBUG_INFO_FLAG" description="后台设备标签" comment="" use_type="db" is_key="no" data_type="int" data_length="4">
|
||||
<Column name="PRINT_DEBUG_INFO_FLAG" description="是否打印调试信息" comment="" use_type="db" is_key="no" data_type="int" data_length="4">
|
||||
<Db is_null="yes" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
</Column>
|
||||
</Table>
|
||||
<Table name="mix" description="混合量输入参数表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="标签名" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1610,7 +1610,7 @@
|
||||
</Table>
|
||||
<Table name="opt_ctrl_act_define" description="控制动作定义表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="no" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="248" select_by_location="no" select_by_subsystem="yes"/>
|
||||
<Column name="CTRL_GRP_NAME" description="控制动作组名" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1649,7 +1649,7 @@
|
||||
</Column>
|
||||
</Table>
|
||||
<Table name="opt_ctrl_info" description="控制信息表" comment="" use_type="rdb">
|
||||
<Rdb max_record_num="1000" subsystem_flag="8" select_by_location="no" select_by_subsystem="no"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="248" select_by_location="no" select_by_subsystem="no"/>
|
||||
<Column name="KEY_ID_TAG" description="KEYID标签 " comment="" use_type="rdb" is_key="no" data_type="string" data_length="128">
|
||||
<Rdb type="data" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
</Column>
|
||||
@ -1731,7 +1731,7 @@
|
||||
</Table>
|
||||
<Table name="opt_handover_grp" description="权限转移组表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1783,7 +1783,7 @@
|
||||
</Table>
|
||||
<Table name="opt_interlock_define" description="闭锁公式定义表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="no" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="248" select_by_location="no" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1803,7 +1803,7 @@
|
||||
</Table>
|
||||
<Table name="opt_interlock_para" description="闭锁参数表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="DO标签点,遥控的时候通过该标签匹配" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
@ -1951,7 +1951,7 @@
|
||||
</Table>
|
||||
<Table name="opt_shield_info" description="屏蔽信息表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="SHIELD_ID" description="屏蔽id" comment="" use_type="db+rdb" is_key="yes" data_type="int" data_length="4">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="yes" is_update_to_rdb="yes"/>
|
||||
@ -2007,7 +2007,7 @@
|
||||
</Table>
|
||||
<Table name="opt_shield_obj" description="屏蔽对象表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="SHIELD_ID" description="屏蔽id" comment="" use_type="db+rdb" is_key="yes" data_type="int" data_length="4">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="yes" is_update_to_rdb="yes"/>
|
||||
@ -2059,7 +2059,7 @@
|
||||
</Table>
|
||||
<Table name="opt_tag_info" description="标签信息表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="KEY_ID_TAG" description="KEY标签" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="128">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="yes" is_update_to_rdb="yes"/>
|
||||
@ -2159,7 +2159,7 @@
|
||||
</Table>
|
||||
<Table name="opt_token_info" description="挂牌信息表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="100" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="1000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TOKEN_ID" description="标志牌ID" comment="" use_type="db+rdb" is_key="yes" data_type="int" data_length="4">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="yes" is_update_to_rdb="yes"/>
|
||||
@ -2763,6 +2763,10 @@
|
||||
<Column name="OPEN_ID" description="APP会话ID" comment="" use_type="db" is_key="no" data_type="string" data_length="255">
|
||||
<Db is_null="yes" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
</Column>
|
||||
<Column name="ALLOW_DURATION" description="允许持续时间" comment="" use_type="db+rdb" is_key="no" data_type="int" data_length="4">
|
||||
<Db is_null="yes" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
</Column>
|
||||
</Table>
|
||||
<Table name="rm_user_face_info" description="存储用户的人脸信息" comment="" use_type="db">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
@ -3095,7 +3099,7 @@
|
||||
</Table>
|
||||
<Table name="sample_define" description="采样定义表" comment="" use_type="db+rdb">
|
||||
<Db type="param" is_backup="yes"/>
|
||||
<Rdb max_record_num="5000" subsystem_flag="8" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Rdb max_record_num="5000" subsystem_flag="248" select_by_location="yes" select_by_subsystem="yes"/>
|
||||
<Column name="TAG_NAME" description="点标签" comment="" use_type="db+rdb" is_key="yes" data_type="string" data_length="64">
|
||||
<Db is_null="no" is_index="" index_type="" index_sort="" is_auto_increment="no" default_value=""/>
|
||||
<Rdb type="param" default_value="" is_syn_to_slave="no" is_update_to_rdb="yes"/>
|
||||
|
||||
Binary file not shown.
@ -1,51 +0,0 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: app_bio_identify_srv\n"
|
||||
"POT-Creation-Date: 2020-09-07 17:03+0800\n"
|
||||
"PO-Revision-Date: 2020-09-07 17:03+0800\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"Language: en\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 2.4.1\n"
|
||||
"X-Poedit-Basepath: ../../../../../src/application/app_bio_identify/"
|
||||
"app_bio_identify_srv\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Poedit-Flags-xgettext: --add-comments\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
"X-Poedit-KeywordsList: I18N;I18N_C\n"
|
||||
"X-Poedit-SearchPath-0: .\n"
|
||||
|
||||
#: CAcsDevice.cpp:116
|
||||
msgid "设备未连接，请检查设备是否在线！"
|
||||
msgstr "The device is not connected, please check that the device is online!"
|
||||
|
||||
#: CAcsDevice.cpp:130
|
||||
msgid "启用设备成功，请在设备上认证！"
|
||||
msgstr "Enabling the device was successful, please certify on the device!"
|
||||
|
||||
#: CAcsDevice.cpp:142
|
||||
msgid "启用设备失败，请检查设备是否在线！"
|
||||
msgstr "Failed to enable the device, check that the device is online!"
|
||||
|
||||
#: CAcsDevice.cpp:153
|
||||
msgid "设备被占用，请稍后再试！"
|
||||
msgstr "The device is occupied, please try again later!"
|
||||
|
||||
#: CAcsDevice.cpp:158
|
||||
msgid "未知错误！"
|
||||
msgstr "Unknown error!"
|
||||
|
||||
#: CAcsDevice.cpp:279
|
||||
msgid "认证超时。"
|
||||
msgstr "Certification timed out."
|
||||
|
||||
#: CBioIdentifySrv.cpp:81
|
||||
#, c-format
|
||||
msgid ""
|
||||
"I18N output test：\n"
|
||||
" This is src hardcode. \n"
|
||||
" int = [%d] , str = [%s]\n"
|
||||
msgstr ""
|
||||
Binary file not shown.
@ -1,44 +0,0 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: app_fbd\n"
|
||||
"POT-Creation-Date: 2021-01-11 17:55+0800\n"
|
||||
"PO-Revision-Date: 2021-01-11 17:55+0800\n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: kbdct\n"
|
||||
"Language: en\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Generator: Poedit 2.0.6\n"
|
||||
"X-Poedit-Basepath: ../../../../../src/application/app_fbd\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||
"X-Poedit-SourceCharset: UTF-8\n"
|
||||
"X-Poedit-KeywordsList: I18N;I18N_C\n"
|
||||
"X-Poedit-SearchPath-0: .\n"
|
||||
|
||||
#: app_fbd_server/FbdGroupMng.cpp:256
|
||||
msgid "创建FBD组[%1%]线程失败，请检查配置"
|
||||
msgstr "Failed to create thread for FBD group: [%1%], please check the configuration"
|
||||
|
||||
#: app_fbd_server/FbdGroupMng.cpp:289
|
||||
msgid "重新设置内存中FBD组[%1%]数据失败"
|
||||
msgstr "Failed to reset data of FBD group in memory: [%1%]"
|
||||
|
||||
#: app_fbd_server/FbdGroupMng.cpp:345
|
||||
msgid "删除内存中FBD组[%1%]数据失败"
|
||||
msgstr "Failed to delete data of FBD group in memory: [%1%]"
|
||||
|
||||
#: app_fbd_server/FbdServerApp.cpp:290
|
||||
#, c-format
|
||||
#| msgid ""
|
||||
#| "I18N 测试：\n"
|
||||
#| " This is src hardcode. \n"
|
||||
#| " int = [%d] , str = [%s]\n"
|
||||
msgid ""
|
||||
"I18N test：\n"
|
||||
" This is src hardcode. \n"
|
||||
" int = [%d] , str = [%s]\n"
|
||||
msgstr ""
|
||||
"I18N test：\n"
|
||||
" This is src hardcode. \n"
|
||||
" int = [%d] , str = [%s]\n"
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 350 B |
Binary file not shown.
|
Before Width: | Height: | Size: 314 B |
Binary file not shown.
|
Before Width: | Height: | Size: 438 B |
Binary file not shown.
|
Before Width: | Height: | Size: 321 B |
Binary file not shown.
|
Before Width: | Height: | Size: 361 B |
Binary file not shown.
|
Before Width: | Height: | Size: 333 B |
Binary file not shown.
|
Before Width: | Height: | Size: 334 B |
Binary file not shown.
|
Before Width: | Height: | Size: 326 B |
Binary file not shown.
|
Before Width: | Height: | Size: 395 B |
Binary file not shown.
|
Before Width: | Height: | Size: 321 B |
Binary file not shown.
|
Before Width: | Height: | Size: 454 B |
Binary file not shown.
|
Before Width: | Height: | Size: 284 B |
Binary file not shown.
|
Before Width: | Height: | Size: 305 B |
Binary file not shown.
|
Before Width: | Height: | Size: 192 B |
Binary file not shown.
|
Before Width: | Height: | Size: 471 B |
Binary file not shown.
|
Before Width: | Height: | Size: 294 B |
Binary file not shown.
|
Before Width: | Height: | Size: 499 B |
Binary file not shown.
|
Before Width: | Height: | Size: 796 B |
Binary file not shown.
|
Before Width: | Height: | Size: 849 B |
Binary file not shown.
|
Before Width: | Height: | Size: 300 B |
Binary file not shown.
|
Before Width: | Height: | Size: 766 B |
Binary file not shown.
|
Before Width: | Height: | Size: 322 B |
Binary file not shown.
|
Before Width: | Height: | Size: 328 B |
Binary file not shown.
|
Before Width: | Height: | Size: 457 B |
Binary file not shown.
|
Before Width: | Height: | Size: 447 B |
Binary file not shown.
|
Before Width: | Height: | Size: 356 B |
Binary file not shown.
|
Before Width: | Height: | Size: 322 B |
Binary file not shown.
|
Before Width: | Height: | Size: 181 B |
Binary file not shown.
|
Before Width: | Height: | Size: 337 B |
Binary file not shown.
|
Before Width: | Height: | Size: 346 B |
Binary file not shown.
|
Before Width: | Height: | Size: 548 B |
Binary file not shown.
|
Before Width: | Height: | Size: 269 B |
Binary file not shown.
|
Before Width: | Height: | Size: 304 B |
Binary file not shown.
|
Before Width: | Height: | Size: 426 B |
Binary file not shown.
|
Before Width: | Height: | Size: 301 B |
Binary file not shown.
|
Before Width: | Height: | Size: 307 B |
Binary file not shown.
|
Before Width: | Height: | Size: 418 B |
Binary file not shown.
|
Before Width: | Height: | Size: 345 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 161 B |
Binary file not shown.
|
Before Width: | Height: | Size: 256 B |
Binary file not shown.
|
Before Width: | Height: | Size: 468 B |
Binary file not shown.
|
Before Width: | Height: | Size: 176 B |
Binary file not shown.
|
Before Width: | Height: | Size: 390 B |
Binary file not shown.
|
Before Width: | Height: | Size: 331 B |
Binary file not shown.
|
Before Width: | Height: | Size: 278 B |
Binary file not shown.
|
Before Width: | Height: | Size: 302 B |
Binary file not shown.
|
Before Width: | Height: | Size: 288 B |
Binary file not shown.
|
Before Width: | Height: | Size: 369 B |
Binary file not shown.
|
Before Width: | Height: | Size: 247 B |
Binary file not shown.
|
Before Width: | Height: | Size: 271 B |
Binary file not shown.
|
Before Width: | Height: | Size: 428 B |
Binary file not shown.
|
Before Width: | Height: | Size: 389 B |
Binary file not shown.
|
Before Width: | Height: | Size: 418 B |
Binary file not shown.
|
Before Width: | Height: | Size: 366 B |
Binary file not shown.
|
Before Width: | Height: | Size: 295 B |
Binary file not shown.
|
Before Width: | Height: | Size: 396 B |
Binary file not shown.
|
Before Width: | Height: | Size: 710 B |
Binary file not shown.
|
Before Width: | Height: | Size: 371 B |
Binary file not shown.
|
Before Width: | Height: | Size: 279 B |
Binary file not shown.
|
Before Width: | Height: | Size: 366 B |
Binary file not shown.
|
Before Width: | Height: | Size: 163 B |
Binary file not shown.
|
Before Width: | Height: | Size: 272 B |
Binary file not shown.
|
Before Width: | Height: | Size: 327 B |
Binary file not shown.
|
Before Width: | Height: | Size: 347 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user