From 74ae355248c0bccadc80fb37bdb36aee5318fee8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 17:16:30 +0800
Subject: [PATCH] 考核指标导出优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexCar.java | 211 +---------------
ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexVideoVO.java | 96 ++++++++
ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java | 3
ycl-server/src/main/java/com/ycl/platform/service/impl/CheckScoreServiceImpl.java | 22 +
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java | 41 ++-
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexCarVO.java | 47 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java | 212 +++-------------
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexFaceVO.java | 40 +++
9 files changed, 292 insertions(+), 382 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java b/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java
index 52cda67..31e99cf 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/CheckIndex.java
@@ -27,14 +27,11 @@
public String deptName;
/** 鑰冩牳鏍囩锛堢渷鍘�/甯傚眬锛� */
-// @Excel(name = "鑰冩牳鏍囩", dictType = "platform_examine_tag")
@TableField("examine_tag")
public Short examineTag;
-
@Excel(name = "鑰冩牳鏍囩")
@TableField(exist = false)
public String examineTagStr;
-
@TableField(exist = false)
public List<Integer> deptIds;
public Long getId() {
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexCar.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexCar.java
index 102550b..e7ce000 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexCar.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexCar.java
@@ -1,13 +1,15 @@
package com.ycl.platform.domain.entity;
-import annotation.Excel;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.CheckIndex;
+import com.ycl.platform.domain.vo.CheckIndexCarVO;
+import constant.CheckConstants;
+import lombok.Data;
+import org.springframework.lang.NonNull;
import java.math.BigDecimal;
-import java.util.Date;
import java.util.List;
/**
@@ -16,58 +18,49 @@
* @author ruoyi
* @date 2024-04-29
*/
+@Data
@TableName("t_check_index_car")
public class CheckIndexCar extends CheckIndex
{
private static final long serialVersionUID = 1L;
/** 瑙嗗浘搴撳鎺ョǔ瀹氭�� */
- @Excel(name = "瑙嗗浘搴撳鎺ョǔ瀹氭��")
@TableField("view_connect_stability")
private BigDecimal viewConnectStability;
/** 鐐逛綅鍦ㄧ嚎鐜� */
- @Excel(name = "鐐逛綅鍦ㄧ嚎鐜�")
@TableField("site_online")
private BigDecimal siteOnline;
/** 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 */
- @Excel(name = "鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼",width = 25)
@TableField("device_directory_consistent")
private BigDecimal deviceDirectoryConsistent;
/** 杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� */
- @Excel(name = "杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�",width = 25)
@TableField("vehicle_information_collection_accuracy")
private BigDecimal vehicleInformationCollectionAccuracy;
/** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬� */
- @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�",width = 25)
@TableField("vehicle_capture_integrity")
private BigDecimal vehicleCaptureIntegrity;
/** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬� */
- @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�",width = 25)
@TableField("vehicle_capture_accuracy")
private BigDecimal vehicleCaptureAccuracy;
/** 杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬� */
- @Excel(name = "杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�",width = 25)
@TableField("vehicle_timing_accuracy")
private BigDecimal vehicleTimingAccuracy;
/** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬� */
- @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�",width = 25)
@TableField("vehicle_upload_timeliness")
private BigDecimal vehicleUploadTimeliness;
/** 杞﹁締鍗″彛璁惧url鍙敤鎬� */
- @Excel(name = "杞﹁締鍗″彛璁惧url鍙敤鎬�",width = 25)
@TableField("vehicle_url_availability")
private BigDecimal vehicleUrlAvailability;
/** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬� */
- @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�",width = 25)
@TableField("vehicle_picture_availability")
private BigDecimal vehiclePictureAvailability;
@@ -75,184 +68,22 @@
@TableField(exist = false)
private List<String> quarter;
- public List<String> getQuarter() {
- return quarter;
- }
- public void setQuarter(List<String> quarter) {
- this.quarter = quarter;
- }
-
- @Override
- public Long getId() {
- return super.getId();
- }
-
- @Override
- public void setId(Long id) {
- super.setId(id);
- }
-
- @Override
- public String getDate() {
- return super.getDate();
- }
-
- @Override
- public void setDate(String date) {
- super.setDate(date);
- }
-
- @Override
- public Date getCreateTime() {
- return super.getCreateTime();
- }
-
- @Override
- public void setCreateTime(Date createTime) {
- super.setCreateTime(createTime);
- }
-
- @Override
- public Long getDeptId() {
- return super.getDeptId();
- }
-
- @Override
- public void setDeptId(Long deptId) {
- super.setDeptId(deptId);
- }
-
- @Override
- public String getDeptName() {
- return super.getDeptName();
- }
-
- @Override
- public void setDeptName(String deptName) {
- super.setDeptName(deptName);
- }
-
- @Override
- public Short getExamineTag() {
- return super.getExamineTag();
- }
-
- @Override
- public void setExamineTag(Short examineTag) {
- super.setExamineTag(examineTag);
- }
- public void setViewConnectStability(BigDecimal viewConnectStability)
- {
- this.viewConnectStability = viewConnectStability;
- }
-
- public BigDecimal getViewConnectStability()
- {
- return viewConnectStability;
- }
- public void setSiteOnline(BigDecimal siteOnline)
- {
- this.siteOnline = siteOnline;
- }
-
- public BigDecimal getSiteOnline()
- {
- return siteOnline;
- }
- public void setDeviceDirectoryConsistent(BigDecimal deviceDirectoryConsistent)
- {
- this.deviceDirectoryConsistent = deviceDirectoryConsistent;
- }
-
- public BigDecimal getDeviceDirectoryConsistent()
- {
- return deviceDirectoryConsistent;
- }
- public void setVehicleInformationCollectionAccuracy(BigDecimal vehicleInformationCollectionAccuracy)
- {
- this.vehicleInformationCollectionAccuracy = vehicleInformationCollectionAccuracy;
- }
-
- public BigDecimal getVehicleInformationCollectionAccuracy()
- {
- return vehicleInformationCollectionAccuracy;
- }
- public void setVehicleCaptureIntegrity(BigDecimal vehicleCaptureIntegrity)
- {
- this.vehicleCaptureIntegrity = vehicleCaptureIntegrity;
- }
-
- public BigDecimal getVehicleCaptureIntegrity()
- {
- return vehicleCaptureIntegrity;
- }
- public void setVehicleCaptureAccuracy(BigDecimal vehicleCaptureAccuracy)
- {
- this.vehicleCaptureAccuracy = vehicleCaptureAccuracy;
- }
-
- public BigDecimal getVehicleCaptureAccuracy()
- {
- return vehicleCaptureAccuracy;
- }
- public void setVehicleTimingAccuracy(BigDecimal vehicleTimingAccuracy)
- {
- this.vehicleTimingAccuracy = vehicleTimingAccuracy;
- }
-
- public BigDecimal getVehicleTimingAccuracy()
- {
- return vehicleTimingAccuracy;
- }
- public void setVehicleUploadTimeliness(BigDecimal vehicleUploadTimeliness)
- {
- this.vehicleUploadTimeliness = vehicleUploadTimeliness;
- }
-
- public BigDecimal getVehicleUploadTimeliness()
- {
- return vehicleUploadTimeliness;
- }
- public void setVehicleUrlAvailability(BigDecimal vehicleUrlAvailability)
- {
- this.vehicleUrlAvailability = vehicleUrlAvailability;
- }
-
- public BigDecimal getVehicleUrlAvailability()
- {
- return vehicleUrlAvailability;
- }
- public void setVehiclePictureAvailability(BigDecimal vehiclePictureAvailability)
- {
- this.vehiclePictureAvailability = vehiclePictureAvailability;
- }
-
-
- public BigDecimal getVehiclePictureAvailability()
- {
- return vehiclePictureAvailability;
- }
-
- @Override
- public String toString() {
- return "CheckIndexCar{" +
- "id=" + id +
- ", date='" + date + '\'' +
- ", createTime=" + createTime +
- ", deptId=" + deptId +
- ", deptName='" + deptName + '\'' +
- ", examineTag=" + examineTag +
- ", viewConnectStability=" + viewConnectStability +
- ", siteOnline=" + siteOnline +
- ", deviceDirectoryConsistent=" + deviceDirectoryConsistent +
- ", vehicleInformationCollectionAccuracy=" + vehicleInformationCollectionAccuracy +
- ", vehicleCaptureIntegrity=" + vehicleCaptureIntegrity +
- ", vehicleCaptureAccuracy=" + vehicleCaptureAccuracy +
- ", vehicleTimingAccuracy=" + vehicleTimingAccuracy +
- ", vehicleUploadTimeliness=" + vehicleUploadTimeliness +
- ", vehicleUrlAvailability=" + vehicleUrlAvailability +
- ", vehiclePictureAvailability=" + vehiclePictureAvailability +
- '}';
+ public static CheckIndexCarVO getExcelVo(@NonNull CheckIndexCar checkIndexCar) {
+ CheckIndexCarVO checkIndexCarVo = new CheckIndexCarVO();
+ checkIndexCarVo.setDeptName(checkIndexCar.getDeptName());
+ checkIndexCarVo.setDate(checkIndexCar.getDate());
+ checkIndexCarVo.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(checkIndexCar.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ checkIndexCarVo.setSiteOnlineText(checkIndexCar.getSiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setVehicleCaptureAccuracyText(checkIndexCar.getVehicleCaptureAccuracy().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setDeviceDirectoryConsistentText(checkIndexCar.getDeviceDirectoryConsistent().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setVehicleCaptureIntegrityText(checkIndexCar.getVehicleCaptureIntegrity().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setVehicleTimingAccuracyText(checkIndexCar.getSiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setVehicleUploadTimelinessText(checkIndexCar.getSiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setViewConnectStabilityText(checkIndexCar.getSiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setVehicleUrlAvailabilityText(checkIndexCar.getSiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setVehiclePictureAvailabilityText(checkIndexCar.getSiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexCarVo.setVehicleInformationCollectionAccuracyText(checkIndexCar.getVehicleInformationCollectionAccuracy().multiply(new BigDecimal(100))+"%");
+ return checkIndexCarVo;
}
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java
index a573c31..15867f8 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexFace.java
@@ -5,6 +5,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.CheckIndex;
+import com.ycl.platform.domain.vo.CheckIndexCarVO;
+import com.ycl.platform.domain.vo.CheckIndexFaceVO;
+import constant.CheckConstants;
+import lombok.Data;
+import org.springframework.lang.NonNull;
import java.math.BigDecimal;
import java.util.Date;
@@ -16,48 +21,56 @@
* @author ruoyi
* @date 2024-04-29
*/
+@Data
@TableName("t_check_index_face")
-public class CheckIndexFace extends CheckIndex
-{
+public class CheckIndexFace extends CheckIndex {
private static final long serialVersionUID = 1L;
- /** 瑙嗗浘搴撳鎺ョǔ瀹氭�� */
- @Excel(name = "瑙嗗浘搴撳鎺ョǔ瀹氭��")
+ /**
+ * 瑙嗗浘搴撳鎺ョǔ瀹氭��
+ */
@TableField("view_connect_stability")
private BigDecimal viewConnectStability;
- /** 鐐逛綅鍦ㄧ嚎鐜� */
- @Excel(name = "鐐逛綅鍦ㄧ嚎鐜�")
+ /**
+ * 鐐逛綅鍦ㄧ嚎鐜�
+ */
@TableField("site_online")
private BigDecimal siteOnline;
- /** 璁惧鐩綍涓�鑷寸巼 */
- @Excel(name = " 璁惧鐩綍涓�鑷寸巼")
+ /**
+ * 璁惧鐩綍涓�鑷寸巼
+ */
@TableField("device_directory_consistent")
private BigDecimal deviceDirectoryConsistent;
- /** 浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� */
- @Excel(name = "浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�",width = 25)
+ /**
+ * 浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
+ */
@TableField("face_information_collection_accuracy")
private BigDecimal faceInformationCollectionAccuracy;
- /** 璁惧鎶撴媿鍥剧墖鍚堟牸鎬� */
- @Excel(name = "璁惧鎶撴媿鍥剧墖鍚堟牸鎬�")
+ /**
+ * 璁惧鎶撴媿鍥剧墖鍚堟牸鎬�
+ */
@TableField("face_picture_qualification")
private BigDecimal facePictureQualification;
- /** 璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬� */
- @Excel(name = "璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�",width = 25)
+ /**
+ * 璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�
+ */
@TableField("face_timing_accuracy")
private BigDecimal faceTimingAccuracy;
- /** 鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬� */
- @Excel(name = "鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�",width = 25)
+ /**
+ * 鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�
+ */
@TableField("face_upload_timeliness")
private BigDecimal faceUploadTimeliness;
- /** 浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬� */
- @Excel(name = "浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�",width = 25)
+ /**
+ * 浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�
+ */
@TableField("face_picture_availability")
private BigDecimal facePictureAvailability;
@@ -65,155 +78,20 @@
@TableField(exist = false)
private List<String> quarter;
- public List<String> getQuarter() {
- return quarter;
- }
+ public static CheckIndexFaceVO getExcelVo(@NonNull CheckIndexFace checkIndexFace) {
+ CheckIndexFaceVO checkIndexFaceVo = new CheckIndexFaceVO();
+ checkIndexFaceVo.setDeptName(checkIndexFace.getDeptName());
+ checkIndexFaceVo.setDate(checkIndexFace.getDate());
+ checkIndexFaceVo.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(checkIndexFace.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ checkIndexFaceVo.setSiteOnlineText(checkIndexFace.getSiteOnline().multiply(new BigDecimal(100)) + "%");
+ checkIndexFaceVo.setFaceInformationCollectionAccuracyText(checkIndexFace.getFaceInformationCollectionAccuracy().multiply(new BigDecimal(100)) + "%");
+ checkIndexFaceVo.setFacePictureAvailabilityText(checkIndexFace.getFacePictureAvailability().multiply(new BigDecimal(100)) + "%");
+ checkIndexFaceVo.setDeviceDirectoryConsistentTextText(checkIndexFace.getDeviceDirectoryConsistent().multiply(new BigDecimal(100)) + "%");
+ checkIndexFaceVo.setFaceTimingAccuracyText(checkIndexFace.getFaceTimingAccuracy().multiply(new BigDecimal(100)) + "%");
+ checkIndexFaceVo.setFacePictureQualificationText(checkIndexFace.getFacePictureQualification().multiply(new BigDecimal(100)) + "%");
+ checkIndexFaceVo.setViewConnectStabilityText(checkIndexFace.getViewConnectStability().multiply(new BigDecimal(100)) + "%");
+ checkIndexFaceVo.setFaceUploadTimelinessText(checkIndexFace.getFaceUploadTimeliness().multiply(new BigDecimal(100)) + "%");
- public void setQuarter(List<String> quarter) {
- this.quarter = quarter;
- }
-
- public BigDecimal getViewConnectStability() {
- return viewConnectStability;
- }
-
- public void setViewConnectStability(BigDecimal viewConnectStability) {
- this.viewConnectStability = viewConnectStability;
- }
-
- public BigDecimal getSiteOnline() {
- return siteOnline;
- }
-
- public void setSiteOnline(BigDecimal siteOnline) {
- this.siteOnline = siteOnline;
- }
-
- public BigDecimal getDeviceDirectoryConsistent() {
- return deviceDirectoryConsistent;
- }
-
- public void setDeviceDirectoryConsistent(BigDecimal deviceDirectoryConsistent) {
- this.deviceDirectoryConsistent = deviceDirectoryConsistent;
- }
-
- public BigDecimal getFaceInformationCollectionAccuracy() {
- return faceInformationCollectionAccuracy;
- }
-
- public void setFaceInformationCollectionAccuracy(BigDecimal faceInformationCollectionAccuracy) {
- this.faceInformationCollectionAccuracy = faceInformationCollectionAccuracy;
- }
-
- public BigDecimal getFacePictureQualification() {
- return facePictureQualification;
- }
-
- public void setFacePictureQualification(BigDecimal facePictureQualification) {
- this.facePictureQualification = facePictureQualification;
- }
-
- public BigDecimal getFaceTimingAccuracy() {
- return faceTimingAccuracy;
- }
-
- public void setFaceTimingAccuracy(BigDecimal faceTimingAccuracy) {
- this.faceTimingAccuracy = faceTimingAccuracy;
- }
-
- public BigDecimal getFaceUploadTimeliness() {
- return faceUploadTimeliness;
- }
-
- public void setFaceUploadTimeliness(BigDecimal faceUploadTimeliness) {
- this.faceUploadTimeliness = faceUploadTimeliness;
- }
-
- public BigDecimal getFacePictureAvailability() {
- return facePictureAvailability;
- }
-
- public void setFacePictureAvailability(BigDecimal facePictureAvailability) {
- this.facePictureAvailability = facePictureAvailability;
- }
-
- @Override
- public Long getId() {
- return super.getId();
- }
-
- @Override
- public void setId(Long id) {
- super.setId(id);
- }
-
- @Override
- public String getDate() {
- return super.getDate();
- }
-
- @Override
- public void setDate(String date) {
- super.setDate(date);
- }
-
- @Override
- public Date getCreateTime() {
- return super.getCreateTime();
- }
-
- @Override
- public void setCreateTime(Date createTime) {
- super.setCreateTime(createTime);
- }
-
- @Override
- public Long getDeptId() {
- return super.getDeptId();
- }
-
- @Override
- public void setDeptId(Long deptId) {
- super.setDeptId(deptId);
- }
-
- @Override
- public String getDeptName() {
- return super.getDeptName();
- }
-
- @Override
- public void setDeptName(String deptName) {
- super.setDeptName(deptName);
- }
-
- @Override
- public Short getExamineTag() {
- return super.getExamineTag();
- }
-
- @Override
- public void setExamineTag(Short examineTag) {
- super.setExamineTag(examineTag);
- }
-
- @Override
- public String toString() {
- return "CheckIndexFace{" +
- "id=" + id +
- ", date='" + date + '\'' +
- ", createTime=" + createTime +
- ", deptId=" + deptId +
- ", deptName='" + deptName + '\'' +
- ", examineTag=" + examineTag +
- ", viewConnectStability=" + viewConnectStability +
- ", siteOnline=" + siteOnline +
- ", deviceDirectoryConsistent=" + deviceDirectoryConsistent +
- ", faceInformationCollectionAccuracy=" + faceInformationCollectionAccuracy +
- ", facePictureQualification=" + facePictureQualification +
- ", faceTimingAccuracy=" + faceTimingAccuracy +
- ", faceUploadTimeliness=" + faceUploadTimeliness +
- ", facePictureAvailability=" + facePictureAvailability +
- '}';
+ return checkIndexFaceVo;
}
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
index 982515a..1e94d59 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckIndexVideo.java
@@ -5,7 +5,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ycl.platform.base.CheckIndex;
+import com.ycl.platform.domain.vo.CheckIndexCarVO;
+import com.ycl.platform.domain.vo.CheckIndexVideoVO;
+import constant.CheckConstants;
import lombok.Data;
+import org.springframework.lang.NonNull;
import java.math.BigDecimal;
import java.util.Date;
@@ -25,98 +29,84 @@
/**
* 骞冲彴鍦ㄧ嚎鐜�
*/
- @Excel(name = "骞冲彴鍦ㄧ嚎鐜�")
@TableField("platform_online")
private BigDecimal platformOnline;
/**
* 涓�鏈轰竴妗ｅ悎鏍肩巼
*/
- @Excel(name = "涓�鏈轰竴妗ｅ悎鏍肩巼")
@TableField("monitor_qualification")
private BigDecimal monitorQualification;
/**
* 妗ｆ鑰冩牳姣�
*/
- @Excel(name = "涓�鏈轰竴妗ｆ敞鍐岀巼")
@TableField("monitor_registration")
private BigDecimal monitorRegistration;
/**
* 妗ｆ鑰冩牳姣�
*/
- @Excel(name = "妗ｆ鑰冩牳姣�")
@TableField("archives_rate")
private BigDecimal archivesRate;
/**
* 鐐逛綅鍦ㄧ嚎鐜�
*/
- @Excel(name = "鐐逛綅鍦ㄧ嚎鐜�")
@TableField("site_online")
private BigDecimal siteOnline;
/**
* 褰曡薄鍙敤鐜�
*/
- @Excel(name = "褰曡薄鍙敤鐜�")
@TableField("video_available")
private BigDecimal videoAvailable;
/**
* 閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�
*/
- @Excel(name = "閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�")
@TableField("ministry_site_online")
private BigDecimal ministrySiteOnline;
/**
* 閮ㄧ骇宸℃褰曞儚鍙敤鐜�
*/
- @Excel(name = "閮ㄧ骇宸℃褰曞儚鍙敤鐜�")
@TableField("ministry_video_available")
private BigDecimal ministryVideoAvailable;
/**
* 閲嶇偣鐐逛綅鍦ㄧ嚎鐜�
*/
- @Excel(name = "閲嶇偣鐐逛綅鍦ㄧ嚎鐜�")
@TableField("key_site_online")
private BigDecimal keySiteOnline;
/**
* 閲嶇偣鐐逛綅褰曡薄鍙敤鐜�
*/
- @Excel(name = "閲嶇偣鐐逛綅褰曡薄鍙敤鐜�", width = 25)
@TableField("key_video_available")
private BigDecimal keyVideoAvailable;
/**
* 閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�
*/
- @Excel(name = "閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�", width = 25)
@TableField("key_annotation_accuracy")
private BigDecimal keyAnnotationAccuracy;
/**
* 閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜�
*/
- @Excel(name = "閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜�", width = 25)
@TableField("key_timing_accuracy")
private BigDecimal keyTimingAccuracy;
/**
* 閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
*/
- @Excel(name = "閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�", width = 25)
@TableField("key_command_image_online")
private BigDecimal keyCommandImageOnline;
/**
* 瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊
*/
- @Excel(name = "瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊", width = 25)
@TableField("image_resource_security")
private BigDecimal imageResourceSecurity;
@@ -124,4 +114,27 @@
@ExcelIgnore
@TableField(exist = false)
private List<String> quarter;
+
+ public static CheckIndexVideoVO getExcelVo(@NonNull CheckIndexVideo checkIndexVideo) {
+ CheckIndexVideoVO checkIndexVideoVO = new CheckIndexVideoVO();
+ checkIndexVideoVO.setDeptName(checkIndexVideo.getDeptName());
+ checkIndexVideoVO.setDate(checkIndexVideo.getDate());
+ checkIndexVideoVO.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(checkIndexVideo.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ checkIndexVideoVO.setSiteOnlineText(checkIndexVideo.getSiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setImageResourceSecurityText(checkIndexVideo.getImageResourceSecurity().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setArchivesRateText(checkIndexVideo.getArchivesRate().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setKeyAnnotationAccuracyText(checkIndexVideo.getKeyAnnotationAccuracy().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setKeyCommandImageOnlineText(checkIndexVideo.getKeyCommandImageOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setKeyVideoAvailableText(checkIndexVideo.getKeyVideoAvailable().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setKeySiteOnlineText(checkIndexVideo.getKeySiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setKeyTimingAccuracyText(checkIndexVideo.getKeyTimingAccuracy().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setMinistryVideoAvailableText(checkIndexVideo.getMinistryVideoAvailable().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setVideoAvailableText(checkIndexVideo.getVideoAvailable().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setMinistrySiteOnlineText(checkIndexVideo.getMinistrySiteOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setPlatformOnlineText(checkIndexVideo.getPlatformOnline().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setMonitorQualificationText(checkIndexVideo.getMonitorQualification().multiply(new BigDecimal(100))+"%");
+ checkIndexVideoVO.setMonitorRegistrationText(checkIndexVideo.getMonitorRegistration().multiply(new BigDecimal(100))+"%");
+
+ return checkIndexVideoVO;
+ }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexCarVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexCarVO.java
new file mode 100644
index 0000000..d7146e0
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexCarVO.java
@@ -0,0 +1,47 @@
+package com.ycl.platform.domain.vo;
+
+import annotation.Excel;
+import com.ycl.platform.base.CheckIndex;
+import lombok.Data;
+@Data
+public class CheckIndexCarVO extends CheckIndex {
+ /** 瑙嗗浘搴撳鎺ョǔ瀹氭�� */
+ @Excel(name = "瑙嗗浘搴撳鎺ョǔ瀹氭��")
+ private String viewConnectStabilityText;
+
+ /** 鐐逛綅鍦ㄧ嚎鐜� */
+ @Excel(name = "鐐逛綅鍦ㄧ嚎鐜�")
+ private String siteOnlineText;
+
+ /** 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 */
+ @Excel(name = "鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼",width = 25)
+ private String deviceDirectoryConsistentText;
+
+ /** 杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� */
+ @Excel(name = "杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�",width = 25)
+ private String vehicleInformationCollectionAccuracyText;
+
+ /** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬� */
+ @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁瀹屾暣鎬�",width = 25)
+ private String vehicleCaptureIntegrityText;
+
+ /** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬� */
+ @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬�",width = 25)
+ private String vehicleCaptureAccuracyText;
+
+ /** 杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬� */
+ @Excel(name = "杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�",width = 25)
+ private String vehicleTimingAccuracyText;
+
+ /** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬� */
+ @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�",width = 25)
+ private String vehicleUploadTimelinessText;
+
+ /** 杞﹁締鍗″彛璁惧url鍙敤鎬� */
+ @Excel(name = "杞﹁締鍗″彛璁惧url鍙敤鎬�",width = 25)
+ private String vehicleUrlAvailabilityText;
+
+ /** 杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬� */
+ @Excel(name = "杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�",width = 25)
+ private String vehiclePictureAvailabilityText;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexFaceVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexFaceVO.java
new file mode 100644
index 0000000..82f7b55
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexFaceVO.java
@@ -0,0 +1,40 @@
+package com.ycl.platform.domain.vo;
+
+import annotation.Excel;
+import com.ycl.platform.base.CheckIndex;
+import lombok.Data;
+
+@Data
+public class CheckIndexFaceVO extends CheckIndex {
+ /** 瑙嗗浘搴撳鎺ョǔ瀹氭�� */
+ @Excel(name = "瑙嗗浘搴撳鎺ョǔ瀹氭��")
+ private String viewConnectStabilityText;
+
+ /** 鐐逛綅鍦ㄧ嚎鐜� */
+ @Excel(name = "鐐逛綅鍦ㄧ嚎鐜�")
+ private String siteOnlineText;
+
+ /** 璁惧鐩綍涓�鑷寸巼 */
+ @Excel(name = " 璁惧鐩綍涓�鑷寸巼")
+ private String deviceDirectoryConsistentTextText;
+
+ /** 浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� */
+ @Excel(name = "浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�",width = 25)
+ private String faceInformationCollectionAccuracyText;
+
+ /** 璁惧鎶撴媿鍥剧墖鍚堟牸鎬� */
+ @Excel(name = "璁惧鎶撴媿鍥剧墖鍚堟牸鎬�")
+ private String facePictureQualificationText;
+
+ /** 璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬� */
+ @Excel(name = "璁惧鎶撴媿鍥剧墖鏃堕挓鍑嗙‘鎬�",width = 25)
+ private String faceTimingAccuracyText;
+
+ /** 鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬� */
+ @Excel(name = "鎶撴媿浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�",width = 25)
+ private String faceUploadTimelinessText;
+
+ /** 浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬� */
+ @Excel(name = "浜鸿劯鍗″彛璁惧鎶撴媿鏁版嵁澶у浘鍙敤鎬�",width = 25)
+ private String facePictureAvailabilityText;
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexVideoVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexVideoVO.java
new file mode 100644
index 0000000..2e1c1c9
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckIndexVideoVO.java
@@ -0,0 +1,96 @@
+package com.ycl.platform.domain.vo;
+
+import annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ycl.platform.base.CheckIndex;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CheckIndexVideoVO extends CheckIndex {
+ /**
+ * 骞冲彴鍦ㄧ嚎鐜�
+ */
+ @Excel(name = "骞冲彴鍦ㄧ嚎鐜�")
+ private String platformOnlineText;
+
+ /**
+ * 涓�鏈轰竴妗ｅ悎鏍肩巼
+ */
+ @Excel(name = "涓�鏈轰竴妗ｅ悎鏍肩巼")
+ private String monitorQualificationText;
+
+ /**
+ * 妗ｆ鑰冩牳姣�
+ */
+ @Excel(name = "涓�鏈轰竴妗ｆ敞鍐岀巼")
+ private String monitorRegistrationText;
+
+ /**
+ * 妗ｆ鑰冩牳姣�
+ */
+ @Excel(name = "妗ｆ鑰冩牳姣�")
+ private String archivesRateText;
+
+ /**
+ * 鐐逛綅鍦ㄧ嚎鐜�
+ */
+ @Excel(name = "鐐逛綅鍦ㄧ嚎鐜�")
+ private String siteOnlineText;
+
+ /**
+ * 褰曡薄鍙敤鐜�
+ */
+ @Excel(name = "褰曡薄鍙敤鐜�")
+ private String videoAvailableText;
+
+ /**
+ * 閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�
+ */
+ @Excel(name = "閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�")
+ private String ministrySiteOnlineText;
+
+ /**
+ * 閮ㄧ骇宸℃褰曞儚鍙敤鐜�
+ */
+ @Excel(name = "閮ㄧ骇宸℃褰曞儚鍙敤鐜�")
+ private String ministryVideoAvailableText;
+
+ /**
+ * 閲嶇偣鐐逛綅鍦ㄧ嚎鐜�
+ */
+ @Excel(name = "閲嶇偣鐐逛綅鍦ㄧ嚎鐜�")
+ private String keySiteOnlineText;
+
+ /**
+ * 閲嶇偣鐐逛綅褰曡薄鍙敤鐜�
+ */
+ @Excel(name = "閲嶇偣鐐逛綅褰曡薄鍙敤鐜�", width = 25)
+ private String keyVideoAvailableText;
+
+ /**
+ * 閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�
+ */
+ @Excel(name = "閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�", width = 25)
+ private String keyAnnotationAccuracyText;
+
+ /**
+ * 閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜�
+ */
+ @Excel(name = "閲嶇偣鐐逛綅鎸夋椂姝ｇ‘鐜�", width = 25)
+ private String keyTimingAccuracyText;
+
+ /**
+ * 閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
+ */
+ @Excel(name = "閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜�", width = 25)
+ private String keyCommandImageOnlineText;
+
+ /**
+ * 瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊
+ */
+ @Excel(name = "瑙嗛鍥惧儚璧勬簮瀹夊叏绠＄悊", width = 25)
+ private String imageResourceSecurityText;
+
+}
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 0137fda..49f85e4 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
@@ -2,12 +2,14 @@
import annotation.DataScope;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.dto.CheckScoreDTO;
import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
import com.ycl.platform.domain.dto.ScoreIndexDTO;
import com.ycl.platform.domain.entity.*;
+import com.ycl.platform.domain.vo.CheckIndexCarVO;
+import com.ycl.platform.domain.vo.CheckIndexFaceVO;
+import com.ycl.platform.domain.vo.CheckIndexVideoVO;
import com.ycl.platform.domain.vo.CheckScoreDetailVO;
import com.ycl.platform.mapper.CheckRuleMapper;
import com.ycl.platform.mapper.CheckScoreMapper;
@@ -270,28 +272,34 @@
checkIndexCar.setDate(date);
checkIndexCar.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexCar> checkIndexCars = indexCarService.selectCheckIndexCarList(checkIndexCar);
+ List<CheckIndexCarVO> checkIndexCarVOS = new ArrayList<>();
for (CheckIndexCar indexCar : checkIndexCars) {
- indexCar.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexCar.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ CheckIndexCarVO excelVo = CheckIndexCar.getExcelVo(indexCar);
+ checkIndexCarVOS.add(excelVo);
}
- ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCars, CheckIndexCar.class);
+ ExcelExp e1 = new ExcelExp("杞﹁締鑰冩牳鎸囨爣鏁版嵁", checkIndexCarVOS, CheckIndexCarVO.class);
//浜鸿劯
CheckIndexFace checkIndexFace = new CheckIndexFace();
checkIndexFace.setDate(date);
checkIndexFace.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexFace> checkIndexFaces = indexFaceService.selectCheckIndexFaceList(checkIndexFace);
+ List<CheckIndexFaceVO> checkIndexFaceVOS = new ArrayList<>();
for (CheckIndexFace indexFace : checkIndexFaces) {
- indexFace.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexFace.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ CheckIndexFaceVO excelVo = CheckIndexFace.getExcelVo(indexFace);
+ checkIndexFaceVOS.add(excelVo);
}
- ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaces, CheckIndexFace.class);
+ ExcelExp e2 = new ExcelExp("浜鸿劯鑰冩牳鎸囨爣鏁版嵁", checkIndexFaceVOS, CheckIndexFaceVO.class);
//瑙嗛
CheckIndexVideo checkIndexVideo = new CheckIndexVideo();
checkIndexVideo.setDate(date);
checkIndexVideo.setQuarter(checkScoreDTO.getQuarter());
List<CheckIndexVideo> checkIndexVideos = indexVideoService.selectCheckIndexVideoList(checkIndexVideo);
+ List<CheckIndexVideoVO> checkIndexVideoVOS = new ArrayList<>();
for (CheckIndexVideo indexVideo : checkIndexVideos) {
- indexVideo.setExamineTagStr(CheckConstants.Examine_Tag_Province.equals(indexVideo.getExamineTag()) ? "鐪佸巺鑰冩牳" : "鍖哄幙鑰冩牳");
+ CheckIndexVideoVO excelVo = CheckIndexVideo.getExcelVo(indexVideo);
+ checkIndexVideoVOS.add(excelVo);
}
- ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁", checkIndexVideos, CheckIndexVideo.class);
+ ExcelExp e3 = new ExcelExp("瑙嗛鑰冩牳鎸囨爣鏁版嵁", checkIndexVideoVOS, CheckIndexVideoVO.class);
List<ExcelExp> mysheet = new ArrayList<>();
mysheet.add(e1);
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
index ef79637..df07d02 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckScoreMapper.xml
@@ -144,7 +144,7 @@
<if test="params.publish != null and params.publish != ''">and publish = #{params.publish}</if>
${params.dataScope}
</where>
- GROUP BY tcs.dept_id, tcs.examine_category, tcs.examine_tag
+-- GROUP BY tcs.dept_id, tcs.examine_category, tcs.examine_tag
</select>
<select id="getLast" resultType="com.ycl.platform.domain.entity.CheckScore">
--
Gitblit v1.8.0