From 863b22dd84364ef5a9c4d5057af5063f94e8f346 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 04 九月 2024 03:45:11 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 42 insertions(+), 6 deletions(-) diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml index 5281b89..0564240 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ycl.platform.mapper.CheckIndexCarMapper"> - + <resultMap type="com.ycl.platform.domain.entity.CheckIndexCar" id="CheckIndexCarResult"> <result property="id" column="id" /> <result property="deptId" column="dept_id" /> @@ -28,7 +28,7 @@ <select id="selectCheckIndexCarList" resultMap="CheckIndexCarResult"> select tcic.*,sd.dept_name from t_check_index_car tcic left join sys_dept sd on tcic.dept_id = sd.dept_id - <where> + <where> <if test="deptId != null "> and tcic.dept_id = #{deptId}</if> <if test="examineTag != null "> and examine_tag = #{examineTag}</if> <if test="date != null "> and date_format(tcic.create_time,'%Y-%m') = #{date}</if> @@ -50,12 +50,12 @@ </if> </where> </select> - + <select id="selectCheckIndexCarById" resultMap="CheckIndexCarResult"> <include refid="selectCheckIndexCarVo"/> where id = #{id} </select> - + <insert id="insertCheckIndexCar" useGeneratedKeys="true" keyProperty="id"> insert into t_check_index_car <trim prefix="(" suffix=")" suffixOverrides=","> @@ -115,9 +115,45 @@ </delete> <delete id="deleteCheckIndexCarByIds"> - delete from t_check_index_car where id in + delete from t_check_index_car where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> </delete> -</mapper> \ No newline at end of file + + <select id="selectToday" resultType="com.ycl.platform.domain.entity.CheckIndexCar"> + select * from t_check_index_car where DATE(create_time) = #{today} + </select> + + <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexCar"> + SELECT + IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability, + IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online, + IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent, + IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy, + IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity, + IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy, + IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy, + IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness, + IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability, + IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability + FROM + t_check_index_car + <where> + <if test="deptId != null"> + AND dept_id = #{deptId} + </if> + <if test="dataScope == 1"> + AND examine_tag = 1 + </if> + </where> + ORDER BY + create_time DESC + <if test="deptId == null"> + LIMIT 7 + </if> + <if test="deptId != null"> + LIMIT 1 + </if> + </select> +</mapper> -- Gitblit v1.8.0