Commit 6dd9cfe6 authored by 周昊's avatar 周昊
Browse files

Merge branch 'master' into production

parents d492d11f e3f262be

src/main/java/com/censoft/flink/StreamingJob.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ public class StreamingJob { 
            warnPushBase.setStatus("wait");

            warnPushBase.setStatus("wait");

            warnPushBase.setSendUserIds("|1|");

            warnPushBase.setSendUserIds("|1|");

            warnPushBase.setDelFlag(0);

            warnPushBase.setDelFlag(0);

            warnPushBase.setRemark(algorithmPushDto.getRemark());

            return JSON.toJSONString(warnPushBase);

            return JSON.toJSONString(warnPushBase);

        });

        });

src/main/java/com/censoft/flink/domain/AlgorithmPushDto.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,9 @@ public class AlgorithmPushDto { 
    //算法类别 不需要算法传 分类后赋值

    //算法类别 不需要算法传 分类后赋值

    private String algorithmType;

    private String algorithmType;





    //备注 放算法计算后所需信息

    private String remark;











}
 
}

src/main/java/com/censoft/flink/domain/AlgorithmPushResultBoxDto.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -15,4 +15,7 @@ public class AlgorithmPushResultBoxDto { 
    private int y2;

    private int y2;

    //预警标签

    //预警标签

    private String label;

    private String label;



    //备注 放算法所需信息

    private String remark;

}
 
}

src/main/java/com/censoft/flink/domain/AlgorithmWarnPushDto.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -36,4 +36,7 @@ public class AlgorithmWarnPushDto { 




    /** 删除标记 */

    /** 删除标记 */

    private Integer delFlag;

    private Integer delFlag;



    /** 备注 */

    private String remark;

}
 
}

src/main/java/com/censoft/flink/transform/AlarmSecondFilterFunction.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ public class AlarmSecondFilterFunction implements AlgorithmBaseFilterFunction { 
        }

        }





        //判断是否超过报警间隔

        //判断是否超过报警间隔

        if (alarmTimeStamp + alarmSecond * 1000 <= algorithmPushDto.getTimeStamp()) {

        if (alarmTimeStamp + alarmSecond <= algorithmPushDto.getTimeStamp()) {

            cache.put(algorithmType, algorithmPushDto.getTimeStamp());

            cache.put(algorithmType, algorithmPushDto.getTimeStamp());

            return true;

            return true;

        }

        }