From 81ba6f3ea498c43010f47c7ed6d6c0f121bb1f09 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 14:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 65 +++++++-------------------------
1 files changed, 14 insertions(+), 51 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 6f11cfc..ce044f0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -21,18 +21,12 @@
<result property="keyVideoAvailable" column="key_video_available" />
<result property="keyAnnotationAccuracy" column="key_annotation_accuracy" />
<result property="keyTimingAccuracy" column="key_timing_accuracy" />
- <result property="keyCommandImageInspection" column="key_command_image_inspection" />
- <result property="keyCommandImageDirectoryTree" column="key_command_image_directory_tree" />
- <result property="onlineInspectionPlatform" column="online_inspection_platform" />
- <result property="videoTransmissionAssetsAccuracy" column="video_transmission_assets_accuracy" />
- <result property="videoTransmissionAssetsWeakPasswordScore" column="video_transmission_assets_weak_password_score" />
- <result property="videoTransmissionDangerousAssetsScore" column="video_transmission_dangerous_assets_score" />
- <result property="videoTransmissionBoundaryIntegrityDetection" column="video_transmission_boundary_integrity_detection" />
- <result property="operatingRate" column="operating_rate" />
+ <result property="keyCommandImageOnline" column="key_command_image_online" />
+ <result property="imageResourceSecurity" column="image_resource_security" />
</resultMap>
<sql id="selectCheckIndexVideoVo">
- select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, annotation_accuracy, timing_accuracy, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_inspection, key_command_image_directory_tree, online_inspection_platform, video_transmission_assets_accuracy, video_transmission_assets_weak_password_score, video_transmission_dangerous_assets_score, video_transmission_boundary_integrity_detection, operating_rate from t_check_index_video
+ select id, dept_id, create_time, examine_tag, platform_online, monitor_qualification, monitor_registration, archives_rate, site_online, video_available, annotation_accuracy, timing_accuracy, key_site_online, key_video_available, key_annotation_accuracy, key_timing_accuracy, key_command_image_online,image_resource_security from t_check_index_video
</sql>
<select id="selectCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
@@ -56,14 +50,8 @@
<if test="keyVideoAvailable != null "> and key_video_available = #{keyVideoAvailable}</if>
<if test="keyAnnotationAccuracy != null "> and key_annotation_accuracy = #{keyAnnotationAccuracy}</if>
<if test="keyTimingAccuracy != null "> and key_timing_accuracy = #{keyTimingAccuracy}</if>
- <if test="keyCommandImageInspection != null "> and key_command_image_inspection = #{keyCommandImageInspection}</if>
- <if test="keyCommandImageDirectoryTree != null "> and key_command_image_directory_tree = #{keyCommandImageDirectoryTree}</if>
- <if test="onlineInspectionPlatform != null "> and online_inspection_platform = #{onlineInspectionPlatform}</if>
- <if test="videoTransmissionAssetsAccuracy != null "> and video_transmission_assets_accuracy = #{videoTransmissionAssetsAccuracy}</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null "> and video_transmission_assets_weak_password_score = #{videoTransmissionAssetsWeakPasswordScore}</if>
- <if test="videoTransmissionDangerousAssetsScore != null "> and video_transmission_dangerous_assets_score = #{videoTransmissionDangerousAssetsScore}</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null "> and video_transmission_boundary_integrity_detection = #{videoTransmissionBoundaryIntegrityDetection}</if>
- <if test="operatingRate != null "> and operating_rate = #{operatingRate}</if>
+ <if test="keyCommandImageOnline != null "> and key_command_image_online = #{keyCommandImageOnline}</if>
+ <if test="imageResourceSecurity != null "> and image_resource_security = #{imageResourceSecurity}</if>
<if test="deptIds != null ">and tciv.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
#{deptId}
@@ -95,15 +83,9 @@
<if test="keyVideoAvailable != null">key_video_available,</if>
<if test="keyAnnotationAccuracy != null">key_annotation_accuracy,</if>
<if test="keyTimingAccuracy != null">key_timing_accuracy,</if>
- <if test="keyCommandImageInspection != null">key_command_image_inspection,</if>
- <if test="keyCommandImageDirectoryTree != null">key_command_image_directory_tree,</if>
- <if test="onlineInspectionPlatform != null">online_inspection_platform,</if>
- <if test="videoTransmissionAssetsAccuracy != null">video_transmission_assets_accuracy,</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null">video_transmission_assets_weak_password_score,</if>
- <if test="videoTransmissionDangerousAssetsScore != null">video_transmission_dangerous_assets_score,</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null">video_transmission_boundary_integrity_detection,</if>
- <if test="operatingRate != null">operating_rate,</if>
- </trim>
+ <if test="keyCommandImageOnline != null">key_command_image_online,</if>
+ <if test="imageResourceSecurity != null">image_resource_security,</if>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deptId != null">#{deptId},</if>
<if test="createTime != null">#{createTime},</if>
@@ -120,14 +102,8 @@
<if test="keyVideoAvailable != null">#{keyVideoAvailable},</if>
<if test="keyAnnotationAccuracy != null">#{keyAnnotationAccuracy},</if>
<if test="keyTimingAccuracy != null">#{keyTimingAccuracy},</if>
- <if test="keyCommandImageInspection != null">#{keyCommandImageInspection},</if>
- <if test="keyCommandImageDirectoryTree != null">#{keyCommandImageDirectoryTree},</if>
- <if test="onlineInspectionPlatform != null">#{onlineInspectionPlatform},</if>
- <if test="videoTransmissionAssetsAccuracy != null">#{videoTransmissionAssetsAccuracy},</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null">#{videoTransmissionAssetsWeakPasswordScore},</if>
- <if test="videoTransmissionDangerousAssetsScore != null">#{videoTransmissionDangerousAssetsScore},</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null">#{videoTransmissionBoundaryIntegrityDetection},</if>
- <if test="operatingRate != null">#{operatingRate},</if>
+ <if test="keyCommandImageOnline != null">#{keyCommandImageOnline},</if>
+ <if test="imageResourceSecurity != null">#{imageResourceSecurity},</if>
</trim>
</insert>
@@ -149,14 +125,8 @@
<if test="keyVideoAvailable != null">key_video_available = #{keyVideoAvailable},</if>
<if test="keyAnnotationAccuracy != null">key_annotation_accuracy = #{keyAnnotationAccuracy},</if>
<if test="keyTimingAccuracy != null">key_timing_accuracy = #{keyTimingAccuracy},</if>
- <if test="keyCommandImageInspection != null">key_command_image_inspection = #{keyCommandImageInspection},</if>
- <if test="keyCommandImageDirectoryTree != null">key_command_image_directory_tree = #{keyCommandImageDirectoryTree},</if>
- <if test="onlineInspectionPlatform != null">online_inspection_platform = #{onlineInspectionPlatform},</if>
- <if test="videoTransmissionAssetsAccuracy != null">video_transmission_assets_accuracy = #{videoTransmissionAssetsAccuracy},</if>
- <if test="videoTransmissionAssetsWeakPasswordScore != null">video_transmission_assets_weak_password_score = #{videoTransmissionAssetsWeakPasswordScore},</if>
- <if test="videoTransmissionDangerousAssetsScore != null">video_transmission_dangerous_assets_score = #{videoTransmissionDangerousAssetsScore},</if>
- <if test="videoTransmissionBoundaryIntegrityDetection != null">video_transmission_boundary_integrity_detection = #{videoTransmissionBoundaryIntegrityDetection},</if>
- <if test="operatingRate != null">operating_rate = #{operatingRate},</if>
+ <if test="keyCommandImageOnline != null">key_command_image_online = #{keyCommandImageOnline},</if>
+ <if test="imageResourceSecurity != null">image_resource_security = #{imageResourceSecurity},</if>
</trim>
where id = #{id}
</update>
@@ -190,15 +160,8 @@
IFNULL(ROUND(AVG(key_video_available * 100), 0), 0) AS key_video_available,
IFNULL(ROUND(AVG(key_annotation_accuracy * 100), 0), 0) AS key_annotation_accuracy,
IFNULL(ROUND(AVG(key_timing_accuracy * 100), 0), 0) AS key_timing_accuracy,
- IFNULL(ROUND(AVG(key_command_image_inspection * 100), 0), 0) AS key_command_image_inspection,
- IFNULL(ROUND(AVG(key_command_image_directory_tree * 100), 0), 0) AS key_command_image_directory_tree,
- IFNULL(ROUND(AVG(online_inspection_platform * 100), 0), 0) AS online_inspection_platform,
- IFNULL(ROUND(AVG(video_transmission_assets_accuracy * 100), 0), 0) AS video_transmission_assets_accuracy,
- IFNULL(ROUND(AVG(video_transmission_assets_weak_password_score * 100), 0), 0) AS video_transmission_assets_weak_password_score,
- IFNULL(ROUND(AVG(video_transmission_dangerous_assets_score * 100), 0), 0) AS video_transmission_dangerous_assets_score,
- IFNULL(ROUND(AVG(video_transmission_boundary_integrity_detection * 100), 0), 0) AS video_transmission_boundary_integrity_detection,
- IFNULL(ROUND(AVG(operating_rate * 100), 0), 0) AS operating_rate,
- IFNULL(ROUND(AVG(key_command_image_online * 100), 0), 0) AS key_command_image_online
+ IFNULL(ROUND(AVG(key_command_image_online * 100), 0), 0) AS key_command_image_online,
+ IFNULL(ROUND(AVG(image_resource_security * 100), 0), 0) AS image_resource_security
FROM
t_check_index_video
<where>
--
Gitblit v1.8.0