ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
@@ -2,6 +2,7 @@ import lombok.Data; import org.bson.types.ObjectId; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.Id; import java.util.Date; @@ -9,9 +10,10 @@ @Data public class BaseResult { @Id private ObjectId id; private ObjectId mongoId; /** * 数据日期 */ private Date createTime; @CreatedDate private Date mongoCreateTime; } ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "attr_recognition_monitor") @Document(collection = "hk_attr_recognition_monitor") public class AttrRecognitionMonitorResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "car_detect") @Document(collection = "hk_car_detect") public class CarDetectResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "code_by_area") @Document(collection = "hk_code_by_area") public class CodeByAreaResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "coordinate_by_area") @Document(collection = "hk_coordinate_by_area") public class CoordinateByAreaResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "criteria") @Document(collection = "hk_criteria") public class CriteriaResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "cross_detail") @Document(collection = "hk_cross_detail") public class CrossDetailResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "data_integrity_monitoring") @Document(collection = "hk_data_integrity_monitoring") public class DataIntegrityMonitoringResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "face_detect") @Document(collection = "hk_face_detect") public class FaceDetectResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "face_device_inspection") @Document(collection = "hk_face_device_inspection") public class FaceDeviceInspectionResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "face_device_sampling") @Document(collection = "hk_face_device_sampling") public class FaceDeviceSamplingResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java
@@ -11,7 +11,7 @@ * @author gonghl */ @Data @Document(collection = "monitor_resource") @Document(collection = "hk_monitor_resource") public class MonitorResourceResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "monitoring_detail") @Document(collection = "hk_monitoring_detail") public class MonitoringDetailResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java
@@ -12,7 +12,7 @@ * @author gonghl */ @Data @Document(collection = "organization_tree") @Document(collection = "hk_organization_tree") public class OrganizationTreeResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "pic_access") @Document(collection = "hk_pic_access") public class PicAccessResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "snapshot_data_monitor") @Document(collection = "hk_snapshot_data_monitor") public class SnapshotDataMonitorResult extends BaseResult { /** * 数据类型 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "snapshop_delay_monitor") @Document(collection = "hk_snapshop_delay_monitor") public class SnapshotDelayMonitorResult extends BaseResult { private Integer dataType; /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "vehicle_device_inspection") @Document(collection = "hk_vehicle_device_inspection") public class VehicleDeviceInspectionResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java
@@ -10,7 +10,7 @@ * @author gonghl */ @Data @Document(collection = "vehicle_device_sampling") @Document(collection = "hk_vehicle_device_sampling") public class VehicleDeviceSamplingResult extends BaseResult { /** ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
@@ -1,6 +1,8 @@ package com.ycl.platform.domain.result.UY; import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -11,7 +13,8 @@ * @since 2024-4-19 11:33:34 */ @Data public class OneMachineFileResult { @Document(collection = "uy_one_machine_file") public class OneMachineFileResult extends BaseResult { /** * 设备编码，20位：中心编码、行业编码、设备类型、网络标识、设备序号，与联网平台/共享平台国标编码一致。 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
@@ -1,6 +1,8 @@ package com.ycl.platform.domain.result.UY; import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; /** * 点位在线率 @@ -9,7 +11,8 @@ * @since 2024-4-19 11:37:30 */ @Data public class OnlineResult{ @Document(collection = "uy_online") public class OnlineResult extends BaseResult { /** * 行政区划编码 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
@@ -1,6 +1,8 @@ package com.ycl.platform.domain.result.UY; import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; import java.util.List; @@ -11,7 +13,8 @@ * @since 2024-4-19 11:52:09 */ @Data public class OsdMonitorResult { @Document(collection = "uy_osd_monitor") public class OsdMonitorResult extends BaseResult { /** * 区域路径信息 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java
@@ -1,12 +1,15 @@ package com.ycl.platform.domain.result.UY; import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; /** * 图像监测诊断结果 */ @Data public class QueryVqdResult { @Document(collection = "uy_query_vqd") public class QueryVqdResult extends BaseResult { /** * */ ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -1,6 +1,8 @@ package com.ycl.platform.domain.result.UY; import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -10,7 +12,8 @@ * @author gonghl */ @Data public class RecordMetaDSumResult{ @Document(collection = "uy_record_meta_d_sum") public class RecordMetaDSumResult extends BaseResult { /** * 行政区域名称 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java
@@ -1,12 +1,15 @@ package com.ycl.platform.domain.result.UY; import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; /** * 视频图像质量 */ @Data public class VideoQualityResult { @Document(collection = "uy_video_quality") public class VideoQualityResult extends BaseResult { /** 行政区划编码 */ private String arealayernoCode; /** 行政区划名称 */ ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -8,11 +8,9 @@ import com.ycl.system.AjaxResult; import com.ycl.system.controller.BaseController; import com.ycl.system.page.TableDataInfo; import com.ycl.utils.poi.ExcelUtil; import enumeration.BusinessType; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.io.IOException; @@ -44,6 +42,17 @@ } /** * 查询考核积分折线图 */ // @PreAuthorize("@ss.hasPermi('check:score:chart')") @GetMapping("/chart") public AjaxResult selectCheckScoreChart(CheckScore checkScore) { Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreChart(checkScore); return success(deptMap); } /** * 区县详情列表 */ // @PreAuthorize("@ss.hasPermi('check:score:list')") ycl-server/src/main/java/com/ycl/platform/service/ICheckScoreService.java
@@ -35,6 +35,14 @@ */ public Map<Long, List<CheckScore>> selectCheckScoreList(CheckScore checkScore); /** * 查询考核积分折线图数据 * * @param checkScore 考核积分参数 * @return 考核积分折线图 */ Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore); int publishCheckScore(CheckScoreDTO checkScoreDTO);
@@ -149,6 +149,34 @@ return scoreMapper.selectCheckScoreMap(checkScore).stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); } /** * 查询考核积分卡片列表 * * @param checkScore 考核积分 * @return 考核积分 */ @Override @DataScope(deptAlias = "d",userAlias = "u") public Map<Long, List<CheckScore>> selectCheckScoreChart(CheckScore checkScore) { //区县只能看已发布 roleControl(checkScore); //查询成绩 String date = checkScore.getDate(); if(StringUtils.isEmpty(date)){ //如果为空查本月的数据 Calendar now = Calendar.getInstance(); //取昨天 now.add(Calendar.DATE, -1); Date yesterday = now.getTime(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); date = simpleDateFormat.format(yesterday); checkScore.setDate(date); } List<CheckScore> checkScores = scoreMapper.selectCheckScoreList(checkScore); return checkScores.stream().collect(Collectors.groupingBy(CheckScore::getDeptId)); } /** * 区县详情 ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -312,11 +312,6 @@ log.error(message, data); return null; } for (T t : list) { if (t instanceof BaseResult) { ((BaseResult) t).setCreateTime(new Date()); } } return list; } else { log.error(message); ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -1,15 +1,26 @@ package com.ycl.task; import com.alibaba.fastjson2.JSONObject; import com.mongodb.client.result.DeleteResult; import com.ycl.platform.domain.param.UY.OnlineParam; import com.ycl.platform.domain.param.UY.QueryVqdParam; import com.ycl.platform.domain.result.HK.PicAccessResult; import com.ycl.platform.domain.result.UY.QueryVqdResult; import com.ycl.platform.service.IYwThresholdService; import com.ycl.feign.UYClient; import com.ycl.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @Slf4j @@ -23,37 +34,45 @@ @Autowired private IYwThresholdService ywThresholdService; private final static Integer pageNo = 1; private final static Integer pageSize = 5000; //成功状态码 private final static String successCode = "0"; //车辆设备全检指标监测结果 public void VehicleDeviceInspectionTask() { log.info("开始执行车辆设备全检指标监测结果数据同步"); log.info("结束车辆设备全检指标监测结果数据同步"); } public void FaceDeviceInspectionTask() { log.info("开始执行人脸设备全检指标监测结果数据同步"); log.info("结束人脸设备全检指标监测结果数据同步"); } @Value("${youYun.tenantId}") private String tenantId; //一机一档 public void task1() { public void monitorTask() { log.info("开始执行一机一档数据同步"); //一机一档合格率 // 一机一档注册率 // 档案考核比 log.info("结束执行一机一档数据同步"); } //图像监测诊断结果 public void queryVqdResultTask() { //点位在线率 log.info("开始执行图像监测诊断结果数据同步"); QueryVqdParam param = new QueryVqdParam(); param.setTenantId(tenantId); JSONObject jsonObject = uyClient.queryVqdResult(param); if (jsonObject != null) { JSONObject cameraList = jsonObject.getJSONObject("CameraList"); if (cameraList != null) { List<QueryVqdResult> data = cameraList.getList("data", QueryVqdResult.class); if (!CollectionUtils.isEmpty(data)) { //如果今天存在之前的数据先删除 Query query = new Query(Criteria .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class); //存放在mongo中 mongoTemplate.insert(data); } else { log.error("图像监测诊断结果数据为空{}", cameraList); } } else { log.error("图像监测诊断结果数据为空{}", jsonObject); } } else { log.error("图像监测诊断结果数据为空"); } log.info("结束执行图像监测诊断结果数据同步"); } @@ -63,5 +82,8 @@ //录像可用率 } //视频图像质量 public void task4() { //录像可用率 } } ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -119,9 +119,10 @@ SELECT tcs.dept_id, examine_category, AVG(score) AS score, ROUND(AVG(score), 2) AS score, #{startDate} AS startDate, #{endDate} AS endDate #{endDate} AS endDate, ANY_VALUE(tcs.create_time) AS createTime FROM t_check_score tcs LEFT JOIN sys_dept d ON tcs.dept_id = d.dept_id
