From 8815391f1ea20fd13f77337dc184c6259eeb90b6 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期一, 20 十一月 2023 10:19:38 +0800 Subject: [PATCH] 添加快速溯源统计字段 --- src/main/java/com/yssh/entity/Qxsh.java | 11 +++++++++++ src/main/java/com/yssh/mapper/QxshMapper.java | 2 ++ src/main/java/com/yssh/service/WarningAnalyseService.java | 18 +++++++----------- src/main/resources/mapper/QxshMapper.xml | 5 +++++ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/yssh/entity/Qxsh.java b/src/main/java/com/yssh/entity/Qxsh.java index bfd262a..e4450b3 100644 --- a/src/main/java/com/yssh/entity/Qxsh.java +++ b/src/main/java/com/yssh/entity/Qxsh.java @@ -33,6 +33,9 @@ @ApiModelProperty(value = "鏄惁瀛樺湪婧簮") private Integer isSuYuan; + @ApiModelProperty(value = "鏄惁瀛樺湪蹇�熸函婧�") + private Integer isFast; + public Qxsh() { this.isSuYuan = 0; } @@ -92,4 +95,12 @@ public void setIsSuYuan(Integer isSuYuan) { this.isSuYuan = isSuYuan; } + + public Integer getIsFast() { + return isFast; + } + + public void setIsFast(Integer isFast) { + this.isFast = isFast; + } } diff --git a/src/main/java/com/yssh/mapper/QxshMapper.java b/src/main/java/com/yssh/mapper/QxshMapper.java index 116cbf4..a3557d0 100644 --- a/src/main/java/com/yssh/mapper/QxshMapper.java +++ b/src/main/java/com/yssh/mapper/QxshMapper.java @@ -34,6 +34,8 @@ public List<Map<String, Object>> count7DayForAlarm(@Param("start") Integer start, @Param("end") Integer end); + public Integer countFastSuYuan(@Param("id") String id, @Param("time") String time); + public Integer hasSuYuan(@Param("suYuanId") String suYuanId, @Param("createTime") String createTime); public List<Qxsh> select3Hours(@Param("start") Integer start, @Param("end") Integer end); diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java index 9ff78a9..0263158 100644 --- a/src/main/java/com/yssh/service/WarningAnalyseService.java +++ b/src/main/java/com/yssh/service/WarningAnalyseService.java @@ -344,20 +344,16 @@ continue; } - int isSuYuan = hasSuYuan(qxsh); + String suYuanId = suYuanService.selectSuYuanIdByName(qxsh.getName()); + String createTime = qxsh.getTime().substring(0, 4) + "-" + qxsh.getTime().substring(4, 6) + "-" + qxsh.getTime().substring(6, 8) + " " + qxsh.getTime().substring(8, 10) + ":00:00"; + + Integer isSuYuan = qxshMapper.hasSuYuan(suYuanId, createTime); qxsh.setIsSuYuan(isSuYuan); + + Integer isFast = qxshMapper.countFastSuYuan(suYuanId, createTime); + qxsh.setIsFast(isFast); } return list; - } - - /** - * 鏌ヨ婧簮 - */ - private Integer hasSuYuan(Qxsh qxsh) { - String suYuanId = suYuanService.selectSuYuanIdByName(qxsh.getName()); - String createTime = qxsh.getTime().substring(0, 4) + "-" + qxsh.getTime().substring(4, 6) + "-" + qxsh.getTime().substring(6, 8) + " " + qxsh.getTime().substring(8, 10) + ":00:00"; - - return qxshMapper.hasSuYuan(suYuanId, createTime); } } diff --git a/src/main/resources/mapper/QxshMapper.xml b/src/main/resources/mapper/QxshMapper.xml index 9520544..1e38ae2 100644 --- a/src/main/resources/mapper/QxshMapper.xml +++ b/src/main/resources/mapper/QxshMapper.xml @@ -91,6 +91,11 @@ select createTime, count(*) "num" from rs group by createTime order by createTime; </select> + <select id="countFastSuYuan" resultType="java.lang.Integer"> + select count(*) from suyuan_fast + where su_yuan_id = #{id} and create_time = #{time}; + </select> + <select id="hasSuYuan" resultType="java.lang.Integer"> select count(*) from suyuan_46 where su_yuan_id=#{suYuanId} and create_time=#{createTime}; </select> -- Gitblit v1.9.3