From 147428971be43eed90a79f3849f15000d3855390 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 28 九月 2026 15:15:22 +0800
Subject: [PATCH] 实现新威 7.6 直连取数与逐行接收
---
battery-business/src/main/resources/mapper/battery/TDeviceAdapterMapper.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/battery-business/src/main/resources/mapper/battery/TDeviceAdapterMapper.xml b/battery-business/src/main/resources/mapper/battery/TDeviceAdapterMapper.xml
index 5b75ff5..e041146 100644
--- a/battery-business/src/main/resources/mapper/battery/TDeviceAdapterMapper.xml
+++ b/battery-business/src/main/resources/mapper/battery/TDeviceAdapterMapper.xml
@@ -11,6 +11,7 @@
<result property="pollIntervalMs" column="poll_interval_ms"/>
<result property="timezoneId" column="timezone_id"/>
<result property="capabilities" column="capabilities"/>
+ <result property="sourceConfig" column="source_config"/>
<result property="readOnly" column="read_only"/>
<result property="status" column="status"/>
<result property="connectionStatus" column="connection_status"/>
@@ -28,7 +29,7 @@
<sql id="adapterColumns">
adapter_id, adapter_code, adapter_name, adapter_type, host, port, poll_interval_ms, timezone_id,
- capabilities, (json_extract(capabilities, '$.control') = false) read_only, status,
+ capabilities, source_config, (json_extract(capabilities, '$.control') = false) read_only, status,
connection_status, last_error_code, last_error_message, last_attempt_at_utc, last_observed_at_utc,
create_by, create_time, update_by, update_time, remark, del_flag
</sql>
@@ -61,27 +62,29 @@
<!-- 应用装配层提供托管配置；持久化层仅负责按稳定编码幂等恢复。 -->
<insert id="upsertManagedDeviceAdapter" parameterType="TDeviceAdapter">
insert into t_device_adapter(adapter_code, adapter_name, adapter_type, host, port, poll_interval_ms,
- timezone_id, capabilities, status, connection_status, create_by, create_time, update_by, update_time,
+ timezone_id, capabilities, source_config, status, connection_status, create_by, create_time, update_by, update_time,
remark, del_flag)
values(#{adapterCode}, #{adapterName}, #{adapterType}, #{host}, #{port}, #{pollIntervalMs}, #{timezoneId},
- #{capabilities}, '0', 'OFFLINE', 'system', sysdate(), 'system', sysdate(), #{remark}, 0)
+ #{capabilities}, cast(#{sourceConfig} as json), '0', 'OFFLINE', 'system', sysdate(), 'system', sysdate(), #{remark}, 0)
on duplicate key update adapter_name=values(adapter_name), adapter_type=values(adapter_type),
host=values(host), port=values(port), poll_interval_ms=values(poll_interval_ms),
- timezone_id=values(timezone_id), capabilities=values(capabilities), status='0',
+ timezone_id=values(timezone_id), capabilities=values(capabilities), source_config=values(source_config),
+ status='0',
connection_status='OFFLINE', last_error_code=null, last_error_message=null,
update_by='system', update_time=sysdate(), remark=values(remark), del_flag=0
</insert>
<insert id="insertDeviceAdapter" parameterType="TDeviceAdapter" useGeneratedKeys="true" keyProperty="adapterId">
insert into t_device_adapter(adapter_code, adapter_name, adapter_type, host, port, poll_interval_ms,
- timezone_id, capabilities, status, connection_status, create_by, create_time, remark, del_flag)
+ timezone_id, capabilities, source_config, status, connection_status, create_by, create_time, remark, del_flag)
values(#{adapterCode}, #{adapterName}, #{adapterType}, #{host}, #{port}, #{pollIntervalMs},
- #{timezoneId}, #{capabilities}, #{status}, 'OFFLINE', #{createBy}, sysdate(), #{remark}, 0)
+ #{timezoneId}, #{capabilities}, cast(#{sourceConfig} as json), #{status}, 'OFFLINE', #{createBy}, sysdate(), #{remark}, 0)
</insert>
<update id="updateDeviceAdapter" parameterType="TDeviceAdapter">
update t_device_adapter set adapter_name=#{adapterName}, adapter_type=#{adapterType}, host=#{host}, port=#{port},
poll_interval_ms=#{pollIntervalMs}, timezone_id=#{timezoneId}, capabilities=#{capabilities},
+ source_config=cast(#{sourceConfig} as json),
connection_status='OFFLINE', last_error_code=null, last_error_message=null,
update_by=#{updateBy}, update_time=sysdate()
where adapter_id=#{adapterId} and del_flag=0
--
Gitblit v1.7.1