Merge branch 'fix/control-component-service-identifer' into 'main_dev'

fix: 控制组件调用服务时携带标识符 See merge request yunteng/thingskit-scada!83

Merge branch 'fix/control-component-service-identifer' into 'main_dev'
fix: 控制组件调用服务时携带标识符 See merge request yunteng/thingskit-scada!83
xp.Huang
2 parents 50b90be9 ff27dfce
Showing 1 changed file with 22 additions and 6 deletions
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/grapheditor/Format.js
View file @2638b4c
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @2638b4c
@@ -7532,7 +7532,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
              */
             ATTR_PLACEHOLDER: 'attrPlaceholder',
-            WAY: 'way'
+            WAY: 'way',
+
+            /**
+             * @description 标识符号
+             */
+            IDENTIFIER: 'identifier'
         }
         /**
@@ -7651,6 +7656,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 [enumGetValue[content.type]]: content.value,
                 // 参数设置
+                [enumConst.IDENTIFIER]: content[enumConst.IDENTIFIER],
                 [enumConst.JSON_COMMAND]: content[enumConst.JSON_COMMAND],
                 [enumConst.WAY]: content[enumConst.WAY] || enumWayType.ONE_WAY,
                 [enumConst.COMMAND_TYPE]: content[enumConst.COMMAND_TYPE],
@@ -7781,6 +7787,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     type: formVal[enumConst.ACTION],
                     value: formVal[enumGetValue[formVal[enumConst.ACTION]]],
                     ...(isParamsSetting ? {
+                        [enumConst.IDENTIFIER]: formVal[enumConst.IDENTIFIER],
                         [enumConst.JSON_COMMAND]: formVal[enumConst.JSON_COMMAND],
                         [enumConst.WAY]: formVal[enumConst.WAY],
                         [enumConst.COMMAND_TYPE]: formVal[enumConst.COMMAND_TYPE],
@@ -7867,7 +7874,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 $(`#${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' })
-                form.val(enumActionEl.FORM_FILTER, { [enumConst.TCP_COMMAND]: '', [enumConst.SERVICE]: '', [enumConst.COMMAND]: '' })
+                form.val(enumActionEl.FORM_FILTER, { [enumConst.TCP_COMMAND]: '', [enumConst.SERVICE]: '', [enumConst.COMMAND]: '', [enumConst.IDENTIFIER]: '' })
                 $(`#${enumActionEl.INPUT_DATA_FORM}`).html('')
                 editorAssignValue()
             })
@@ -7886,7 +7893,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 || []) })
+                form.val(enumActionEl.FORM_FILTER, { [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: JSON.stringify(needRender.functionJson?.inputData || []), [enumConst.IDENTIFIER]: needRender?.identifier })
             })
             try {
@@ -8026,6 +8033,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         </div>
                     </div>
                     <div style="display: none;">
+                        <input type="text" name="${enumConst.IDENTIFIER}" placeholder="标识符" />
+                    </div>
+                    <div style="display: none;">
                         <input type="text" name="${enumConst.SERVICE_COMMAND}" placeholder="服务命令" />
                     </div>
                     <div style="display: none;">
@@ -15896,7 +15906,7 @@ class HandleDataInteraction {
             let flag = false
             let value
-
+            
             if (isCustom) {
                 if (isTCP) {
                     value = content.tcpCommand
@@ -15911,6 +15921,7 @@ class HandleDataInteraction {
                 if (isTCP) {
                     value = content.serviceCommand
                     if (value) flag = true
+                    else UseLayUi.topErrorMsg('服务命令为空')
                 } else {
                     value = content.serviceCommand
                     const { flag: validateFlag, value: validateValue } = UseLayUi.validateThingsModelInputDataForm(Utils.stringToJSON(content.serviceOriginalConfiguration), value, true)
@@ -16022,12 +16033,17 @@ class HandleDataInteraction {
              * @type {command: string , commandType: string, service: string, wary: string, tcpCommand: string}
              */
             let { command, way, tcpCommand } = content
-
+            const identifier = content?.identifier
+            const params = content?.transportType === 'TCP'
+                ? value
+                : identifier
+                    ? { [identifier]: value }
+                    : value
             const instructionData = {
                 method: "methodThingskit",
                 additionalInfo: { cmdType: 'API' },
                 persistent: true,
-                params: value,
+                params,
             }
             const [err, res = []] = way === 'twoway' ? await to(ConfigurationNodeApi.deviceIsOnLine(deviceId)) : [null, [{ value: true }]]