From a9098372191b3c51995d41ee28404d1b71244d98 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 12 十二月 2023 18:41:04 +0800
Subject: [PATCH] 提交网关心跳和设备状态2
---
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 258 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 235 insertions(+), 23 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 cccd044..89f3b83 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -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>
@@ -111,16 +101,74 @@
<Property name="label">鑷畾涔変粨搴撶紪鐮�</Property>
</PropertyDef>
<PropertyDef name="productId">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧绫诲瀷KEY</Property>
+ </PropertyDef>
+ <PropertyDef name="cableRule">
+ <Property></Property>
+ <Property name="label">甯冪嚎瑙勫垯</Property>
+ </PropertyDef>
+ <PropertyDef name="cableCir">
+ <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>
+ </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>
</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>
@@ -173,10 +221,52 @@
<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>
</ToolBar>
<DataGrid id="dgMain">
<Property name="dataSet">dsMain</Property>
- <Property name="selectionMode">multiRows</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
<DataColumn name="deviceName">
@@ -198,8 +288,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>
@@ -296,11 +390,6 @@
<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/>
@@ -326,10 +415,30 @@
<Property name="property">httpUrl</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">position</Property>
+ <Property name="property">position</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>
+ <AutoFormElement>
+ <Property name="name">status</Property>
+ <Property name="property">status</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -338,7 +447,7 @@
<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>
@@ -349,5 +458,108 @@
<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>
</View>
</ViewConfig>
--
Gitblit v1.9.3