From 17150987f4f80e9c624521c560dd7db6cc20834d Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 17 十一月 2023 15:50:10 +0800
Subject: [PATCH] 调增地磅接口启动
---
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 263 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 230 insertions(+), 33 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 1d47410..e9db492 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -16,8 +16,16 @@
</PropertyDef>
<PropertyDef name="deviceName">
<Property></Property>
- <Property name="label">鍚嶇О</Property>
+ <Property name="label">璁惧鍚嶇О</Property>
<Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="depotName">
+ <Property></Property>
+ <Property name="label">浠撳簱鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
@@ -27,10 +35,6 @@
<Property name="valueProperty">name</Property>
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerGatewayDeviceType").getResult()}</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴撶紪鐮�</Property>
</PropertyDef>
<PropertyDef name="ip">
<Property></Property>
@@ -44,9 +48,9 @@
<Property></Property>
<Property name="label">瑙嗛RTSP</Property>
</PropertyDef>
- <PropertyDef name="provinceProtocol">
- <Property/>
- <Property name="label">鐪佸钩鍙板崗璁�</Property>
+ <PropertyDef name="pushProtocol">
+ <Property></Property>
+ <Property name="label">涓婅鍗忚</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("apiTriggerService#triggerPushProtocol").getResult()}</Property>
<Property name="keyProperty">code</Property>
@@ -54,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>
@@ -95,24 +89,69 @@
<Property name="label">TCP鏈嶅姟绔彛</Property>
</PropertyDef>
<PropertyDef name="userName">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧鐢ㄦ埛鍚�</Property>
</PropertyDef>
<PropertyDef name="password">
- <Property/>
+ <Property></Property>
<Property name="label">璁惧瀵嗙爜</Property>
</PropertyDef>
- <PropertyDef name="depotName">
- <Property/>
- <Property name="label">鎵�灞炰粨搴�</Property>
+ <PropertyDef name="depotIdSys">
+ <Property></Property>
+ <Property name="label">鑷畾涔変粨搴撶紪鐮�</Property>
+ </PropertyDef>
+ <PropertyDef name="productId">
+ <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>
+ </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>
@@ -165,10 +204,40 @@
<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>
</ToolBar>
<DataGrid id="dgMain">
<Property name="dataSet">dsMain</Property>
- <Property name="selectionMode">multiRows</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
<DataColumn name="deviceName">
@@ -176,15 +245,23 @@
</DataColumn>
<DataColumn name="type">
<Property name="property">type</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="productId">
+ <Property name="property">productId</Property>
+ </DataColumn>
+ <DataColumn name="deviceId">
+ <Property name="property">deviceId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">550</Property>
</DataColumn>
<DataColumn name="syncProtocol">
<Property name="property">syncProtocol</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="pushProtocol">
<Property name="property">pushProtocol</Property>
- </DataColumn>
- <DataColumn name="remark">
- <Property name="property">remark</Property>
+ <Property name="align">center</Property>
</DataColumn>
</DataGrid>
<Dialog id="dialogMain">
@@ -194,8 +271,7 @@
<Property name="closeable">false</Property>
<Buttons>
<Button>
- <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
-view.get("#updateSave").execute(function(){
+ <ClientEvent name="onClick">view.get("#updateSave").execute(function(){
self.get("parent").hide();
});</ClientEvent>
<Property name="caption">淇濆瓨淇敼</Property>
@@ -241,6 +317,11 @@
<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/>
@@ -248,6 +329,11 @@
<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>
@@ -270,17 +356,14 @@
<Property name="property">password</Property>
<Editor/>
</AutoFormElement>
- <Control/>
<AutoFormElement>
<Property name="name">pushProtocol</Property>
<Property name="property">pushProtocol</Property>
- <Property name="labelWidth">150</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
<Property name="name">syncProtocol</Property>
<Property name="property">syncProtocol</Property>
- <Property name="labelWidth">150</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -305,6 +388,16 @@
<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>
</Container>
</Children>
@@ -315,11 +408,115 @@
<UpdateItem>
<Property name="dataPath">[#current]</Property>
<Property name="dataSet">dsMain</Property>
+ <Property name="alias">data</Property>
</UpdateItem>
</UpdateAction>
<AjaxAction id="ajaxDel">
<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