From a69402c8b67d8ce4b698d0c394d15ff43b5d99d0 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期四, 14 十二月 2023 23:17:41 +0800 Subject: [PATCH] 提交正来电子协议解析-3 --- src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 603 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 465 insertions(+), 138 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml index 9db29e6..d37fa01 100644 --- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml +++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml @@ -25,7 +25,7 @@ </PropertyDef> <PropertyDef name="depotId"> <Property></Property> - <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property> + <Property name="label">浠撳簱缂栫爜</Property> </PropertyDef> <PropertyDef name="type"> <Property></Property> @@ -48,9 +48,9 @@ <Property></Property> <Property name="label">瑙嗛RTSP</Property> </PropertyDef> - <PropertyDef name="provinceProtocol"> + <PropertyDef name="pushProtocol"> <Property></Property> - <Property name="label">鐪佸钩鍙板崗璁�</Property> + <Property name="label">涓婅鍗忚</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property> <Property name="keyProperty">code</Property> @@ -58,19 +58,9 @@ </Property> <Property name="required">true</Property> </PropertyDef> - <PropertyDef name="pushProtocol"> - <Property></Property> - <Property name="label">涓庣郴缁熼�氳鍗忚</Property> - <Property name="mapping"> - <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayProtocol").getResult()}</Property> - <Property name="keyProperty">code</Property> - <Property name="valueProperty">name</Property> - </Property> - <Property name="required">true</Property> - </PropertyDef> <PropertyDef name="syncProtocol"> <Property></Property> - <Property name="label">涓庤澶囬�氳鍗忚</Property> + <Property name="label">涓嬭鍗忚</Property> <Property name="mapping"> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> @@ -88,7 +78,7 @@ </PropertyDef> <PropertyDef name="httpUrl"> <Property></Property> - <Property name="label">HTTP鍦板潃</Property> + <Property name="label">API璺緞</Property> </PropertyDef> <PropertyDef name="deviceSn"> <Property></Property> @@ -108,27 +98,100 @@ </PropertyDef> <PropertyDef name="depotIdSys"> <Property></Property> - <Property name="label">鑷畾涔変粨搴撶紪鐮�</Property> + <Property name="label">绯荤粺浠撳簱缂栫爜</Property> </PropertyDef> <PropertyDef name="productId"> <Property></Property> - <Property name="label">璁惧绫诲瀷KEY</Property> + <Property name="label">璁惧KEY</Property> </PropertyDef> <PropertyDef name="cableRule"> - <Property/> + <Property></Property> <Property name="label">甯冪嚎瑙勫垯</Property> </PropertyDef> <PropertyDef name="cableCir"> - <Property/> + <Property></Property> <Property name="label">绛掍粨灞傝鍒�</Property> + </PropertyDef> + <PropertyDef name="position"> + <Property></Property> + <Property name="label">浣嶇疆</Property> + </PropertyDef> + <PropertyDef name="status"> + <Property></Property> + <Property name="label">鍦ㄧ嚎鐘舵��</Property> + <Property name="mapping"> + <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerOnline").getResult()}</Property> + <Property name="keyProperty">code</Property> + <Property name="valueProperty">name</Property> + </Property> + </PropertyDef> + <PropertyDef name="onlineTime"> + <Property name="dataType">DateTime</Property> + <Property name="label">鏈�鍚庝笂绾挎椂闂�</Property> + </PropertyDef> + <PropertyDef name="cableStart"> + <Property></Property> + <Property name="label">鐢电紗寮�濮�</Property> + </PropertyDef> + <PropertyDef name="cableEnd"> + <Property></Property> + <Property name="label">鐢电紗鎴嚦</Property> + </PropertyDef> + <PropertyDef name="thAddr"> + <Property></Property> + <Property name="label">娓╂箍搴﹀湴鍧�</Property> + </PropertyDef> + <PropertyDef name="cableFormat"> + <Property></Property> + <Property name="label">鐢电紗鍒跺紡</Property> + </PropertyDef> + <PropertyDef name="cableType"> + <Property></Property> + <Property name="label">鐢电紗绫诲瀷</Property> + </PropertyDef> + </DataType> + <DataType name="dtParam" parent="Map"> + <PropertyDef name="start"> + <Property name="dataType">DateTime</Property> + </PropertyDef> + <PropertyDef name="end"> + <Property name="dataType">DateTime</Property> + </PropertyDef> + <PropertyDef name="dayTime"> + <Property name="dataType">Date</Property> + <Property name="label">閫夋嫨鏃堕棿</Property> + </PropertyDef> + <PropertyDef name="weight"> + <Property name="label">閲嶉噺</Property> + <Property name="dataType">Double</Property> + <Property name="defaultValue">0.0</Property> + </PropertyDef> + <PropertyDef name="carNumber"> + <Property name="label">杞︾墝</Property> + </PropertyDef> + <PropertyDef name="deviceId"> + <Property></Property> + <Property name="label">璁惧ID</Property> + <Property name="required">true</Property> + </PropertyDef> + <PropertyDef name="bizType"> + <Property name="label">鍔ㄤ綔浜嬩欢</Property> </PropertyDef> </DataType> </Model> <View layout="regionPadding:10"> <Property name="packages">font-awesome,css-common</Property> + <Property name="styleSheetFile">./static/lib/jquery/jquery-3.4.1.min.js</Property> <DataSet id="dsMain"> <Property name="dataType">[dtMain]</Property> <Property name="dataProvider">gatewayDeviceService#listAll</Property> + </DataSet> + <DataSet id="dsQuery"> + <ClientEvent name="onReady">self.insert({
 + weight:2500,
 + carNumber:"宸滱15U7M"
 +});</ClientEvent> + <Property name="dataType">dtParam</Property> </DataSet> <ToolBar> <ToolBarLabel> @@ -181,10 +244,106 @@ <Property name="width">90</Property> <Property name="exClassName">toolbar-button-warn</Property> </ToolBarButton> + <Separator/> + <ToolBarButton> + <ClientEvent name="onClick">view.get("#dialogGrain").show();</ClientEvent> + <Property name="caption">kafka绮儏鎺ㄩ�佽皟璇�</Property> + <Property name="iconClass">fa fa-wrench</Property> + <Property name="exClassName">toolbar-button-push</Property> + </ToolBarButton> + <ToolBarButton> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var param = {
 + deviceId:data.get("deviceId"),
 + bizType:"testGrain"
 +}
 +testDevice(param);</ClientEvent> + <Property name="caption">绮儏璋冭瘯</Property> + <Property name="iconClass">fa fa-wrench</Property> + <Property name="exClassName">toolbar-button-push</Property> + </ToolBarButton> + <ToolBarButton> + <ClientEvent name="onClick">view.get("#dialogWeight").show();</ClientEvent> + <Property name="caption">鍦扮璋冭瘯</Property> + <Property name="iconClass">fa fa-wrench</Property> + <Property name="exClassName">toolbar-button-push</Property> + </ToolBarButton> + <ToolBarButton> + <ClientEvent name="onClick">view.get("#dialogLpr").show();
 +</ClientEvent> + <Property name="caption">杞︾墝璇嗗埆璋冭瘯</Property> + <Property name="iconClass">fa fa-wrench</Property> + <Property name="exClassName">toolbar-button-push</Property> + </ToolBarButton> + <Separator/> + <ToolBarButton> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var param = {
 + deviceId:data.get("deviceId"),
 + bizType:"initLpr"
 +}
 +initLpr(param);</ClientEvent> + <Property name="caption">杞︾墝璇嗗埆鍒濆鍖�</Property> + <Property name="iconClass">fa fa-wrench</Property> + <Property name="exClassName">toolbar-button-push</Property> + </ToolBarButton> + <Separator/> + <MenuButton> + <Property name="caption">涓嬭鍒嗘満璋冭瘯</Property> + <Property name="exClassName">toolbar-button-push</Property> + <Property name="iconClass">fa fa-wrench</Property> + <MenuItem> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var param = {
 + deviceId:data.get("deviceId"),
 + bizType:"syncConf"
 +}
 +testIde(param);</ClientEvent> + <Property name="caption">杩滅▼鑾峰彇閰嶇疆</Property> + </MenuItem> + <MenuItem> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var param = {
 + deviceId:data.get("deviceId"),
 + bizType:"writeConf"
 +}
 +testIde(param);</ClientEvent> + <Property name="caption">鍐欏叆鍙傛暟</Property> + </MenuItem> + <MenuItem> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var param = {
 + deviceId:data.get("deviceId"),
 + bizType:"initParam"
 +}
 +
 +testIde(param);</ClientEvent> + <Property name="caption">鍒濆鍖栧垎鏈哄弬鏁�</Property> + </MenuItem> + <MenuItem> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var param = {
 + deviceId:data.get("deviceId"),
 + bizType:"disconnect"
 +}
 +
 +testIde(param);</ClientEvent> + <Property name="caption">涓诲姩鏂紑杩炴帴</Property> + </MenuItem> + <MenuItem> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var param = {
 + deviceId:data.get("deviceId"),
 + bizType:"transparent"
 +}
 +
 +testIde(param);</ClientEvent> + <Property name="caption">淇℃伅閫忎紶璋冭瘯</Property> + </MenuItem> + </MenuButton> </ToolBar> <DataGrid id="dgMain"> <Property name="dataSet">dsMain</Property> - <Property name="selectionMode">multiRows</Property> <Property name="readOnly">true</Property> <RowNumColumn/> <DataColumn name="deviceName"> @@ -206,8 +365,12 @@ <Property name="property">syncProtocol</Property> <Property name="align">center</Property> </DataColumn> - <DataColumn name="pushProtocol"> - <Property name="property">pushProtocol</Property> + <DataColumn name="status"> + <Property name="property">status</Property> + <Property name="align">center</Property> + </DataColumn> + <DataColumn name="onlineTime"> + <Property name="property">onlineTime</Property> <Property name="align">center</Property> </DataColumn> </DataGrid> @@ -236,127 +399,184 @@ </Buttons> <Children> <Container layout="regionPadding:10;padding:10"> - <AutoForm> - <Property name="dataSet">dsMain</Property> - <Property name="cols">*,*,*</Property> - <Property name="labelWidth">125</Property> - <Property name="labelAlign">right</Property> - <Property name="labelSeparator">锛�</Property> - <Property name="labelPosition">left</Property> - <AutoFormElement layoutConstraint="colSpan:2"> - <Property name="name">deviceId</Property> - <Property name="property">deviceId</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">deviceSn</Property> - <Property name="property">deviceSn</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">deviceName</Property> - <Property name="property">deviceName</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">type</Property> - <Property name="property">type</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">productId</Property> - <Property name="property">productId</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">orgId</Property> - <Property name="property">orgId</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">depotId</Property> - <Property name="property">depotId</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">depotIdSys</Property> - <Property name="property">depotIdSys</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">ip</Property> - <Property name="property">ip</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">port</Property> - <Property name="property">port</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">userName</Property> - <Property name="property">userName</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">password</Property> - <Property name="property">password</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">provinceProtocol</Property> - <Property name="property">provinceProtocol</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">pushProtocol</Property> - <Property name="property">pushProtocol</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">syncProtocol</Property> - <Property name="property">syncProtocol</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">serPort</Property> - <Property name="property">serPort</Property> - <Property name="labelWidth">150</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement layoutConstraint="colSpan:2"> - <Property name="name">rtsp</Property> - <Property name="property">rtsp</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement layoutConstraint="colSpan:2"> - <Property name="name">httpUrl</Property> - <Property name="property">httpUrl</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement layoutConstraint="colSpan:3"> - <Property name="name">remark</Property> - <Property name="property">remark</Property> - <Property name="editorType">TextArea</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">cableRule</Property> - <Property name="property">cableRule</Property> - <Editor/> - </AutoFormElement> - <AutoFormElement> - <Property name="name">cableCir</Property> - <Property name="property">cableCir</Property> - <Editor/> - </AutoFormElement> - </AutoForm> + <FieldSet layout="padding:5"> + <Property name="caption">缃戝叧璁惧閰嶇疆</Property> + <Buttons/> + <Children> + <AutoForm> + <Property name="dataSet">dsMain</Property> + <Property name="cols">*,*,*</Property> + <Property name="labelAlign">right</Property> + <Property name="labelSeparator">锛�</Property> + <Property name="labelPosition">left</Property> + <Property name="labelWidth">100</Property> + <AutoFormElement layoutConstraint="colSpan:2"> + <Property name="name">deviceId</Property> + <Property name="property">deviceId</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">deviceName</Property> + <Property name="property">deviceName</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">type</Property> + <Property name="property">type</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">productId</Property> + <Property name="property">productId</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">depotId</Property> + <Property name="property">depotId</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">position</Property> + <Property name="property">position</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement layoutConstraint="colSpan:2"> + <Property name="name">remark</Property> + <Property name="property">remark</Property> + <Editor/> + </AutoFormElement> + </AutoForm> + </Children> + </FieldSet> + <FieldSet layout="padding:5"> + <Property name="caption">涓嬭閫氳璁惧閰嶇疆</Property> + <Buttons/> + <Children> + <AutoForm> + <Property name="dataSet">dsMain</Property> + <Property name="cols">*,*,*</Property> + <Property name="labelWidth">120</Property> + <Property name="labelAlign">right</Property> + <Property name="labelSeparator">锛�</Property> + <Property name="labelPosition">left</Property> + <AutoFormElement layoutConstraint="colSpan:2"> + <Property name="name">deviceSn</Property> + <Property name="property">deviceSn</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">orgId</Property> + <Property name="property">orgId</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">ip</Property> + <Property name="property">ip</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">port</Property> + <Property name="property">port</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">syncProtocol</Property> + <Property name="property">syncProtocol</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">userName</Property> + <Property name="property">userName</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">password</Property> + <Property name="property">password</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">pushProtocol</Property> + <Property name="property">pushProtocol</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement layoutConstraint="colSpan:2"> + <Property name="name">rtsp</Property> + <Property name="property">rtsp</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">status</Property> + <Property name="property">status</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement layoutConstraint="colSpan:2"> + <Property name="name">httpUrl</Property> + <Property name="property">httpUrl</Property> + <Editor/> + </AutoFormElement> + </AutoForm> + </Children> + </FieldSet> + <FieldSet layout="padding:5"> + <Property name="caption">绮儏妫�娴嬪弬鏁伴厤缃�</Property> + <Buttons/> + <Children> + <AutoForm> + <Property name="dataSet">dsMain</Property> + <Property name="cols">*,*,*</Property> + <Property name="labelWidth">120</Property> + <Property name="labelAlign">right</Property> + <Property name="labelSeparator">锛�</Property> + <Property name="labelPosition">left</Property> + <AutoFormElement> + <Property name="name">depotIdSys</Property> + <Property name="property">depotIdSys</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">cableRule</Property> + <Property name="property">cableRule</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">cableCir</Property> + <Property name="property">cableCir</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">cableStart</Property> + <Property name="property">cableStart</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">cableEnd</Property> + <Property name="property">cableEnd</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">thAddr</Property> + <Property name="property">thAddr</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">cableFormat</Property> + <Property name="property">cableFormat</Property> + <Editor/> + </AutoFormElement> + <AutoFormElement> + <Property name="name">cableType</Property> + <Property name="property">cableType</Property> + <Editor/> + </AutoFormElement> + </AutoForm> + </Children> + </FieldSet> </Container> </Children> <Tools/> </Dialog> <UpdateAction id="updateSave"> - <Property name="dataResolver">gatewayDeviceService2#updateSave</Property> + <Property name="dataResolver">gatewayDeviceService#updateSave</Property> <UpdateItem> <Property name="dataPath">[#current]</Property> <Property name="dataSet">dsMain</Property> @@ -367,5 +587,112 @@ <Property name="service">gatewayDeviceService#delData</Property> <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property> </AjaxAction> + <Dialog id="dialogGrain"> + <Property name="width">400</Property> + <Property name="height">300</Property> + <Property name="caption">閫夋嫨鏉′欢</Property> + <Buttons> + <Button> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var query = view.get("#dsQuery.data");
 +var param = {
 + deviceId:data.get("deviceId"),
 + dayTime:query.get("dayTime"),
 + bizType:"ajaxTestKafkaGrain"
 +}
 +testDevice(param);</ClientEvent> + <Property name="caption">纭畾鎵ц</Property> + </Button> + <Button> + <ClientEvent name="onClick">view.get("#dialogGrain").hide();</ClientEvent> + <Property name="caption">鍙栨秷鎵ц</Property> + </Button> + </Buttons> + <Children> + <AutoForm> + <Property name="dataSet">dsQuery</Property> + <Property name="cols">*</Property> + <AutoFormElement> + <Property name="name">dayTime</Property> + <Property name="property">dayTime</Property> + <Editor/> + </AutoFormElement> + </AutoForm> + </Children> + <Tools/> + </Dialog> + <Dialog id="dialogWeight"> + <Property name="width">400</Property> + <Property name="height">300</Property> + <Property name="caption">杈撳叆閲嶉噺</Property> + <Buttons> + <Button> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var query = view.get("#dsQuery.data");
 +var param = {
 + deviceId:data.get("deviceId"),
 + weight:query.get("weight"),
 + bizType:"ajaxTestWeight"
 +}
 +testDevice(param);</ClientEvent> + <Property name="caption">纭畾鎵ц</Property> + </Button> + <Button> + <ClientEvent name="onClick">view.get("#dialogWeight").hide();</ClientEvent> + <Property name="caption">鍙栨秷鎵ц</Property> + </Button> + </Buttons> + <Children> + <AutoForm> + <Property name="dataSet">dsQuery</Property> + <Property name="cols">*</Property> + <AutoFormElement> + <Property name="name">weight</Property> + <Property name="property">weight</Property> + <Editor/> + </AutoFormElement> + </AutoForm> + </Children> + <Tools/> + </Dialog> + <Dialog id="dialogLpr"> + <Property name="width">400</Property> + <Property name="height">300</Property> + <Property name="caption">杈撳叆杞︾墝</Property> + <Buttons> + <Button> + <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 +var query = view.get("#dsQuery.data");
 +var param = {
 + deviceId:data.get("deviceId"),
 + carNumber:query.get("carNumber"),
 + bizType:"ajaxTestLpr"
 +}
 +testDevice(param);</ClientEvent> + <Property name="caption">纭畾鎵ц</Property> + <Property name="action">updateAction1</Property> + </Button> + <Button> + <ClientEvent name="onClick">view.get("#dialogLpr").hide();</ClientEvent> + <Property name="caption">鍙栨秷鎵ц</Property> + </Button> + </Buttons> + <Children> + <AutoForm> + <Property name="dataSet">dsQuery</Property> + <Property name="cols">*</Property> + <AutoFormElement> + <Property name="name">carNumber</Property> + <Property name="property">carNumber</Property> + <Editor/> + </AutoFormElement> + </AutoForm> + </Children> + <Tools/> + </Dialog> + <AjaxAction id="ajaxTestIDE"> + <Property name="confirmMessage">纭畾瑕佹墽琛屼箞锛�</Property> + <Property name="service">gatewayDeviceTestPR#testIde</Property> + </AjaxAction> </View> </ViewConfig> -- Gitblit v1.9.3