组态数据传输功能

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml

@@ -23,6 +23,7 @@
 
     <select id="getData" resultType="DataArrayDTO">
         select
+            t1.id dataSetId,
             t1.another_name dataSetName,
             t0.name dataArrayName,
             t0.another_name dataArrayShowName,
@@ -36,7 +37,7 @@
             <foreach collection='list' item='item' index="index" open='(' separator=',' close=')'>
                 #{item}
             </foreach>
-        group by t1.another_name,t0.name,t0.another_name
+        group by t1.id,t1.another_name,t0.name,t0.another_name
         order by convert (substring_index(group_concat(distinct t0.sort),',',-1),unsigned)
     </select>