Merge branch 'fix/service-command-issue' into 'main_dev'

fix: 修复服务命令下发同步异步方式&&过滤只读输入参数 See merge request yunteng/thingskit-scada!84

Merge branch 'fix/service-command-issue' into 'main_dev'
fix: 修复服务命令下发同步异步方式&&过滤只读输入参数 See merge request yunteng/thingskit-scada!84
xp.Huang
2 parents 2638b4c5 8ec548e9
Showing 2 changed files with 37 additions and 21 deletions
src/main/webapp/js/diagramly/App.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/diagramly/App.js
View file @52661c2
+++ b/src/main/webapp/js/diagramly/App.js
View file @52661c2
@@ -5336,7 +5336,6 @@ App.prototype.save = function (name, done) {
 				file.saveAs(name, success, error)
 			}
-			console.log('file', file)
 		} catch (err) {
 			error(err);
 		}
--- a/src/main/webapp/js/grapheditor/Format.js
View file @52661c2
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @52661c2
@@ -7537,7 +7537,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             /**
              * @description 标识符号
              */
-            IDENTIFIER: 'identifier'
+            IDENTIFIER: 'identifier',
+
+            /**
+             * @description 服务调用方式
+             */
+            CALL_TYPE: 'callType'
         }
         /**
@@ -7656,6 +7661,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 [enumGetValue[content.type]]: content.value,
                 // 参数设置
+                [enumConst.CALL_TYPE]: content[enumConst.CALL_TYPE],
                 [enumConst.IDENTIFIER]: content[enumConst.IDENTIFIER],
                 [enumConst.JSON_COMMAND]: content[enumConst.JSON_COMMAND],
                 [enumConst.WAY]: content[enumConst.WAY] || enumWayType.ONE_WAY,
@@ -7711,10 +7717,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'none' })
                 $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'none' })
                 // $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'flex' })
-                $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'block' })
                 $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'block' })
                 $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: isCustom ? 'none' : 'block' })
+                $(`#${enumActionEl.WAY_SELECT}`).css({ display: isCustom ? 'block' : 'none' })
                 $(`#${enumActionEl.SERVICE_EL}`).css({ display: isCustom ? 'none' : 'block' })
                 $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: isTCP && isCustom ? 'block' : 'none' })
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCP && isCustom ? 'flex' : 'none' })
@@ -7787,6 +7793,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     type: formVal[enumConst.ACTION],
                     value: formVal[enumGetValue[formVal[enumConst.ACTION]]],
                     ...(isParamsSetting ? {
+                        [enumConst.CALL_TYPE]: formVal[enumConst.CALL_TYPE],
                         [enumConst.IDENTIFIER]: formVal[enumConst.IDENTIFIER],
                         [enumConst.JSON_COMMAND]: formVal[enumConst.JSON_COMMAND],
                         [enumConst.WAY]: formVal[enumConst.WAY],
@@ -7871,6 +7878,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 const flag = value === COMMAND_TYPE_ENUM.CUSTOM
                 const isTCPTransportType = transportType === 'TCP'
                 $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: flag ? 'none' : 'block' })
+                $(`#${enumActionEl.WAY_SELECT}`).css({ display: flag ? 'block' : 'none' })
                 $(`#${enumActionEl.SERVICE_EL}`).css({ display: flag ? 'none' : 'block' })
                 $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: isTCPTransportType && flag ? 'block' : 'none' })
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCPTransportType && flag ? 'flex' : 'none' })
@@ -7893,7 +7901,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 } else {
                     form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_COMMAND]: needRender.functionJson?.inputData?.[0]?.serviceCommand || '' })
                 }
-                form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: JSON.stringify(needRender.functionJson?.inputData || []), [enumConst.IDENTIFIER]: needRender?.identifier })
+                form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: JSON.stringify(needRender.functionJson?.inputData || []), [enumConst.IDENTIFIER]: needRender?.identifier, [enumConst.CALL_TYPE]: needRender?.callType })
             })
             try {
@@ -8009,14 +8017,6 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                             </select>
                         </div>
                     </div>
-                    <div class="layui-form-item" id="${enumActionEl.WAY_SELECT}" style="display:none;">
-                        <label class="layui-form-label" style="width: 120px;">单向/双向 ${createHelpMessage(`单向：服务器向网关设备、直连设备发送指令。发送指令后，设备不会返回任何信息。\n
-                        双向：服务器向网关设备、直连设备发送指令。发送指令后，设备返回响应信息。`, 'way')}</label>
-                        <div class="layui-input-block"  style="margin-left: 150px;"> 
-                            <input type="radio" name="${enumConst.WAY}" value="${enumWayType.ONE_WAY}" title="单向" checked>
-                            <input type="radio" name="${enumConst.WAY}" value="${enumWayType.TWO_WAY}" title="双向">
-                        </div>
-                    </div>
                     <div id="${enumActionEl.COMMAND_TYPE_EL}" class="layui-form-item" style="display: none;">
                         <label class="layui-form-label" style="width: 120px;">命令下发方式</label>
                         <div class="layui-input-block" style="margin-left: 150px;">
@@ -8025,6 +8025,14 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                             </select>
                         </div>
                     </div>
+                    <div class="layui-form-item" id="${enumActionEl.WAY_SELECT}" style="display:none;">
+                        <label class="layui-form-label" style="width: 120px;">单向/双向 ${createHelpMessage(`单向：服务器向网关设备、直连设备发送指令。发送指令后，设备不会返回任何信息。\n
+                        双向：服务器向网关设备、直连设备发送指令。发送指令后，设备返回响应信息。`, 'way')}</label>
+                        <div class="layui-input-block"  style="margin-left: 150px;"> 
+                            <input type="radio" name="${enumConst.WAY}" value="${enumWayType.ONE_WAY}" title="单向" checked>
+                            <input type="radio" name="${enumConst.WAY}" value="${enumWayType.TWO_WAY}" title="双向">
+                        </div>
+                    </div>
                     <div class="layui-form-item" id="${enumActionEl.SERVICE_EL}" style="display: none;">
                         <label class="layui-form-label" style="width: 120px;">服务</label>
                         <div class="layui-input-block" style="margin-left: 150px;">
@@ -8036,6 +8044,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         <input type="text" name="${enumConst.IDENTIFIER}" placeholder="标识符" />
                     </div>
                     <div style="display: none;">
+                        <input type="text" name="${enumConst.CALL_TYPE}" placeholder="服务调用方式" />
+                    </div>
+                    <div style="display: none;">
                         <input type="text" name="${enumConst.SERVICE_COMMAND}" placeholder="服务命令" />
                     </div>
                     <div style="display: none;">
@@ -13201,7 +13212,7 @@ class UseLayUi {
     /**
      *
      * @param {{
-     * accessMode: 'r' | 'w',
+     * accessMode: 'r' | 'rw',
      * functionName: string,
      * id: string,
      * identifier: string,
@@ -13217,11 +13228,12 @@ class UseLayUi {
      */
     static genThingsModelInputDataForm(inputData, labelWidth = 80, formFilter = 'inputDataFilter') {
         const list = []
-        inputData.forEach(item => {
-            const { identifier, functionName, dataType = {} } = item
+        for (const item of inputData) {
+            const { identifier, functionName, dataType = {}, accessMode } = item
+            if (accessMode === 'r') continue
             const { type } = dataType
             list.push(UseLayUi.createInputTemplate({ label: functionName, value: identifier, labelWidth, type }))
-        })
+        }
         const template = `
             <form class="layui-form" action="" lay-filter="${formFilter}">
                 ${list.join('')}
@@ -13252,9 +13264,10 @@ class UseLayUi {
         }
         const validate = (item) => {
-            const { dataType, identifier, functionName } = item
+            const { dataType, identifier, functionName, accessMode } = item
             const { type } = dataType || {}
             const identifierValue = value[identifier]
+            if (accessMode === 'r') return true
             switch (type) {
                 case UseLayUi.thingsModelType.INT:
                     if (isNaN(identifierValue)) return error(`${functionName}字段需要一个数字`)
@@ -15906,7 +15919,7 @@ class HandleDataInteraction {
             let flag = false
             let value
-            
+
             if (isCustom) {
                 if (isTCP) {
                     value = content.tcpCommand
@@ -16028,20 +16041,24 @@ class HandleDataInteraction {
         async function defaultHandler(value, callback) {
             let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
-
+            console.log(content)
             /**
              * @type {command: string , commandType: string, service: string, wary: string, tcpCommand: string}
              */
-            let { command, way, tcpCommand } = content
+            let { command, way, service, callType } = content
             const identifier = content?.identifier
             const params = content?.transportType === 'TCP'
                 ? value
                 : identifier
                     ? { [identifier]: value }
                     : value
+
+            if (service) {
+                way = callType === 'ASYNC' ? 'twoway' : 'oneway'
+            }
             const instructionData = {
                 method: "methodThingskit",
-                additionalInfo: { cmdType: 'API' },
+                additionalInfo: { cmdType: service ? '1' : 'API' },
                 persistent: true,
                 params,
             }