Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

组态数据传输功能

Browse Source
This commit is contained in:
xuyang
2023-06-15 09:44:20 +08:00
parent 38ca57c790
commit 83b6087427
5 changed files with 103 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataArrayServiceImpl.java
View File

@@ -39,10 +39,10 @@ public class CsDataArrayServiceImpl extends ServiceImpl<CsDataArrayMapper, CsDat
map.forEach((k,v)->{
List<DataArrayTreeVO> list2 = new ArrayList<>();
DataArrayTreeVO vo1 = new DataArrayTreeVO();
vo1.setId("0");
vo1.setName(k);
vo1.setShowName(k);
v.forEach(item->{
vo1.setId(item.getDataSetId());
DataArrayTreeVO vo2 = new DataArrayTreeVO();
List<DataArrayTreeVO> list3 = new ArrayList<>();
vo2.setId("1");