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-21 08:52:23 +08:00
parent c01a9d2c4b
commit 181758075d
11 changed files with 90 additions and 91 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/CsGroArrMapper.java
View File

@@ -2,7 +2,6 @@ package com.njcn.csdevice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.csdevice.pojo.po.CsGroArr;
import com.njcn.csdevice.pojo.vo.CsGroupVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -17,6 +16,6 @@ import java.util.List;
*/
public interface CsGroArrMapper extends BaseMapper<CsGroArr> {
List<CsGroupVO> getGroupArrayList(@Param("list") List<String> list);
void insertList(@Param("list") List<CsGroArr> list);
}

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsGroupMapper.java
View File

@@ -22,11 +22,7 @@ public interface CsGroupMapper extends BaseMapper<CsGroup> {
List<CsGroupVO> getGroupData(@Param("dataSet") String dataSet);
List<CsGroupVO> getGroupData2(@Param("dataSet") String dataSet);
List<CsGroupVO> getArrayData(@Param("list") List<String> list);
void insertList(@Param("list") List<CsGroup> list);
Page<DataGroupTemplateVO> getGroupDataList(IPage<DataGroupTemplateVO> page, @Param("id") String id);
}

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

@@ -2,8 +2,19 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.csdevice.mapper.CsGroArrMapper">
<select id="getGroupArrayList" resultType="CsGroupVO">
</select>
<insert id="insertList">
insert into cs_gro_arr
(
group_id,
array_id
)
values
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.groupId},
#{item.arrayId}
)
</foreach>
</insert>
</mapper>

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

@@ -6,7 +6,8 @@
select
id,
'0' pid,
group_name name
group_name name,
is_show isShow
from
cs_group
where
@@ -14,18 +15,6 @@
order by sort
</select>
<select id="getGroupData2" resultType="CsGroupVO">
select
id,
'0' pid,
group_name name
from
cs_group
where
data_set_id = #{dataSet} and is_show = 1
order by sort
</select>
<select id="getArrayData" resultType="CsGroupVO">
select
t1.id,
@@ -45,31 +34,29 @@
<foreach collection='list' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
and
t2.is_show = 1
order by t1.sort
</select>
<insert id="insertList">
insert into cs_group
(
id,
data_set_id,
group_name,
sort,
is_show
)
values
<foreach collection="list" item="item" index="index" separator=",">
(
#{item.id},
#{item.dataSetId},
#{item.groupName},
#{item.sort},
#{item.isShow}
)
</foreach>
</insert>
<!-- <insert id="insertList">-->
<!-- insert into cs_group-->
<!-- (-->
<!-- id,-->
<!-- data_set_id,-->
<!-- group_name,-->
<!-- sort,-->
<!-- is_show-->
<!-- )-->
<!-- values-->
<!-- <foreach collection="list" item="item" index="index" separator=",">-->
<!-- (-->
<!-- #{item.id},-->
<!-- #{item.dataSetId},-->
<!-- #{item.groupName},-->
<!-- #{item.sort},-->
<!-- #{item.isShow}-->
<!-- )-->
<!-- </foreach>-->
<!-- </insert>-->
<select id="getGroupDataList" resultType="DataGroupTemplateVO">