From a1fa7f56d0b99e30ada3b2f8d90c19787973fb53 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 15:14:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexCarMapper.java | 9 ++++
ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml | 14 +++++++
ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexFaceMapper.java | 10 +++++
ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java | 16 +++----
ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java | 7 +++
ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml | 15 +++++++
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 15 +++++++
7 files changed, 76 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexCarMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexCarMapper.java
index b610f0c..d15c610 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexCarMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexCarMapper.java
@@ -29,6 +29,13 @@
* @return 杞﹁締鎸囨爣姒傜巼鏁版嵁闆嗗悎
*/
public List<CheckIndexCar> selectCheckIndexCarList(CheckIndexCar checkIndexCar);
+ /**
+ * 鑰冩牳妯℃澘瀹氭椂浠诲姟鏌ヨ杞﹁締鎸囨爣姒傜巼鏁版嵁鍒楄〃
+ *
+ * @param checkIndexCar 杞﹁締鎸囨爣姒傜巼鏁版嵁
+ * @return 杞﹁締鎸囨爣姒傜巼鏁版嵁闆嗗悎
+ */
+ List<CheckIndexCar> getCheckIndexCarList(CheckIndexCar checkIndexCar);
/**
* 鏂板杞﹁締鎸囨爣姒傜巼鏁版嵁
@@ -70,4 +77,6 @@
* @return 鏁版嵁
*/
CheckIndexCar dashboard(DashboardQuery dashboardQuery);
+
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexFaceMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexFaceMapper.java
index f5b3c34..55ac291 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexFaceMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexFaceMapper.java
@@ -31,6 +31,13 @@
public List<CheckIndexFace> selectCheckIndexFaceList(CheckIndexFace checkIndexFace);
/**
+ * 妯℃澘瀹氭椂浠诲姟鏌ヨ浜鸿劯鎸囨爣姒傜巼鏁版嵁鍒楄〃
+ *
+ * @param checkIndexFace 浜鸿劯鎸囨爣姒傜巼鏁版嵁
+ * @return 浜鸿劯鎸囨爣姒傜巼鏁版嵁闆嗗悎
+ */
+ List<CheckIndexFace> getCheckIndexFaceList(CheckIndexFace checkIndexFace);
+ /**
* 鏂板浜鸿劯鎸囨爣姒傜巼鏁版嵁
*
* @param checkIndexFace 浜鸿劯鎸囨爣姒傜巼鏁版嵁
@@ -70,4 +77,7 @@
* @return 鏁版嵁
*/
CheckIndexFace dashboard(DashboardQuery dashboardQuery);
+
+
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java
index 8d95a9b..debfb28 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexVideoMapper.java
@@ -35,6 +35,13 @@
public List<CheckIndexVideo> selectCheckIndexVideoList(CheckIndexVideo checkIndexVideo);
/**
+ * 鑰冩牳妯℃澘瀹氭椂浠诲姟鏌ヨ瑙嗛鎸囨爣姒傜巼鏁版嵁鍒楄〃
+ *
+ * @param checkIndexVideo 瑙嗛鎸囨爣姒傜巼鏁版嵁
+ * @return 瑙嗛鎸囨爣姒傜巼鏁版嵁闆嗗悎
+ */
+ public List<CheckIndexVideo> getCheckIndexVideoList(CheckIndexVideo checkIndexVideo);
+ /**
* 鏂板瑙嗛鎸囨爣姒傜巼鏁版嵁
*
* @param checkIndexVideo 瑙嗛鎸囨爣姒傜巼鏁版嵁
diff --git a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
index b4c81a4..43a2824 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -4,9 +4,7 @@
import com.google.common.base.CaseFormat;
import com.ycl.platform.base.CheckIndex;
import com.ycl.platform.domain.entity.*;
-import com.ycl.platform.mapper.CheckScoreMapper;
-import com.ycl.platform.mapper.CheckTemplateMapper;
-import com.ycl.platform.mapper.CheckTemplateRuleMapper;
+import com.ycl.platform.mapper.*;
import com.ycl.platform.service.*;
import constant.CheckConstants;
import lombok.extern.slf4j.Slf4j;
@@ -34,11 +32,11 @@
@Autowired
private CheckScoreMapper scoreMapper;
@Autowired
- private ICheckIndexVideoService videoService;
+ private CheckIndexVideoMapper videoMapper;
@Autowired
- private ICheckIndexFaceService faceService;
+ private CheckIndexFaceMapper faceMapper;
@Autowired
- private ICheckIndexCarService carService;
+ private CheckIndexCarMapper carMapper;
public void executeTemplate(Integer templateId) {
CheckTemplate checkTemplate = templateMapper.selectCheckTemplateById(templateId);
@@ -63,7 +61,7 @@
checkIndexVideo.setDay(day);
checkIndexVideo.setDeptIds(JSONArray.parseArray(checkTemplate.getDeptId(), Integer.class));
//鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�瑙嗛鏁版嵁
- List<CheckIndexVideo> checkIndexVideos = videoService.selectCheckIndexVideoList(checkIndexVideo);
+ List<CheckIndexVideo> checkIndexVideos = videoMapper.getCheckIndexVideoList(checkIndexVideo);
for (CheckIndexVideo indexVideo : checkIndexVideos) {
addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexVideo, CheckConstants.Rule_Category_Video);
}
@@ -73,7 +71,7 @@
checkIndexCar.setExamineTag(examineTag);
checkIndexCar.setDeptIds(JSONArray.parseArray(checkTemplate.getDeptId(), Integer.class));
//鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�杞﹁締鏁版嵁
- List<CheckIndexCar> checkIndexCars = carService.selectCheckIndexCarList(checkIndexCar);
+ List<CheckIndexCar> checkIndexCars = carMapper.getCheckIndexCarList(checkIndexCar);
for (CheckIndexCar indexCar : checkIndexCars) {
addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexCar, CheckConstants.Rule_Category_Car);
}
@@ -83,7 +81,7 @@
checkIndexFace.setExamineTag(examineTag);
checkIndexFace.setDeptIds(JSONArray.parseArray(checkTemplate.getDeptId(), Integer.class));
//鏍规嵁妯℃澘鐨勮�冩牳鏍囩鏌ュ悇鍖哄幙瀵瑰簲鐪佸巺鎴栧競灞�浜鸿劯鏁版嵁
- List<CheckIndexFace> checkIndexFaces = faceService.selectCheckIndexFaceList(checkIndexFace);
+ List<CheckIndexFace> checkIndexFaces = faceMapper.getCheckIndexFaceList(checkIndexFace);
for (CheckIndexFace indexFace : checkIndexFaces) {
addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace, CheckConstants.Rule_Category_Face);
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
index fe35b61..ae68374 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
@@ -51,6 +51,20 @@
order by tcic.examine_tag desc,tcic.create_time,tcs.score desc
</select>
+ <select id="getCheckIndexCarList" 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
+ left join t_check_score tcs on tcic.id = tcs.index_id
+ <where>
+ <if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</if>
+ <if test="day != null "> and date(tcic.create_time) = #{day}</if>
+ <if test="deptIds != null and deptIds.size()>0">and tcic.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
<select id="selectCheckIndexCarById" resultMap="CheckIndexCarResult">
<include refid="selectCheckIndexCarVo"/>
where id = #{id}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
index 557f602..fa8afc6 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
@@ -48,6 +48,21 @@
order by tcif.examine_tag desc,tcif.create_time,tcs.score desc
</select>
+ <select id="getCheckIndexFaceList" resultMap="CheckIndexFaceResult">
+ select tcif.*,sd.dept_name
+ from t_check_index_face tcif left join sys_dept sd on tcif.dept_id = sd.dept_id
+ <where>
+ <if test="examineTag != null "> and tcif.examine_tag = #{examineTag}</if>
+ <if test="date != null "> and date_format(tcif.create_time,'%Y-%m') = #{date}</if>
+ <if test="day != null "> and date(tcif.create_time) = #{day}</if>
+ <if test="deptIds != null ">and tcif.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
<select id="selectCheckIndexFaceById" resultMap="CheckIndexFaceResult">
<include refid="selectCheckIndexFaceVo"/>
where id = #{id}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 154b927..4790df7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -54,7 +54,20 @@
</where>
order by tciv.examine_tag desc,tciv.create_time,tcs.score desc
</select>
-
+ <select id="getCheckIndexVideoList" parameterType="CheckIndexVideo" resultMap="CheckIndexVideoResult">
+ select tciv.*,sd.dept_name
+ from t_check_index_video tciv left join sys_dept sd on tciv.dept_id = sd.dept_id
+ <where>
+ <if test="examineTag != null "> and tciv.examine_tag = #{examineTag}</if>
+ <if test="day != null "> and date(tciv.create_time) = #{day}</if>
+ <if test="createTime != null "> and date(tciv.create_time) = #{createTime}</if>
+ <if test="deptIds != null ">and tciv.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ </select>
<select id="selectCheckIndexVideoById" resultMap="CheckIndexVideoResult">
<include refid="selectCheckIndexVideoVo"/>
where id = #{id}
--
Gitblit v1.8.0