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

zbj//1.暂降热力图/暂降严重度 代码修改

Browse Source
This commit is contained in:
zhangbaojian
2023-04-27 19:06:27 +08:00
parent 41a8930aa9
commit ea2e7d02b2
5 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java
View File

@@ -27,4 +27,10 @@ public class MonitoringPointScaleParam {
@ApiModelProperty("监测点个数") @ApiModelProperty("监测点个数")
private int count; private int count;
/**
* 次数
*/
@ApiModelProperty("次数")
private int size;
} }

4
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/BaseVO.java
View File

@@ -22,4 +22,8 @@ public class BaseVO {
*/ */
@ApiModelProperty("综合评估") @ApiModelProperty("综合评估")
private String data; private String data;
private int count;
private int size;
} }

40
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/LargeScreenMapper.xml
View File

@@ -12,10 +12,10 @@
#{item} #{item}
</foreach> </foreach>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
</select> </select>
@@ -30,26 +30,26 @@
#{item} #{item}
</foreach> </foreach>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
group by ed.measurement_point_id group by ed.measurement_point_id
</select> </select>
<select id="getTimeCount" resultType="java.util.Map"> <select id="getTimeCount" resultType="java.util.Map">
select select
date(ed.create_time) "day", count(*) "count" date(ed.start_time) "day", count(*) "count"
from r_mp_event_detail ed where ed.measurement_point_id in from r_mp_event_detail ed where ed.measurement_point_id in
<foreach collection="lineIds" item="item" open="(" close=")" separator=","> <foreach collection="lineIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
group by day group by day
</select> </select>
@@ -81,16 +81,16 @@
#{item} #{item}
</foreach> </foreach>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
</select> </select>
<select id="getMiddleDown" resultType="com.njcn.device.pq.pojo.vo.EventVO"> <select id="getMiddleDown" resultType="com.njcn.device.pq.pojo.vo.EventVO">
SELECT SELECT
ed.create_time "time", ed.start_time "time",
pl.`Name` "name", pl.`Name` "name",
ed.advance_reason reason, ed.advance_reason reason,
ed.advance_type "type", ed.advance_type "type",
@@ -104,12 +104,12 @@
#{item} #{item}
</foreach> </foreach>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
order by ed.create_time desc order by ed.start_time desc
</select> </select>
<select id="getMiddleTerminal" resultType="com.njcn.device.pq.pojo.vo.MiddleChildVO"> <select id="getMiddleTerminal" resultType="com.njcn.device.pq.pojo.vo.MiddleChildVO">
@@ -255,7 +255,7 @@
<select id="getMiddleDownChind" resultType="com.njcn.device.pq.pojo.vo.EventVO"> <select id="getMiddleDownChind" resultType="com.njcn.device.pq.pojo.vo.EventVO">
SELECT SELECT
ed.create_time "time", ed.start_time "time",
pl.`Name` "name", pl.`Name` "name",
ed.advance_reason reason, ed.advance_reason reason,
ed.advance_type "type", ed.advance_type "type",
@@ -269,12 +269,12 @@
#{item} #{item}
</foreach> </foreach>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
order by ed.create_time desc order by ed.start_time desc
</select> </select>
<select id="getMiddleLimitRateChild" resultType="com.njcn.device.pq.pojo.vo.MiddleLimitRateVO"> <select id="getMiddleLimitRateChild" resultType="com.njcn.device.pq.pojo.vo.MiddleLimitRateVO">
@@ -347,15 +347,15 @@
<select id="eventLists" resultType="com.njcn.device.pq.pojo.vo.EventVO"> <select id="eventLists" resultType="com.njcn.device.pq.pojo.vo.EventVO">
SELECT SELECT
ed.create_time "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration ed.start_time "time",pl.`Name` "name",ed.advance_reason reason,ed.advance_type "type",ed.feature_amplitude amplitude,ed.duration
from r_mp_event_detail ed from r_mp_event_detail ed
left join pq_line pl on pl.id = ed.measurement_point_id left join pq_line pl on pl.id = ed.measurement_point_id
<where> <where>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
and date_format(ed.create_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &gt;= date_format(#{startTime},'%y%m%d')
</if> </if>
<if test="endTime != null and endTime != ''"> <if test="endTime != null and endTime != ''">
and date_format(ed.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d') and date_format(ed.start_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
</if> </if>
</where> </where>
order by time desc order by time desc

16
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaLineServiceImpl.java
View File

@@ -190,7 +190,7 @@ public class AreaLineServiceImpl implements AreaLineService {
List<String> lineIds = eventdetailList.stream().map(EventHeatDeatilVO::getLineId).collect(Collectors.toList()); List<String> lineIds = eventdetailList.stream().map(EventHeatDeatilVO::getLineId).collect(Collectors.toList());
List<AreaLineInfoVO> areaAnalysisVOList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData(); List<AreaLineInfoVO> areaAnalysisVOList = lineFeignClient.getBaseLineAreaInfo(lineIds).getData();
for (EventHeatDeatilVO eventHeat : eventdetailList) { /* for (EventHeatDeatilVO eventHeat : eventdetailList) {
for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) { for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) {
if (eventHeat.getLineId().equals(areaLineInfoVO.getLineId())) { if (eventHeat.getLineId().equals(areaLineInfoVO.getLineId())) {
List<AreaLineInfoVO> ev = new ArrayList<>(); List<AreaLineInfoVO> ev = new ArrayList<>();
@@ -201,6 +201,16 @@ public class AreaLineServiceImpl implements AreaLineService {
break; break;
} }
} }
}*/
for (AreaLineInfoVO areaLineInfoVO : areaAnalysisVOList) {
List<AreaLineInfoVO> ev = new ArrayList<>();
long count = eventdetailList.stream()
.filter(obj -> obj.getLineId().equals( areaLineInfoVO.getLineId()))
.count();
int c = (int) count;
areaLineInfoVO.setTail(c);
ev.add(areaLineInfoVO);
eventHeatMapDetailList.add(ev);
} }
//获取综合评估 //获取综合评估
List<PQSComAssesPO> comAccessData = largeScreenService.getComAccessData(lineIndexs, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime()); List<PQSComAssesPO> comAccessData = largeScreenService.getComAccessData(lineIndexs, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime());
@@ -211,6 +221,8 @@ public class AreaLineServiceImpl implements AreaLineService {
baseVO.setName(generalDeviceDTO.getName()); baseVO.setName(generalDeviceDTO.getName());
baseVO.setValue(BigDecimal.valueOf(lineIndexs.size())); baseVO.setValue(BigDecimal.valueOf(lineIndexs.size()));
baseVO.setData(String.valueOf(allComAss)); baseVO.setData(String.valueOf(allComAss));
baseVO.setCount(eventdetailList.size());
baseVO.setSize(lineIndexs.size());
listObject.add(baseVO); listObject.add(baseVO);
} }
} else { } else {
@@ -218,6 +230,8 @@ public class AreaLineServiceImpl implements AreaLineService {
baseVO.setName(generalDeviceDTO.getName()); baseVO.setName(generalDeviceDTO.getName());
baseVO.setValue(BigDecimal.valueOf(3.141592)); baseVO.setValue(BigDecimal.valueOf(3.141592));
baseVO.setData("-1"); baseVO.setData("-1");
baseVO.setCount(0);
baseVO.setSize(0);
listObject.add(baseVO); listObject.add(baseVO);
} }
i++; i++;

2
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/LargeScreenServiceImpl.java
View File

@@ -76,6 +76,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
param.setName(generalDeviceDTO.getName()); param.setName(generalDeviceDTO.getName());
param.setIndex(generalDeviceDTO.getIndex()); param.setIndex(generalDeviceDTO.getIndex());
param.setCount(0); param.setCount(0);
param.setSize(0);
list.add(param); list.add(param);
} else { } else {
Map<String, Object> map = largeScreenMapper.selectDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); Map<String, Object> map = largeScreenMapper.selectDownCount(generalDeviceDTO.getLineIndexes(), largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime());
@@ -85,6 +86,7 @@ public class LargeScreenServiceImpl implements LargeScreenService {
String s = map.get("count").toString(); String s = map.get("count").toString();
int count = Integer.parseInt(s); int count = Integer.parseInt(s);
param.setCount(count); param.setCount(count);
param.setSize(generalDeviceDTO.getLineIndexes().size());
list.add(param); list.add(param);
} }
} }