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

月流量表、数据完整性表切换&&异常统计优化

Browse Source
This commit is contained in:
zhuxinyu
2023-04-01 21:42:18 +08:00
parent ccf973b8a9
commit 07a905ae8d
13 changed files with 306 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqsMonthFlow.java
View File

@@ -1,21 +0,0 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("pqs_month_flow")
public class PqsMonthFlow extends BaseEntity {
private static final long serialVersionUID = 1L;
private String id;
private String time;
private String actualValue;
private String devId;
}

12
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/PqsMonthFlowMapper.java
View File

@@ -1,12 +0,0 @@
package com.njcn.device.pq.mapper;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.po.PqsMonthFlow;
import org.apache.ibatis.annotations.Param;
public interface PqsMonthFlowMapper extends BaseMapper<PqsMonthFlow> {
float getStatisValueFlow(@Param("devId")String id, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTimem);
}

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -788,7 +788,7 @@
INNER JOIN pq_device b ON vol.pid = b.id INNER JOIN pq_device b ON vol.pid = b.id
INNER JOIN pq_line sub ON dev.pid = sub.id INNER JOIN pq_line sub ON dev.pid = sub.id
INNER JOIN pq_line elc ON sub.pid = elc.id INNER JOIN pq_line elc ON sub.pid = elc.id
LEFT JOIN pqs_month_flow m ON b.id = m.Dev_Id LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id
LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_dev_meal c ON b.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
@@ -826,7 +826,7 @@
INNER JOIN pq_device b ON vol.pid = b.id INNER JOIN pq_device b ON vol.pid = b.id
INNER JOIN pq_line sub ON dev.pid = sub.id INNER JOIN pq_line sub ON dev.pid = sub.id
INNER JOIN pq_line elc ON sub.pid = elc.id INNER JOIN pq_line elc ON sub.pid = elc.id
LEFT JOIN pqs_month_flow m ON b.id = m.Dev_Id LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id
LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_dev_meal c ON b.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
@@ -855,7 +855,7 @@
ifnull(m.Actual_Value,0) statisValue ifnull(m.Actual_Value,0) statisValue
FROM pq_line a FROM pq_line a
INNER JOIN pq_device b ON a.id = b.id INNER JOIN pq_device b ON a.id = b.id
LEFT JOIN pqs_month_flow m ON b.id = m.Dev_Id LEFT JOIN cld_month_flow m ON b.id = m.Dev_Id
LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_dev_meal c ON b.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id

13
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/PqsMonthFlowMapper.xml
View File

@@ -1,13 +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.device.pq.mapper.PqsMonthFlowMapper">
<select id="getStatisValueFlow" resultType="java.lang.Float">
select sum(Actual_Value)
from pqs_month_flow
where Create_Time between #{startTime} and #{endTime}
and
Dev_Id = #{devId};
</select>
</mapper>

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/influxdb/po/Communicate.java
View File

@@ -5,6 +5,8 @@ import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement; import org.influxdb.annotation.Measurement;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime;
import java.util.Date;
/** /**
* <p> * <p>
@@ -29,6 +31,9 @@ public class Communicate {
@Column(name = "time") @Column(name = "time")
private Instant updateTime; private Instant updateTime;
// @Column(name = "time")
// private String updateTime;
@Column(name = "dev_id") @Column(name = "dev_id")
private String devId; private String devId;

48
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/AlarmPO.java
View File

@@ -6,23 +6,35 @@ import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In; import io.swagger.models.auth.In;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) public class AlarmPO implements Serializable {
public class AlarmPO extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 监测点Id * 监测点id
*/ */
private String id; private String id;
/**
* 监测点等级 : 0-极重要 1-重要 2-普通 3-不重要
*/
private Integer level;
/**
* 装置id
*/
private String deviceId; private String deviceId;
private LocalDateTime updateTime; /**
* 装置等级 : 0-极重要 1-重要 2-普通 3-不重要
*/
private Integer deviceLevel;
/** /**
* 告警描述 * 告警描述
@@ -32,13 +44,10 @@ public class AlarmPO extends BaseEntity {
/** /**
* 监测点告警次数 * 监测点告警次数
*/ */
private Integer alarmCount = 0; private Integer alarmCount;
/**
* 装置下属监测点等级 : 0-极重要 1-重要 2-普通 3-不重要
* */
private Integer level;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone ="GMT+8")
private LocalDateTime updateTime;
/** /**
* 1.装置 2.监测点 * 1.装置 2.监测点
@@ -48,23 +57,23 @@ public class AlarmPO extends BaseEntity {
/** /**
* 理论数据量 * 理论数据量
*/ */
private BigDecimal due; private Integer due;
/** /**
* 实际数据量 * 实际数据量
*/ */
private BigDecimal real; private Integer real;
/** /**
* 数据完整性 * 数据完整性
*/ */
private BigDecimal integrity; private Float integrity;
private Float flowMeal; private Float flowMeal;
private Float statisValue; private Float actualValue;
private Float flowProportion; private Float flowProportion;
@@ -79,5 +88,16 @@ public class AlarmPO extends BaseEntity {
*/ */
private String comOutDesc; private String comOutDesc;
/**
* 在线时间
*/
private Integer online_min;
/**
* 离线时间
*/
private Integer offline_min;
private float onlineRate;
} }

