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-05-06 11:29:10 +08:00
parent 98eb8c3643
commit 669e843d16
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,6 +71,10 @@ public class TopMsgPO extends BaseEntity {
*/
private float flowValue;
private Integer onlineRateFlag;
private float onlineRateValue;
/**
* 状态 0.删除 1.正常
*/

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

@@ -33,7 +33,8 @@
ptm.Comout_Desc AS comOutDesc,
ptm.Alarm_Count AS alarmCount,
ptm.Alarm_Desc AS alarmDesc,
ptm.Flow_Value AS flowValue
ptm.Flow_Value AS flowValue,
ptm.OnlineRate_Value AS onlineRateValue
FROM pq_line line
INNER JOIN pq_line vol ON line.pid=vol.id
INNER JOIN pq_line device ON vol.pid=device.id

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

@@ -75,25 +75,26 @@
</select>
<select id="getFlowByDevice" resultType="com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO">
SELECT t.*,
(t.actualValue)/(t.flowMeal) flowProportion
SELECT
t.*,
CONVERT((t.actualValue)/(t.flowMeal)*100,DECIMAL(15,2)) flowProportion
FROM
(
SELECT
cmf.Dev_Id deviceId,
DATE_FORMAT(cmf.Time_Id,'%Y-%m') updateTime,
IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + IFNULL(d1.flow, 0) flowMeal,
IFNULL(cmf.Actual_Value/1024/1024,0) actualValue
FROM cld_month_flow cmf
LEFT JOIN cld_dev_meal c ON cmf.Dev_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 cmf.Dev_Id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
AND
DATE_FORMAT(cmf.Time_Id,'%Y-%m') = #{time}
SELECT
cmf.Dev_Id deviceId,
DATE_FORMAT(cmf.Time_Id,'%Y-%m') updateTime,
IFNULL(d.flow, (select flow from cld_flow_meal where type = 0 and flag = 1)) + IFNULL(d1.flow, 0) flowMeal,
IFNULL(cmf.Actual_Value/1024/1024,0) actualValue
FROM cld_month_flow cmf
LEFT JOIN cld_dev_meal c ON cmf.Dev_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 cmf.Dev_Id IN
<foreach collection="list" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
AND
DATE_FORMAT(cmf.Time_Id,'%Y-%m') = #{time}
) t
ORDER BY flowProportion DESC
</select>