Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.报告模板bug

Browse Source
This commit is contained in:
chendaofei
2026-02-11 13:31:06 +08:00
parent fc951e913c
commit 6c91774200
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatDataVDMapper.xml
View File

@@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.rstatlimitrate.mapper.RStatDataVDMapper">
<select id="getFreqDev" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
select
time time,
line_id lineId,
avg(abs(freq_dev)) freqDev,
avg(v_unbalance) vUnbalance
from
r_stat_data_v_d
where
time between #{startTime} and #{endTime}
and phasic_type = 'T'
and value_type = 'MAX'
and line_id IN
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and quality_flag = 0
group by
time,line_id
</select>
<select id="getVuDev" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
select
time time,
line_id lineId,
avg(vu_dev) vuDev
from
r_stat_data_v_d
where
time between #{startTime} and #{endTime}
and phasic_type in ('A','B','C')
and value_type = 'MAX'
and line_id IN
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and quality_flag = 0
group by
time,line_id
</select>
<select id="getVthd" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
select
time time,
line_id lineId,
avg(v_thd) vThd
from
r_stat_data_v_d
where
time between #{startTime} and #{endTime}
and phasic_type in ('A','B','C')
and value_type = 'CP95'
and line_id IN
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and quality_flag = 0
group by
time,line_id
</select>
<select id="getUnbalance" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
select
time time,
line_id lineId,
avg(v_unbalance) vUnbalance
from
r_stat_data_v_d
where
time between #{startTime} and #{endTime}
and phasic_type = 'T'
and value_type = 'CP95'
and line_id IN
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and quality_flag = 0
group by
time,line_id
</select>
<select id="getV" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
select
time time,
line_id lineId,
avg(v_1) v1
from
r_stat_data_v_d
where
time between #{startTime} and #{endTime}
and phasic_type = 'T'
and value_type = 'CP95'
and line_id IN
<foreach collection="list" item="item" separator="," open="(" close=")">
#{item}
</foreach>
and quality_flag = 0
group by
time,line_id
</select>
</mapper>

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
View File

@@ -212,7 +212,7 @@ public class GridServiceImpl implements IGridService {
if (param.getAreaType() == 0) {
AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo();
vo.setDeptId(param.getDeptIndex());
vo.setDeptName("冀北");
vo.setDeptName(deptFeignClient.getDeptById(param.getDeptIndex()).getData().getName());
List<AssessVo> children = new ArrayList<>();
map.forEach((k1, v1) -> {
AssessVo assessVo = new AssessVo();