113
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/LinePO.java
View File

@@ -1,113 +0,0 @@
package com.njcn.prepare.harmonic.pojo.mysql.po.line;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
// @TableName("pq_line")
public class LinePO extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 监测点Id
*/
private String id;
/**
* 所属装置id
*/
private String deviceId;
/**
* 父节点（0为根节点）
*/
private String pid;
/**
* 上层所有节点
*/
private String pids;
/**
* 名称
*/
private String name;
/**
* 等级：0-项目名称；1- 工程名称；2-单位；3-部门；4-终端；5-母线；6-监测点
*/
private Integer level;
/**
* 排序（默认为0，有特殊排序需要时候人为输入）
*/
private Integer sort;
/**
* 备注
*/
private String remark;
/**
* 状态 0-删除；1-正常；默认正常
*/
private Integer state;
/**
* 监测点等级
*/
private String lineGrade;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
/**
* 告警描述
*/
private String alarmDesc;
/**
* 监测点告警次数
*/
private Integer alarmCount;
/**
* 1.装置 2.监测点
*/
private Integer alarmDevLineType;
/**
* 在线率
*/
private Float onlineRate;
@ApiModelProperty("数据完整性")
private Float integrity;
@ApiModelProperty("理论数据量")
private Integer due;
@ApiModelProperty("实际数据量")
private Integer real;
@ApiModelProperty("套餐流量")
private Float flowMeal;
@ApiModelProperty("已用流量")
private Float statisValue;
@ApiModelProperty("流量占比")
private Float flowProportion;
}

22
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/po/line/TopMsgPO.java
View File

