From c1cfc23d6ea4d4805a68de608a1e54d78bc63487 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 十二月 2024 21:31:48 +0800
Subject: [PATCH] 地图积分区分视频车辆人脸
---
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 3 +--
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 40 +++++++++++++++++++++++++++-------------
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
index 496430d..5db992f 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java
@@ -183,20 +183,26 @@
private void getCheckScore(CheckScore checkScore, Calendar calendar) {
// 0.鐪佸巺鏈堝害 1.鐪佸巺瀛ｅ害 2.甯傚眬鏈堝害 3.甯傚眬瀛ｅ害 4.鍏畨閮ㄦ湀搴� 5.鍏畨閮ㄥ搴�
switch (checkScore.getExamineTag()) {
- case 0, 2 ,4:
+ case 0, 2, 4:
checkScore.setEndDate(calendar.getTime());
calendar.set(Calendar.DAY_OF_MONTH, 1);
checkScore.setStartDate(calendar.getTime());
- if(checkScore.getExamineTag() == 0) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
- if(checkScore.getExamineTag() == 2) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
- if(checkScore.getExamineTag() == 4) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
+ if (checkScore.getExamineTag() == 0)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province + ""));
+ if (checkScore.getExamineTag() == 2)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County + ""));
+ if (checkScore.getExamineTag() == 4)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept + ""));
break;
case 1, 3, 5:
checkScore.setStartDate(DateUtils.getQuarterStart(calendar).getTime());
checkScore.setEndDate(DateUtils.getQuarterEnd(calendar).getTime());
- if(checkScore.getExamineTag() == 1) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province+""));
- if(checkScore.getExamineTag() == 3) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County+""));
- if(checkScore.getExamineTag() == 5) checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept+""));
+ if (checkScore.getExamineTag() == 1)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Province + ""));
+ if (checkScore.getExamineTag() == 3)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_County + ""));
+ if (checkScore.getExamineTag() == 5)
+ checkScore.setExamineTag(Integer.valueOf(CheckConstants.Examine_Tag_Dept + ""));
break;
}
}
@@ -305,15 +311,15 @@
@Override
public void exportIndex(HttpServletResponse response, CheckResultExportDTO exportDTO) throws IOException {
//娌℃湁鏍囩榛樿鍏ㄥ
- if(CollectionUtils.isEmpty(exportDTO.getExamineTags())){
- exportDTO.setExamineTags(Arrays.asList(0,1,2));
+ if (CollectionUtils.isEmpty(exportDTO.getExamineTags())) {
+ exportDTO.setExamineTags(Arrays.asList(0, 1, 2));
}
/** 瀵间笁寮爏heet */
//杞﹁締
List<CheckIndexCar> checkIndexCars = new ArrayList<>();
//杞﹁締鍜屼汉鑴告病鏈夊叕瀹夐儴
for (Integer examineTag : exportDTO.getExamineTags()) {
- if(examineTag ==2) continue;
+ if (examineTag == 2) continue;
CheckIndexCar checkIndexCar = new CheckIndexCar();
// checkIndexCar.setDate(date);
checkIndexCar.setQuarter(exportDTO.getQuarter());
@@ -361,7 +367,7 @@
//浜鸿劯
List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
for (Integer examineTag : exportDTO.getExamineTags()) {
- if(examineTag ==2) continue;
+ if (examineTag == 2) continue;
CheckIndexFace checkIndexFace = new CheckIndexFace();
// checkIndexFace.setDate(date);
checkIndexFace.setQuarter(exportDTO.getQuarter());
@@ -540,13 +546,21 @@
Map<String, Map<String, Object>> resultMap = new HashMap<>();
for (AreaDeptEnum value : AreaDeptEnum.values()) {
Map<String, Object> map = new HashMap<>();
- map.put("score", 0);
+ map.put("video", 0);
+ map.put("car", 0);
+ map.put("face", 0);
resultMap.put(value.getName(), map);
}
//濉厖鍚勪釜鍖哄幙鏁版嵁
for (CheckScore checkScore : dashboard) {
Map<String, Object> map = new HashMap<>();
- map.put("score", checkScore.getScore().setScale(1,RoundingMode.HALF_UP));
+ if (CheckConstants.Rule_Category_Video.equals(checkScore.getExamineCategory())) {
+ map.put("video", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ } else if (CheckConstants.Rule_Category_Car.equals(checkScore.getExamineCategory())) {
+ map.put("car", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ } else if (CheckConstants.Rule_Category_Face.equals(checkScore.getExamineCategory())) {
+ map.put("face", checkScore.getScore().setScale(1, RoundingMode.HALF_UP));
+ }
resultMap.put(checkScore.getDeptName(), map);
}
return resultMap;
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index 59996de..4a0a076 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -207,7 +207,7 @@
</select>
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckScore">
- select avg(s.score) as score,d.area as deptName from t_check_score s
+ select score,d.area as deptName,s.examine_category from t_check_score s
left join sys_dept d on s.dept_id = d.dept_id
<where>
s.create_time between #{startTime} and #{endTime}
@@ -221,7 +221,6 @@
AND s.examine_tag = 2
</if>
</where>
- GROUP BY s.dept_id
ORDER BY s.create_time DESC
</select>
--
Gitblit v1.8.0