From 3d8649ce8a49a4cbd26d905505157476e1f62d9c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 29 七月 2024 15:27:46 +0800
Subject: [PATCH] 人脸点位在线、视图库稳定性接口 TODO省厅点位集合待查询
---
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexFaceServiceImpl.java | 131 ++++++++++++++++++++++++++++++++++++++++++-
ycl-server/src/main/java/com/ycl/platform/mapper/CheckIndexFaceMapper.java | 20 ++++--
ycl-server/src/main/java/com/ycl/platform/service/ICheckIndexFaceService.java | 4 +
ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml | 16 +++--
4 files changed, 152 insertions(+), 19 deletions(-)
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 6fb00bf..2e12b8c 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
@@ -1,20 +1,21 @@
package com.ycl.platform.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.platform.domain.entity.CheckIndexFace;
import java.util.List;
/**
* 浜鸿劯鎸囨爣姒傜巼鏁版嵁Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2024-04-29
*/
-public interface CheckIndexFaceMapper
+public interface CheckIndexFaceMapper extends BaseMapper<CheckIndexFace>
{
/**
* 鏌ヨ浜鸿劯鎸囨爣姒傜巼鏁版嵁
- *
+ *
* @param id 浜鸿劯鎸囨爣姒傜巼鏁版嵁涓婚敭
* @return 浜鸿劯鎸囨爣姒傜巼鏁版嵁
*/
@@ -22,7 +23,7 @@
/**
* 鏌ヨ浜鸿劯鎸囨爣姒傜巼鏁版嵁鍒楄〃
- *
+ *
* @param checkIndexFace 浜鸿劯鎸囨爣姒傜巼鏁版嵁
* @return 浜鸿劯鎸囨爣姒傜巼鏁版嵁闆嗗悎
*/
@@ -30,7 +31,7 @@
/**
* 鏂板浜鸿劯鎸囨爣姒傜巼鏁版嵁
- *
+ *
* @param checkIndexFace 浜鸿劯鎸囨爣姒傜巼鏁版嵁
* @return 缁撴灉
*/
@@ -38,7 +39,7 @@
/**
* 淇敼浜鸿劯鎸囨爣姒傜巼鏁版嵁
- *
+ *
* @param checkIndexFace 浜鸿劯鎸囨爣姒傜巼鏁版嵁
* @return 缁撴灉
*/
@@ -46,7 +47,7 @@
/**
* 鍒犻櫎浜鸿劯鎸囨爣姒傜巼鏁版嵁
- *
+ *
* @param id 浜鸿劯鎸囨爣姒傜巼鏁版嵁涓婚敭
* @return 缁撴灉
*/
@@ -54,9 +55,12 @@
/**
* 鎵归噺鍒犻櫎浜鸿劯鎸囨爣姒傜巼鏁版嵁
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
public int deleteCheckIndexFaceByIds(Long[] ids);
+
+ List<CheckIndexFace> selectToday(String date);
+
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ICheckIndexFaceService.java b/ycl-server/src/main/java/com/ycl/platform/service/ICheckIndexFaceService.java
index 860f25c..f13b506 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ICheckIndexFaceService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ICheckIndexFaceService.java
@@ -1,5 +1,7 @@
package com.ycl.platform.service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.entity.CheckIndexFace;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
@@ -11,7 +13,7 @@
* @author ruoyi
* @date 2024-04-29
*/
-public interface ICheckIndexFaceService
+public interface ICheckIndexFaceService extends IService<CheckIndexFace>
{
/**
* 鏌ヨ浜鸿劯鎸囨爣姒傜巼鏁版嵁
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexFaceServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexFaceServiceImpl.java
index e23ab19..4574cb1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexFaceServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/CheckIndexFaceServiceImpl.java
@@ -1,14 +1,30 @@
package com.ycl.platform.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.entity.CheckIndexFace;
+import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.mapper.CheckIndexFaceMapper;
import com.ycl.platform.service.ICheckIndexFaceService;
+import com.ycl.platform.service.ITMonitorService;
+import com.ycl.system.mapper.SysConfigMapper;
+import com.ycl.system.mapper.SysDeptMapper;
+import constant.ApiConstants;
+import constant.CheckConstants;
+import constant.CheckSnapCountConstants;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import utils.DateUtils;
-import java.util.List;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 浜鸿劯鎸囨爣姒傜巼鏁版嵁Service涓氬姟灞傚鐞�
@@ -17,10 +33,15 @@
* @date 2024-04-29
*/
@Service
-public class CheckIndexFaceServiceImpl implements ICheckIndexFaceService {
+public class CheckIndexFaceServiceImpl extends ServiceImpl<CheckIndexFaceMapper, CheckIndexFace> implements ICheckIndexFaceService {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
-
+ @Autowired
+ private SysConfigMapper sysConfigMapper;
+ @Autowired
+ private ITMonitorService monitorService;
+ @Autowired
+ private SysDeptMapper deptMapper;
/**
* 鏌ヨ浜鸿劯鎸囨爣姒傜巼鏁版嵁
*
@@ -89,12 +110,114 @@
}
/**
- * 璁＄畻浜鸿劯鐐逛綅鍦ㄧ嚎鐜�
+ * 璁＄畻浜鸿劯鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
+ * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
+ * 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
+ * 鏇存柊鎴栨柊澧�
*
* @param list
*/
+ //TODO锛氫换鍔￠『搴忛渶瑕佹帓鍦ㄤ竴鏈轰竴妗ｄ箣鍚�
@Override
public void siteOnline(List<SnapshotDataMonitorResult> list) {
+ if (CollectionUtils.isEmpty(list)) {
+ return;
+ }
+ Map<String, AreaStats> areaStatsMap = new HashMap<>();
+ Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
+ .in("serial_number", list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
+ .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+
+ // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
+ List<String> provinceIds = new ArrayList<>(); // 杩欓噷闇�瑕佹牴鎹偣浣嶈ˉ鍏�
+
+ for (SnapshotDataMonitorResult result : list) {
+ TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+ if (monitor == null) continue;
+
+ String deptId = monitor.getDeptId().toString();
+ updateAreaStats(areaStatsMap, deptId, result);
+
+ // 澶勭悊鐪佸巺鏁版嵁
+ if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
+ String provinceKey = "Province_" + deptId;
+ updateAreaStats(areaStatsMap, provinceKey, result);
+ }
+ }
+
+ //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
+ BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
+ BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
+
+ // 鏌ヨ浠婃棩鏁版嵁
+ List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());
+ List<CheckIndexFace> checkIndexFaces = new ArrayList<>();
+ areaStatsMap.forEach((deptId, stats) -> {
+ if (stats.totalSites > 0) {
+ CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, cityCountAvg, countyCountAvg, checkIndexFaceList);
+ checkIndexFaces.add(checkIndexFace);
+ }
+ });
+
+ saveOrUpdateBatch(checkIndexFaces);
}
+
+ //绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) {
+ //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
+ AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
+ stats.totalSites++;
+ if (ApiConstants.HK_SnapCount_ResultType_Null == result.getResultType()) {
+ stats.offlineSites++;
+ } else {
+ stats.totalDataSum += result.getDataCount();
+ }
+ }
+
+ //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊�
+ private BigDecimal getAverageCount(String configKey) {
+ String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue();
+ return new BigDecimal(count).multiply(new BigDecimal(CheckSnapCountConstants.Multiply))
+ .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 0, RoundingMode.HALF_UP);
+ }
+ //杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
+ private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexFace> checkIndexFaceList) {
+ CheckIndexFace checkIndexFace;
+
+ // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
+ Optional<CheckIndexFace> existingFace = checkIndexFaceList.stream()
+ .filter(face -> key.equals(face.getDeptId().toString()) &&
+ (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(face.getExamineTag())
+ : CheckConstants.Examine_Tag_County.equals(face.getExamineTag())))
+ .findFirst();
+
+ if (existingFace.isPresent()) {
+ checkIndexFace = existingFace.get();
+ } else {
+ checkIndexFace = new CheckIndexFace();
+ checkIndexFace.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
+ checkIndexFace.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
+ checkIndexFace.setCreateTime(new Date());
+ }
+
+ // 鐐逛綅鍦ㄧ嚎鐜�
+ BigDecimal totalSitesBd = new BigDecimal(stats.totalSites);
+ BigDecimal offlineSitesBd = new BigDecimal(stats.offlineSites);
+ BigDecimal onlineSitesBd = totalSitesBd.subtract(offlineSitesBd);
+ checkIndexFace.setSiteOnline(onlineSitesBd.divide(totalSitesBd, 4, RoundingMode.HALF_UP));
+ //瑙嗗浘搴撳鎺ョǔ瀹氭��
+ BigDecimal avgCount = key.startsWith("Province_") ? cityCountAvg : countyCountAvg;
+ checkIndexFace.setViewConnectStability(new BigDecimal(stats.totalDataSum).divide(avgCount, 4, RoundingMode.HALF_UP));
+
+ return checkIndexFace;
+ }
+
+ //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
+ private static class AreaStats {
+ int totalSites = 0;
+ int offlineSites = 0;
+ int totalDataSum = 0;
+ }
+
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
index 7c73d45..43aaf4d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.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.CheckIndexFaceMapper">
-
+
<resultMap type="com.ycl.platform.domain.entity.CheckIndexFace" id="CheckIndexFaceResult">
<result property="id" column="id" />
<result property="deptId" column="dept_id" />
@@ -26,7 +26,7 @@
<select id="selectCheckIndexFaceList" 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>
+ <where>
<if test="deptId != null "> and tcif.dept_id = #{deptId}</if>
<if test="examineTag != null "> and examine_tag = #{examineTag}</if>
<if test="date != null "> and date_format(tcif.create_time,'%Y-%m') = #{date}</if>
@@ -46,12 +46,12 @@
</if>
</where>
</select>
-
+
<select id="selectCheckIndexFaceById" resultMap="CheckIndexFaceResult">
<include refid="selectCheckIndexFaceVo"/>
where id = #{id}
</select>
-
+
<insert id="insertCheckIndexFace" useGeneratedKeys="true" keyProperty="id">
insert into t_check_index_face
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -105,9 +105,13 @@
</delete>
<delete id="deleteCheckIndexFaceByIds" >
- delete from t_check_index_face where id in
+ delete from t_check_index_face where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+
+ <select id="selectToday">
+ select * from t_check_index_car where DATE(create_time) = #{today}
+ </select>
+</mapper>
--
Gitblit v1.8.0