From 9a8c8a90c7c01b6bc770d4be5baeff72c058468c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 29 十一月 2024 17:45:04 +0800
Subject: [PATCH] 1
---
src/main/resources/mapper/QxshMapper.xml | 56 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/QxshMapper.xml b/src/main/resources/mapper/QxshMapper.xml
index 528dc56..d273df4 100644
--- a/src/main/resources/mapper/QxshMapper.xml
+++ b/src/main/resources/mapper/QxshMapper.xml
@@ -1,10 +1,11 @@
<?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.yssh.mapper.QxshMapper">
+ <!-- where name = #{name} and Cast(time as signed) between ${start} and ${end} -->
<select id="getNewMonitorData" resultType="com.yssh.entity.SuYuanMonitorData">
select id, format(value, 2) "value", time
from yssh_qxsh
- where name = #{name} and Cast(time as signed) between ${start} and ${end}
+ where name = #{name} and time between '${start}' and '${end}'
order by time desc;
</select>
@@ -30,7 +31,7 @@
with rs as (
select id, name, lon, lat, format(value, 2) "value", time
from yssh_gcsj
- where time between #{start} and #{end} and name like 'AI-%'
+ where time between '${start}' and '${end}' and name like 'AI-%'
)
select id, name, lon, lat, value, time from rs
order by value desc
@@ -51,7 +52,7 @@
<select id="selectWarnByBeginAndEnd" resultType="com.yssh.entity.Qxsh">
select id, name, lon, lat, format(value, 2) "value", time
from yssh_gcsj
- where time between #{start} and #{end} and name like 'AI-%'
+ where time between '${start}' and '${end}' and name like 'AI-%'
and value > (select jcyj from alert_config limit 1) and value <= (select jcbj from alert_config limit 1)
order by time desc, name;
</select>
@@ -59,22 +60,23 @@
<select id="selectAlarmByBeginAndEnd" resultType="com.yssh.entity.Qxsh">
select id, name, lon, lat, format(value, 2) "value", time
from yssh_gcsj
- where time between #{start} and #{end} and name like 'AI-%'
+ where time between '${start}' and '${end}' and name like 'AI-%'
and value > (select jcbj from alert_config limit 1)
order by time desc, name;
</select>
<select id="countMonthForWarn" resultType="java.lang.Integer">
- select count(*)
+ with rs as (select jcyj, jcbj from alert_config limit 1)
+ select count(id)
from yssh_gcsj
- where time between #{start} and #{end} and name like 'AI-%'
- and value > (select jcyj from alert_config limit 1) and value <= (select jcbj from alert_config limit 1);
+ where time between '${start}' and '${end}' and name like 'AI-%'
+ and value > (select jcyj from rs) and value <= (select jcbj from rs);
</select>
<select id="countMonthForAlarm" resultType="java.lang.Integer">
- select count(*)
+ select count(id)
from yssh_gcsj
- where time between #{start} and #{end} and name like 'AI-%'
+ where time between '${start}' and '${end}' and name like 'AI-%'
and value > (select jcbj from alert_config limit 1);
</select>
@@ -82,7 +84,7 @@
with rs as (
select left(time, 8) "createTime"
from yssh_gcsj
- where time between #{start} and #{end} and name like 'AI-%'
+ where time between '${start}' and '${end}' and name like 'AI-%'
and value > (select jcyj from alert_config limit 1) and value <= (select jcbj from alert_config limit 1)
)
select createTime, count(*) "num" from rs group by createTime order by createTime;
@@ -92,25 +94,25 @@
with rs as (
select left(time, 8) "createTime"
from yssh_gcsj
- where time between #{start} and #{end} and name like 'AI-%'
+ where time between '${start}' and '${end}' and name like 'AI-%'
and value > (select jcbj from alert_config limit 1)
)
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
+ select count(id) 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 count(id) from suyuan_46 where su_yuan_id=#{suYuanId} and create_time=#{createTime};
</select>
<select id="select3Hours" resultType="com.yssh.entity.Qxsh">
select id, name, lon, lat, format(value, 2) "value", time
from yssh_gcsj
- where time between #{start} and #{end}
+ where time between '${start}' and '${end}'
and value > (select jcyj from alert_config limit 1) and name like 'AI-%'
order by time, name;
</select>
@@ -118,7 +120,7 @@
<select id="selectForReport" resultType="com.yssh.entity.Qxsh">
select id, name, format(value, 2) "value", time
from yssh_gcsj
- where time between #{start} and #{end}
+ where time between '${start}' and '${end}'
and value > (select jcbj from alert_config limit 1) and name like 'AI-%'
order by time, name;
</select>
@@ -126,14 +128,34 @@
<select id="selectLastYearVal" resultType="java.lang.Double">
select format(value, 2) "value"
from yssh_gcsj
- where time = #{time} and name = #{name}
+ where time = '${time}' and name = #{name}
limit 1;
</select>
<select id="selectByTimeAndName" resultType="com.yssh.entity.Qxsh">
select id, name, lon, lat, format(value, 2) "value", time
from yssh_gcsj
- where time = #{time} and name = #{name}
+ where time = '${time}' and name = #{name}
limit 1;
</select>
+
+ <select id="countGcsjByTime" resultType="java.lang.Integer">
+ select count(id) from yssh_gcsj where time between '${start}' and '${end}';
+ </select>
+
+ <select id="countQxshByTime" resultType="java.lang.Integer">
+ select count(id) from yssh_qxsh where time between #{start} and #{end};
+ </select>
+
+ <select id="countSuYuan46ByTime" resultType="java.lang.Integer">
+ select count(id) from suyuan_46 where create_time between #{start} and #{end};
+ </select>
+
+ <select id="countSuYuan70ByTime" resultType="java.lang.Integer">
+ select count(id) from suyuan_70_70 where create_time between #{start} and #{end};
+ </select>
+
+ <select id="countSuYuanFastByTime" resultType="java.lang.Integer">
+ select count(id) from suyuan_fast where create_time between #{start} and #{end};
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3