From 47a458ca867f700ad8dfe8bccdbb6bf59ca2d301 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 11 May 2021 15:54:02 +0800
Subject: [PATCH] APP接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml | 97 ++++++++++++++++++++++++++++++------------------
1 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
index ff9a139..2dcdb60 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/animalheat/mapper/AnimalHeatMapper.xml
@@ -2,37 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.jfpt.animalheat.mapper.AnimalHeatMapper">
- <!--查询当天体温数据统计-->
- <select id="getAnimalStatis" resultType="java.util.HashMap">
- SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
- TO_DAYS(create_time)=TO_DAYS(now()) and `status`=1
- UNION
- SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
- TO_DAYS(create_time)=TO_DAYS(now()) and `status`=0
- </select>
-
- <!--获取本周的体温统计数据-->
- <select id="getAnimalStatisWeek" resultType="java.util.HashMap">
- SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
- YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1) and `status`=1
- UNION
- SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
- YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1) and `status`=0
- </select>
-
- <!--获取本月的体温统计数据-->
- <select id="getAnimalStatisMonth" resultType="java.util.HashMap">
- SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
- date_format(create_time,'%Y%m') = date_format(now(),'%Y%m') and `status`=1
- UNION
- SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
- date_format(create_time,'%Y%m') = date_format(now(),'%Y%m') and `status`=0
- </select>
-
- <!--查询体温数据的分页数据-->
- <select id="selectAnimalHeatPageList" resultType="org.springblade.jfpt.animalheat.entity.BladeAnimalHeat">
- SELECT * FROM blade_animal_heat
- where 1=1
+ <sql id="animalHeatCondition">
<if test="animalHeatVo.type==0">
and to_days(create_time)=to_days(now())
</if>
@@ -42,13 +12,10 @@
<if test="animalHeatVo.type==2">
and date_format(create_time,'%Y%m') = date_format(now(),'%Y%m')
</if>
- <if test="animalHeatVo.status!=null">
- and status=#{animalHeatVo.status}
- </if>
- <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!='' and animalHeatVo.endTime!=null and animalHeatVo.endTime!='' ">
+ <if test="animalHeatVo.begTime!=null and animalHeatVo.begTime!='' and animalHeatVo.endTime!=null and animalHeatVo.endTime!='' and animalHeatVo.begTime!='undefined' and animalHeatVo.endTime!='undefined' ">
and date(create_time) between #{animalHeatVo.begTime} and #{animalHeatVo.endTime}
</if>
- <if test="animalHeatVo.timeDesc!=null and animalHeatVo.timeDesc!=''">
+ <if test="animalHeatVo.timeDesc!=null and animalHeatVo.timeDesc!='' and animalHeatVo.timeDesc!='undefined'">
<if test="animalHeatVo.timeDesc=='0-2'">
and hour(create_time)>=0 and hour(create_time) <2
</if>
@@ -86,6 +53,43 @@
and hour(create_time)>=22 and hour(create_time) <24
</if>
</if>
+ </sql>
+
+ <!--查询当天体温数据统计-->
+ <select id="getAnimalStatis" resultType="java.util.HashMap">
+ SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
+ TO_DAYS(create_time)=TO_DAYS(now()) and `status`=1
+ UNION
+ SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
+ TO_DAYS(create_time)=TO_DAYS(now()) and `status`=0
+ </select>
+
+ <!--获取本周的体温统计数据-->
+ <select id="getAnimalStatisWeek" resultType="java.util.HashMap">
+ SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
+ YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1) and `status`=1
+ UNION
+ SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
+ YEARWEEK(date_format(create_time,'%Y-%m-%d'),1) = YEARWEEK(now(),1) and `status`=0
+ </select>
+
+ <!--获取本月的体温统计数据-->
+ <select id="getAnimalStatisMonth" resultType="java.util.HashMap">
+ SELECT 1 `name`,count(`status`) value FROM `blade_animal_heat` where
+ date_format(create_time,'%Y%m') = date_format(now(),'%Y%m') and `status`=1
+ UNION
+ SELECT 0 `name`,count(`status`) value FROM `blade_animal_heat` where
+ date_format(create_time,'%Y%m') = date_format(now(),'%Y%m') and `status`=0
+ </select>
+
+ <!--查询体温数据的分页数据-->
+ <select id="selectAnimalHeatPageList" resultType="org.springblade.jfpt.animalheat.entity.BladeAnimalHeat">
+ SELECT * FROM blade_animal_heat
+ where 1=1
+ <if test="animalHeatVo.status!=null">
+ and status=#{animalHeatVo.status}
+ </if>
+ <include refid="animalHeatCondition"></include>
ORDER BY create_time desc
</select>
@@ -192,4 +196,25 @@
on
a.days = b.datetime
</select>
+
+
+ <!--导出体温数据列表-->
+ <select id="exportAnimalHeat" resultType="org.springblade.common.entity.AnimalHeatExcel">
+ SELECT * FROM blade_animal_heat
+ where 1=1
+ <if test="animalHeatVo.status!=null and animalHeatVo.status!='' and animalHeatVo.status!='undefined'">
+ and status=#{animalHeatVo.status}
+ </if>
+ <include refid="animalHeatCondition"></include>
+ ORDER BY create_time desc
+ </select>
+
+ <select id="getAnimalHeatPie" resultType="org.springblade.common.entity.ReportReturnData">
+ select if(1=1,'正常',0) type,ifnull(count(*),0) count from blade_animal_heat where status=0
+ <include refid="animalHeatCondition"></include>
+ union all
+ select if(1=1,'异常',0) type,ifnull(count(*),0) count from blade_animal_heat where status=1
+ <include refid="animalHeatCondition"></include>
+ </select>
+
</mapper>
--
Gitblit v1.9.3