@@ -4,6 +4,7 @@ import com.njcn.db.bo.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
@Data @Data
@@ -20,6 +21,11 @@ public class TopMsgPO extends BaseEntity {
*/ */
private String devId; private String devId;
/**
* 装置等级 : 0-极重要 1-重要 2-普通 3-不重要
*/
private Integer deviceLevel;
/** /**
* 通信中断次数 * 通信中断次数
*/ */
@@ -30,15 +36,17 @@ public class TopMsgPO extends BaseEntity {
*/ */
private List<String> comOutDesc; private List<String> comOutDesc;
private String comOutDescription;
/** /**
* 数据完整性标识 0.不达标 1.达标 * 数据完整性标识 0.不达标 1.达标
*/ */
private String integrityFlag; private Integer integrityFlag;
/** /**
* 数据完成性百分比 * 数据完成性百分比
*/ */
private Integer integrityValue; private Float integrityValue;
/** /**
* 告警次数 * 告警次数
@@ -50,6 +58,8 @@ public class TopMsgPO extends BaseEntity {
*/ */
private String alarmDesc; private String alarmDesc;
private Integer alarmCountFlag;
/** /**
* 流量超标标识 0.不达标 1.达标 * 流量超标标识 0.不达标 1.达标
*/ */
@@ -60,6 +70,14 @@ public class TopMsgPO extends BaseEntity {
*/ */
private float flowValue; private float flowValue;
private Integer onlineRateFlag;
private float onlineRateValue;
private Integer offtimeValue;
private Integer offtimeFlag;
/** /**
* 状态 0.删除 1.正常 * 状态 0.删除 1.正常
*/ */

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceAbnormalController.java
View File

@@ -15,6 +15,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
@Slf4j @Slf4j
@Api(tags = "终端异常") @Api(tags = "终端异常")
@RestController @RestController
@@ -28,7 +30,7 @@ public class DeviceAbnormalController extends BaseController {
@PostMapping("/statistics") @PostMapping("/statistics")
@ApiOperation("终端异常统计") @ApiOperation("终端异常统计")
@ApiImplicitParam(name = "param", value = "参数", required = true) @ApiImplicitParam(name = "param", value = "参数", required = true)
public HttpResult<Boolean> dailyDeviceAbnormaStatistics(@RequestBody DeviceAbnormaStatisticsParam param){ public HttpResult<Boolean> dailyDeviceAbnormaStatistics(@RequestBody DeviceAbnormaStatisticsParam param) throws ParseException {
String methodDescribe = getMethodDescribe("dailyDeviceAbnormaStatistics"); String methodDescribe = getMethodDescribe("dailyDeviceAbnormaStatistics");
boolean res = deviceAbnormaStatisticsService.dailyDeviceAbnormaStatistics(param); boolean res = deviceAbnormaStatisticsService.dailyDeviceAbnormaStatistics(param);
if(res){ if(res){

15
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/DeviceAbnormaStatisticsMapper.java
View File

@@ -3,7 +3,6 @@ package com.njcn.prepare.harmonic.mapper.mysql.device;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.LinePO;
import com.njcn.prepare.harmonic.pojo.mysql.po.line.TopMsgPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.TopMsgPO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@@ -13,11 +12,19 @@ import java.util.List;
@Mapper @Mapper
public interface DeviceAbnormaStatisticsMapper { public interface DeviceAbnormaStatisticsMapper {
List<LinePO> getLines(); /**
* 获取所有有等级监测点以及对应设备
* @return List<AlarmPO>
*/
List<AlarmPO> getLines();
List<AlarmPO> getAlarmByDevice(@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); List<AlarmPO> getFlowAndOnlineRateByDevice(@Param("list") List<String> list,@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
List<AlarmPO> getAlarmByLines(@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime); List<AlarmPO> getIntegrityByLines(@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
List<AlarmPO> getIntegrityByLineIds(@Param("list") List<String> list,@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
List<AlarmPO> getAlarmByLines(@Param("monitorIds") List<String> monitorIds,@Param("devIds") List<String> devIds,@Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
Boolean insertTopMsg(@Param("list") List<TopMsgPO> topMsgPOS); Boolean insertTopMsg(@Param("list") List<TopMsgPO> topMsgPOS);

204
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/device/mapping/DeviceAbnormaStatisticsMapper.xml
View File

@@ -13,6 +13,8 @@
`Alarm_Desc`, `Alarm_Desc`,
`Flow_Flag`, `Flow_Flag`,
`Flow_Value`, `Flow_Value`,
`OnlineRate_Flag`,
`OnlineRate_Value`,
`State` `State`
) VALUES ) VALUES
<foreach collection="list" separator="," item="item"> <foreach collection="list" separator="," item="item">
@@ -20,106 +22,30 @@
now(), now(),
#{item.devId}, #{item.devId},
#{item.comOutCount}, #{item.comOutCount},
#{item.comOutDesc}, #{item.comOutDescription},
#{item.integrityFlag}, #{item.integrityFlag},
#{item.integrityValue}, #{item.integrityValue},
IFNULL(#{item.alarmCount},0), IFNULL(#{item.alarmCount},0),
#{item.alarmDesc}, #{item.alarmDesc},
#{item.flowFlag}, #{item.flowFlag},
#{item.flowValue}, #{item.flowValue},
#{item.onlineRateFlag},
#{item.onlineRateValue},
1 1
) )
</foreach> </foreach>
</insert> </insert>
<select id="getLines" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.LinePO"> <select id="getLines" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
(SELECT line.Id AS Id, SELECT line.Id AS id,
device.id AS deviceId, device.Id AS deviceId,
COUNT(ca.Id) AS alarmCount, sdd.Algo_Describe AS level,
GROUP_CONCAT(ca.Remark) AS alarmDesc device.Update_Time AS updateTime
FROM pq_line line FROM pq_line line
INNER JOIN pq_line vol ON line.pid=vol.id INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id INNER JOIN pq_line device ON vol.pid=device.id
LEFT JOIN pq_device pd ON device.id=pd.id LEFT JOIN pq_device pd ON device.id=pd.id
LEFT JOIN pq_line_detail pld ON pld.id=line.id LEFT JOIN pq_line_detail pld ON pld.id=line.id
LEFT JOIN cld_alarm ca ON ca.Line_Id=line.id
WHERE
pd.Dev_Model=1
AND
pd.Run_Flag=0
AND
pld.Line_Grade is NOT NULL
GROUP BY deviceId)
UNION ALL
(SELECT device.Id AS Id,
device.id AS deviceId,
COUNT(ca.Id) AS alarmCount,
GROUP_CONCAT(ca.Remark) AS alarmDesc
FROM pq_line line
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id
LEFT JOIN pq_device pd ON device.id=pd.id
LEFT JOIN pq_line_detail pld ON pld.id=line.id
LEFT JOIN cld_alarm ca ON ca.Line_Id=device.id
WHERE
pd.Dev_Model=1
AND
pd.Run_Flag=0
AND
pld.Line_Grade is NOT NULL
GROUP BY deviceId)
</select>
<select id="getAlarmByDevice" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
SELECT t.*,
(t.statisValue)/t.flowMeal flowProportion
FROM
(
SELECT device.Id AS Id,
device.id AS deviceId,
COUNT(ca.Id) AS alarmCount,
GROUP_CONCAT(ca.Remark) AS alarmDesc,
IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + ifnull(d1.flow, 0) flowMeal,
IFNULL(ANY_VALUE(pmf.Actual_Value),0) statisValue,
ANY_VALUE(device.Update_Time) AS updateTime
FROM pq_line line
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id
LEFT JOIN pq_device pd ON device.id=pd.id
LEFT JOIN pq_line_detail pld ON pld.id=line.id
LEFT JOIN cld_alarm ca ON ca.Line_Id=device.id
LEFT JOIN pqs_month_flow pmf ON pmf.Dev_Id=device.id
LEFT JOIN cld_dev_meal c ON device.id = c.line_id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
WHERE
pd.Dev_Model = 1
AND
pd.Run_Flag = 0
AND
pld.Line_Grade is NOT NULL
AND
ca.Occurred_Time between #{startTime} and #{endTime}
GROUP BY deviceId
) t
ORDER BY flowProportion DESC
</select>
<select id="getAlarmByLines" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
SELECT GROUP_CONCAT(line.Id) AS Id,
device.id AS deviceId,
COUNT(ca.Id) AS alarmCount,
GROUP_CONCAT(ca.Remark) AS alarmDesc,
MIN(sdd.Algo_Describe) AS `level`,
IFNULL(SUM(pi.Due),0) AS due,
IFNULL(SUM(pi.Real),0) AS `real`
FROM pq_line line
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id
LEFT JOIN pq_device pd ON device.id=pd.id
LEFT JOIN pq_line_detail pld ON pld.id=line.id
LEFT JOIN cld_alarm ca ON ca.Line_Id=line.id
LEFT JOIN pqs_integrity pi ON pi.LINE_Id=line.Id
LEFT JOIN sys_dict_data sdd ON sdd.Id = pld.Line_Grade LEFT JOIN sys_dict_data sdd ON sdd.Id = pld.Line_Grade
WHERE WHERE
pd.Dev_Model=1 pd.Dev_Model=1
@@ -127,11 +53,107 @@
pd.Run_Flag=0 pd.Run_Flag=0
AND AND
pld.Line_Grade is NOT NULL pld.Line_Grade is NOT NULL
AND
ca.Occurred_Time between #{startTime} and #{endTime}
GROUP BY deviceId
ORDER BY alarmCount DESC
</select> </select>
<select id="getIntegrityByLines" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
SELECT line.Id AS Id,
device.id AS deviceId,
IFNULL(SUM(integrity.due_time),0) AS due,
IFNULL(SUM(integrity.real_time),0) AS `real`
FROM pq_line line
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id
LEFT JOIN pq_device pd ON device.id=pd.id
LEFT JOIN pq_line_detail pld ON pld.id=line.id
LEFT JOIN r_stat_integrity_d integrity ON integrity.line_index = line.id
WHERE
pd.Dev_Model=1
AND
pd.Run_Flag=0
AND
pld.Line_Grade is NOT NULL
AND
integrity.time_id BETWEEN #{startTime} AND #{endTime}
GROUP BY device.Id
</select>
<select id="getIntegrityByLineIds" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
SELECT
device.id AS deviceId,
IFNULL(SUM(integrity.due_time),0) AS due,
IFNULL(SUM(integrity.real_time),0) AS `real`
FROM r_stat_integrity_d integrity
INNER JOIN pq_line line ON integrity.line_index = line.id
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id
WHERE integrity.line_index IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
AND
integrity.time_id BETWEEN #{startTime} AND #{endTime}
GROUP BY device.Id
</select>
<select id="getFlowAndOnlineRateByDevice" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
SELECT t.*,
(t.actualValue)/(t.flowMeal) flowProportion
FROM
(
SELECT
cmf.Line_Id deviceId,
IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + IFNULL(d1.flow, 0) flowMeal,
IFNULL(cmf.Actual_Value,0) actualValue,
rsod.online_min/1440 onlineRate
FROM cld_month_flow cmf
LEFT JOIN cld_dev_meal c ON cmf.Line_Id = c.Line_Id
LEFT JOIN cld_flow_meal d ON c.Base_Meal_Id = d.id
LEFT JOIN cld_flow_meal d1 ON c.Ream_Meal_Id = d1.id
LEFT JOIN r_stat_onlinerate_d rsod ON rsod.dev_index = cmf.Line_Id
WHERE cmf.Line_Id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
AND
cmf.Time_Id BETWEEN #{startTime} AND #{endTime}
) t
ORDER BY flowProportion DESC
</select>
<select id="getAlarmByLines" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
(SELECT GROUP_CONCAT(line.Id) AS Id,
device.id AS deviceId,
COUNT(ca.Id) AS alarmCount,
GROUP_CONCAT(ca.Remark) AS alarmDesc
FROM cld_alarm ca
INNER JOIN pq_line line ON ca.Line_Id = line.id
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id
WHERE ca.Line_Id IN
<foreach collection="monitorIds" index="index" item="item1" open="(" separator="," close=")">
#{item1}
</foreach>
AND
ca.Occurred_Time BETWEEN #{startTime} AND #{endTime}
GROUP BY device.Id
ORDER BY alarmCount DESC)
UNION ALL
(SELECT
ca.Line_Id AS Id,
ca.Line_Id AS deviceId,
COUNT(ca.Id) AS alarmCount,
GROUP_CONCAT(ca.Remark) AS alarmDesc
FROM cld_alarm ca
WHERE ca.Line_Id IN
<foreach collection="devIds" index="index" item="item2" open="(" separator="," close=")">
#{item2}
</foreach>
AND
ca.Occurred_Time BETWEEN #{startTime} AND #{endTime}
GROUP BY ca.Line_Id
ORDER BY alarmCount DESC)
</select>
<select id="selectAlarmStrategy" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO"> <select id="selectAlarmStrategy" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO">
SELECT SELECT
A.`Id` id, A.`Id` id,
@@ -143,9 +165,9 @@
A.`Update_Time` updateTime, A.`Update_Time` updateTime,
B.Algo_Describe algoDesc B.Algo_Describe algoDesc
FROM FROM
pqs_alarm_strategy A, pqs_alarm_strategy A
sys_dict_data B LEFT JOIN sys_dict_data B ON A.Id = B.Id
WHERE A.State = 1 WHERE A.State = 1
AND A.Id = B.Id
</select> </select>
</mapper> </mapper>

201
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java
View File

@@ -18,6 +18,10 @@ import org.influxdb.impl.InfluxDBResultMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -33,79 +37,128 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist
private final InfluxDbUtils influxDbUtils; private final InfluxDbUtils influxDbUtils;
@Override @Override
public boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) { public boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) throws ParseException {
Map<String, List<TopMsgPO>> comMap = new HashMap<>();Map<String, List<AlarmPO>> devLineMap = new HashMap<>(); Map<String, List<TopMsgPO>> comMap = new HashMap<>();Map<String, List<AlarmPO>> devLineMap = new HashMap<>();
// 获取监测点告警 Map<String, List<AlarmPO>> deviceFlowAndOnlineRateMap = new HashMap<>();
// 获取所有装置以及下属监测点
List<AlarmPO> lines = deviceAbnormaStatisticsMapper.getLines();
// 根据装置id分组
Map<String, List<AlarmPO>> devMap = lines.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId));
// 监测点集合
List<String> monotorIds = lines.stream().map(AlarmPO::getId).collect(Collectors.toList());
// 装置id集合
List<String> devIds = new ArrayList<>(devMap.keySet());
// 获取监测点数据完整性
List<AlarmPO> lineIntegritys = deviceAbnormaStatisticsMapper.getIntegrityByLineIds(
monotorIds,
DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())),
DateUtil.endOfDay(DateUtil.parse(param.getEndTime())));
Map<String, List<AlarmPO>> lineIntegrityMap = lineIntegritys.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId));
List<AlarmPO> lineAlarms = deviceAbnormaStatisticsMapper.getAlarmByLines( List<AlarmPO> lineAlarms = deviceAbnormaStatisticsMapper.getAlarmByLines(
monotorIds,
devIds,
DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())),
DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); DateUtil.endOfDay(DateUtil.parse(param.getEndTime())));
if (CollectionUtil.isNotEmpty(lineAlarms)){ Map<String, List<AlarmPO>> lineAlarmsMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId));
// 根据装置分组
devLineMap = lineAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId));
}
// 获取设备流量 // 获取设备流量
List<AlarmPO> deviceAlarms = deviceAbnormaStatisticsMapper.getAlarmByDevice( List<AlarmPO> deviceFlowAndOnlineRate = deviceAbnormaStatisticsMapper.getFlowAndOnlineRateByDevice(
devIds,
DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())), DateUtil.beginOfDay(DateUtil.parse(param.getBeginTime())),
DateUtil.endOfDay(DateUtil.parse(param.getEndTime()))); DateUtil.endOfDay(DateUtil.parse(param.getEndTime())));
List<String> devs = deviceAlarms.stream().map(AlarmPO::getId).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(deviceFlowAndOnlineRate)) {
deviceFlowAndOnlineRateMap = deviceFlowAndOnlineRate.stream().collect(Collectors.groupingBy(AlarmPO::getDeviceId));
}
// 获取通信中断信息 // 获取通信中断信息
List<TopMsgPO> comMsgs = getCommunicate(devs, param.getBeginTime(), param.getEndTime()); // List<String> list = Arrays.asList("025fa0e4c91f72ad7f1c1bd29026f20a");
List<TopMsgPO> comMsgs = getCommunicate(devIds, param.getBeginTime(), param.getEndTime());
if (CollectionUtil.isNotEmpty(comMsgs)) { if (CollectionUtil.isNotEmpty(comMsgs)) {
comMap = comMsgs.stream().collect(Collectors.groupingBy(TopMsgPO::getDevId)); comMap = comMsgs.stream().collect(Collectors.groupingBy(TopMsgPO::getDevId));
} }
// 整合监测点告警信息、数据完整性以及监测点等级为设备信息
for (AlarmPO deviceAlarm : deviceAlarms) {
if (!devLineMap.containsKey(deviceAlarm.getId())) {
continue;
}
AlarmPO lineAlarm = devLineMap.get(deviceAlarm.getId()).get(0);
deviceAlarm.setAlarmCount(deviceAlarm.getAlarmCount() + lineAlarm.getAlarmCount());
if (lineAlarm.getDue().compareTo(BigDecimal.ZERO) == 0) {
deviceAlarm.setIntegrity(BigDecimal.ZERO);
} else {
deviceAlarm.setIntegrity(lineAlarm.getReal().divide(lineAlarm.getDue(), 2, BigDecimal.ROUND_HALF_UP));
}
if (lineAlarm.getLevel() != null) {
deviceAlarm.setLevel(lineAlarm.getLevel());
}
TopMsgPO topMsgPO = comMap.get(deviceAlarm.getId()).get(0);
deviceAlarm.setComOutNum(topMsgPO.getComOutCount());
deviceAlarm.setComOutDesc(String.join(",",topMsgPO.getComOutDesc()));
}
// 比对告警策略并落表 // 比对告警策略并落表
List<AlarmStrategyVO> alarmStrategyVOS = deviceAbnormaStatisticsMapper.selectAlarmStrategy(); List<AlarmStrategyVO> alarmStrategyVOS = deviceAbnormaStatisticsMapper.selectAlarmStrategy();
List<TopMsgPO> alarmExceptions = new ArrayList<>(); Map<Integer, List<AlarmStrategyVO>> levMap = alarmStrategyVOS.stream().collect(Collectors.groupingBy(AlarmStrategyVO::getAlgoDesc));
Map<Integer, List<AlarmPO>> levelMap = deviceAlarms.stream().collect(Collectors.groupingBy(AlarmPO::getLevel));
for (AlarmStrategyVO strategyVO : alarmStrategyVOS) { // 整合装置信息
if (!levelMap.containsKey(strategyVO.getAlgoDesc())){ List<TopMsgPO> topMsgPOS = new ArrayList<>();
for (Map.Entry<String, List<AlarmPO>> alarmEntry : devMap.entrySet()) {
if (!lineIntegrityMap.containsKey(alarmEntry.getKey()) && !lineAlarmsMap.containsKey(alarmEntry.getKey())
&& !deviceFlowAndOnlineRateMap.containsKey(alarmEntry.getKey()) && !comMap.containsKey(alarmEntry.getKey())) {
continue; continue;
} }
List<AlarmPO> alarmPOS = levelMap.get(strategyVO.getAlgoDesc());
for (AlarmPO alarmPO : alarmPOS) {
TopMsgPO topMsg = new TopMsgPO(); TopMsgPO topMsg = new TopMsgPO();
topMsg.setDevId(alarmPO.getId()); topMsg.setDevId(alarmEntry.getKey());
topMsg.setFlowFlag(1); int deviceLevel = alarmEntry.getValue().stream().mapToInt(AlarmPO::getLevel).min().orElse(-1);
topMsg.setComOutCount(alarmPO.getComOutNum() == null ? 0 : alarmPO.getComOutNum()); topMsg.setDeviceLevel(deviceLevel);
if (alarmPO.getIntegrity().intValue()<strategyVO.getIntegrityValue()) { AlarmStrategyVO alarmStrategyVO = levMap.get(deviceLevel).get(0);
topMsg.setIntegrityFlag("0"); // 数据完整性
topMsg.setIntegrityValue(alarmPO.getIntegrity().intValue()); if (lineIntegrityMap.containsKey(alarmEntry.getKey())) {
Integer due = lineIntegrityMap.get(alarmEntry.getKey()).get(0).getDue();
Integer real = lineIntegrityMap.get(alarmEntry.getKey()).get(0).getReal();
float integrity = BigDecimal.valueOf((float) real *100 / due).setScale(2, RoundingMode.HALF_UP).floatValue();
topMsg.setIntegrityFlag(integrity < alarmStrategyVO.getIntegrityValue() ? 0 : 1);
topMsg.setIntegrityValue(integrity);
} else {
topMsg.setIntegrityFlag(-1);
} }
if (alarmPO.getAlarmCount()>strategyVO.getWarnValue()){ // 装置告警
topMsg.setAlarmCount(alarmPO.getAlarmCount()); if (lineAlarmsMap.containsKey(alarmEntry.getKey())) {
topMsg.setAlarmDesc(alarmPO.getAlarmDesc()); List<AlarmPO> lineAlarmPOS = lineAlarmsMap.get(alarmEntry.getKey());
int alarmCount = lineAlarmPOS.stream().mapToInt(AlarmPO::getAlarmCount).sum();
String alarmDesc = String.join(",", lineAlarmPOS.stream().map(AlarmPO::getAlarmDesc).collect(Collectors.toList()));
topMsg.setAlarmCountFlag(alarmCount > alarmStrategyVO.getWarnValue() ? 0 : 1);
topMsg.setAlarmCount(alarmCount);
topMsg.setAlarmDesc(alarmDesc);
} else {
topMsg.setAlarmCount(0);
} }
if (alarmPO.getStatisValue()>alarmPO.getFlowMeal()) { // 流量和在线率
topMsg.setFlowFlag(0); if (deviceFlowAndOnlineRateMap.containsKey(alarmEntry.getKey())) {
AlarmPO alarmPO = deviceFlowAndOnlineRateMap.get(alarmEntry.getKey()).get(0);
topMsg.setFlowFlag(alarmPO.getActualValue() > alarmPO.getFlowMeal() ? 0 : 1);
topMsg.setOnlineRateFlag(alarmPO.getOnlineRate() *100 < alarmStrategyVO.getOnlineValue() ? 0 : 1);
topMsg.setFlowValue(alarmPO.getFlowProportion()); topMsg.setFlowValue(alarmPO.getFlowProportion());
} topMsg.setOnlineRateValue(alarmPO.getOnlineRate() *100);
alarmExceptions.add(topMsg); } else {
} topMsg.setFlowFlag(-1);
} topMsg.setOnlineRateFlag(-1);
return deviceAbnormaStatisticsMapper.insertTopMsg(alarmExceptions);
} }
if (comMap.containsKey(alarmEntry.getKey())) {
TopMsgPO comOutPO = comMap.get(alarmEntry.getKey()).get(0);
topMsg.setOfftimeFlag(comOutPO.getOfftimeValue() > alarmStrategyVO.getOffTimeValue() ? 0 :1);
topMsg.setComOutCount(comOutPO.getComOutCount());
topMsg.setComOutDescription(String.join(",",comOutPO.getComOutDesc()));
} else {
topMsg.setOfftimeFlag(0);
String updateTime = localDateTimeFormat(alarmEntry.getValue().get(0).getUpdateTime());
long time = DateUtil.endOfDay(DateUtil.parse(param.getEndTime())).getTime() -
alarmEntry.getValue().get(0).getUpdateTime().toInstant(ZoneOffset.ofHours(8)).toEpochMilli();
topMsg.setOfftimeValue((int)(time/1000/60));
topMsg.setComOutCount(1);
topMsg.setComOutDescription(updateTime+"至"+DateUtil.endOfDay(DateUtil.parse(param.getEndTime())));
}
if (topMsg.getFlowFlag() != 1 || topMsg.getIntegrityFlag() != 1 || topMsg.getOfftimeFlag() != 0
|| topMsg.getAlarmCountFlag() != 1 || topMsg.getOnlineRateFlag() != 1) {
topMsgPOS.add(topMsg);
}
public List<TopMsgPO> getCommunicate(List<String> devs, String startTime, String endTime) { }
return deviceAbnormaStatisticsMapper.insertTopMsg(topMsgPOS);
}
public String localDateTimeFormat(LocalDateTime localDateTime) {
// 通过LocalDateTime.atZone方法，使用系统默认时区ZonId.systemDefault()获取Instant实例
ZonedDateTime zonedDateTime = localDateTime.atZone(ZoneId.systemDefault());
Instant instant = zonedDateTime.toInstant();
// 日期格式化
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(instant.toEpochMilli());
return format;
}
public List<TopMsgPO> getCommunicate(List<String> devs, String startTime, String endTime) throws ParseException {
// startTime ="2023-04-02";
// endTime = "2023-04-02";
//组装sql语句 //组装sql语句
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and "); stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(startTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(endTime))).append("' and ");
@@ -125,48 +178,36 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist
if (CollectionUtil.isEmpty(communicates)) { if (CollectionUtil.isEmpty(communicates)) {
return comMsgs; return comMsgs;
} }
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
Map<String, List<Communicate>> comMap = communicates.stream().collect(Collectors.groupingBy(Communicate::getDevId)); Map<String, List<Communicate>> comMap = communicates.stream().collect(Collectors.groupingBy(Communicate::getDevId));
for (Map.Entry<String, List<Communicate>> comEntry : comMap.entrySet()) { for (Map.Entry<String, List<Communicate>> comEntry : comMap.entrySet()) {
TopMsgPO topMsgPO = new TopMsgPO(); List<String> comOutDesc = new ArrayList<>(); TopMsgPO topMsgPO = new TopMsgPO(); List<String> comOutDesc = new ArrayList<>();
topMsgPO.setDevId(comEntry.getKey()); topMsgPO.setDevId(comEntry.getKey());
// 根据日期排序 // 根据日期排序
List<Communicate> sortedList = comEntry.getValue().stream().sorted(Comparator.comparing(Communicate::getUpdateTime)).collect(Collectors.toList()); List<Communicate> sortedList = comEntry.getValue().stream().sorted(Comparator.comparing(Communicate::getUpdateTime)).collect(Collectors.toList());
if (sortedList.size() == 1) { Long mills = 0l;
if (sortedList.get(0).getType() == 0) { if (sortedList.get(0).getType() == 1) {
comOutDesc.add(sortedList.get(0).getUpdateTime()+"至"+DateUtil.endOfDay(DateUtil.parse(endTime))); long time = Date.from(sortedList.get(0).getUpdateTime()).getTime() - DateUtil.beginOfDay(DateUtil.parse(startTime)).getTime();
} else { mills += time;
comOutDesc.add((DateUtil.beginOfDay(DateUtil.parse(startTime)))+"至"+sortedList.get(0).getUpdateTime()); comOutDesc.add((DateUtil.beginOfDay(DateUtil.parse(startTime)))+"至"+formatter.format(Date.from(sortedList.get(0).getUpdateTime())));
} }
} else {
switch (sortedList.get(0).getType()) {
case 0:
for (int i = 0; i <sortedList.size() ; i++) { for (int i = 0; i <sortedList.size() ; i++) {
if (sortedList.get(i).getType()==1) { if (sortedList.get(i).getType()==0 && i<sortedList.size()-1) {
String comOutTime = sortedList.get(i-1).getUpdateTime() +"至"+ sortedList.get(i).getUpdateTime(); long time = Date.from(sortedList.get(i+1).getUpdateTime()).getTime() - Date.from(sortedList.get(i).getUpdateTime()).getTime();
mills += time;
String comOutTime =formatter.format(Date.from(sortedList.get(i).getUpdateTime()))+"至"+ formatter.format(Date.from(sortedList.get(i+1).getUpdateTime()));
comOutDesc.add(comOutTime);
} else if (sortedList.get(i).getType()==0 && i==sortedList.size()-1) {
long time = DateUtil.endOfDay(DateUtil.parse(endTime)).getTime() - Date.from(sortedList.get(i).getUpdateTime()).getTime();
mills += time;
String comOutTime = formatter.format(Date.from(sortedList.get(i).getUpdateTime())) +"至"+ DateUtil.endOfDay(DateUtil.parse(endTime));
comOutDesc.add(comOutTime); comOutDesc.add(comOutTime);
} }
} }
break; topMsgPO.setOfftimeValue( (int)(mills / 1000 / 60));
case 1:
comOutDesc.add((DateUtil.beginOfDay(DateUtil.parse(startTime)))+"至"+sortedList.get(0).getUpdateTime());
for (int i = 0; i <sortedList.size();i++) {
if (sortedList.get(i).getType()==0) {
StringBuilder sb = new StringBuilder();
sb.append(sortedList.get(i).getUpdateTime());
sb.append("至");
sb.append(i==sortedList.size()-1?DateUtil.endOfDay(DateUtil.parse(endTime)):sortedList.get(i+1).getUpdateTime());
comOutDesc.add(sb.toString());
}
}
break;
default:
break;
}
}
topMsgPO.setComOutDesc(comOutDesc); topMsgPO.setComOutDesc(comOutDesc);
// 通信中断次数 // 通信中断次数
topMsgPO.setComOutCount(sortedList.stream().filter(a -> a.getType() == 0).collect(Collectors.toList()).size()); topMsgPO.setComOutCount(comOutDesc.size());
comMsgs.add(topMsgPO); comMsgs.add(topMsgPO);
} }
return comMsgs; return comMsgs;

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/device/DeviceAbnormalStatisticsService.java
View File

@@ -2,6 +2,8 @@ package com.njcn.prepare.harmonic.service.mysql.device;
import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam; import com.njcn.prepare.harmonic.pojo.param.DeviceAbnormaStatisticsParam;
import java.text.ParseException;
public interface DeviceAbnormalStatisticsService { public interface DeviceAbnormalStatisticsService {
boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param); boolean dailyDeviceAbnormaStatistics(DeviceAbnormaStatisticsParam param) throws ParseException;
} }