From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml | 20 +++++-----
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java | 3 -
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 6 ++-
ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml | 16 ++++----
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 42 ++++++++++----------
ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java | 13 ++++++
7 files changed, 58 insertions(+), 44 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java b/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java
index 81d3c21..edc84b3 100644
--- a/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java
+++ b/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java
@@ -36,4 +36,17 @@
this.value = value;
}
+ public static String getEnumValue(String value) {
+ String[] values = value.split(",");
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < values.length; i++) {
+ sb.append(ErrorTypeEnum.valueOf(values[i]).getValue());
+ if (i != values.length - 1) {
+ sb.append(",");
+ }
+ }
+ return sb.toString();
+ }
+
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
index 077fa1f..ac0ff06 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -4,7 +4,6 @@
import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.system.domain.group.Add;
import com.ycl.system.domain.group.Update;
-import enumeration.general.ErrorTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import jakarta.validation.constraints.NotBlank;
@@ -47,7 +46,7 @@
@NotEmpty(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏁呴殰绫诲瀷")
- private List<ErrorTypeEnum> errorType;
+ private List<String> errorType;
// @NotNull(message = "杩愮淮浜哄憳涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮浜哄憳")
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 1231123..c298405 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -234,8 +234,8 @@
Date now = new Date();
entity.setCreateTime(now);
entity.setUpdateTime(now);
- entity.setErrorType(form.getErrorType().stream().map(ErrorTypeEnum::getValue).collect(Collectors.joining(",")));
- List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType.getValue())).toList();
+ entity.setErrorType(String.join(",", form.getErrorType()));
+ List<WorkOrderErrorType> workOrderErrorTypes = form.getErrorType().stream().map(errorType -> new WorkOrderErrorType(entity.getWorkOrderNo(), errorType)).toList();
workOrderErrorTypeMapper.insertWorkOrderErrorTypeList(workOrderErrorTypes);
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
@@ -421,6 +421,7 @@
public Result page(WorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
baseMapper.page(page, query);
+ page.getRecords().forEach(item -> item.setErrorType(ErrorTypeEnum.getEnumValue(item.getErrorType())));
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@@ -428,6 +429,7 @@
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
baseMapper.distributePage(page, query);
+ page.getRecords().forEach(item -> item.setErrorType(ErrorTypeEnum.getEnumValue(item.getErrorType())));
return Result.ok().data(page).total(page.getTotal());
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
index ccf2eb8..0564240 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
@@ -127,16 +127,16 @@
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexCar">
SELECT
- IFNULL(ROUND(AVG(view_connect_stability * 100), 2), 0) AS view_connect_stability,
- IFNULL(ROUND(AVG(site_online * 100), 2), 0) AS site_online,
- IFNULL(ROUND(AVG(device_directory_consistent * 100), 2), 0) AS device_directory_consistent,
- IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 2), 0) AS vehicle_information_collection_accuracy,
- IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 2), 0) AS vehicle_capture_integrity,
- IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 2), 0) AS vehicle_capture_accuracy,
- IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 2), 0) AS vehicle_timing_accuracy,
- IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 2), 0) AS vehicle_upload_timeliness,
- IFNULL(ROUND(AVG(vehicle_url_availability * 100), 2), 0) AS vehicle_url_availability,
- IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 2), 0) AS vehicle_picture_availability
+ IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
+ IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
+ IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
+ IFNULL(ROUND(AVG(vehicle_information_collection_accuracy * 100), 0), 0) AS vehicle_information_collection_accuracy,
+ IFNULL(ROUND(AVG(vehicle_capture_integrity * 100), 0), 0) AS vehicle_capture_integrity,
+ IFNULL(ROUND(AVG(vehicle_capture_accuracy * 100), 0), 0) AS vehicle_capture_accuracy,
+ IFNULL(ROUND(AVG(vehicle_timing_accuracy * 100), 0), 0) AS vehicle_timing_accuracy,
+ IFNULL(ROUND(AVG(vehicle_upload_timeliness * 100), 0), 0) AS vehicle_upload_timeliness,
+ IFNULL(ROUND(AVG(vehicle_url_availability * 100), 0), 0) AS vehicle_url_availability,
+ IFNULL(ROUND(AVG(vehicle_picture_availability * 100), 0), 0) AS vehicle_picture_availability
FROM
t_check_index_car
<where>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
index d38a48a..8570bc1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
@@ -117,14 +117,14 @@
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexFace">
SELECT
- IFNULL(ROUND(AVG(view_connect_stability * 100), 2), 0) AS view_connect_stability,
- IFNULL(ROUND(AVG(site_online * 100), 2), 0) AS site_online,
- IFNULL(ROUND(AVG(device_directory_consistent * 100), 2), 0) AS device_directory_consistent,
- IFNULL(ROUND(AVG(face_information_collection_accuracy * 100), 2), 0) AS face_information_collection_accuracy,
- IFNULL(ROUND(AVG(face_picture_qualification * 100), 2), 0) AS face_picture_qualification,
- IFNULL(ROUND(AVG(face_timing_accuracy * 100), 2), 0) AS face_timing_accuracy,
- IFNULL(ROUND(AVG(face_upload_timeliness * 100), 2), 0) AS face_upload_timeliness,
- IFNULL(ROUND(AVG(face_picture_availability * 100), 2), 0) AS face_picture_availability
+ IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
+ IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
+ IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
+ IFNULL(ROUND(AVG(face_information_collection_accuracy * 100), 0), 0) AS face_information_collection_accuracy,
+ IFNULL(ROUND(AVG(face_picture_qualification * 100), 0), 0) AS face_picture_qualification,
+ IFNULL(ROUND(AVG(face_timing_accuracy * 100), 0), 0) AS face_timing_accuracy,
+ IFNULL(ROUND(AVG(face_upload_timeliness * 100), 0), 0) AS face_upload_timeliness,
+ IFNULL(ROUND(AVG(face_picture_availability * 100), 0), 0) AS face_picture_availability
FROM
t_check_index_face
<where>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index c5f1d1c..6f11cfc 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -178,27 +178,27 @@
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexVideo">
SELECT
- IFNULL(ROUND(AVG(platform_online * 100), 2), 0) AS platform_online,
- IFNULL(ROUND(AVG(monitor_qualification * 100), 2), 0) AS monitor_qualification,
- IFNULL(ROUND(AVG(monitor_registration * 100), 2), 0) AS monitor_registration,
- IFNULL(ROUND(AVG(archives_rate * 100), 2), 0) AS archives_rate,
- IFNULL(ROUND(AVG(site_online * 100), 2), 0) AS site_online,
- IFNULL(ROUND(AVG(video_available * 100), 2), 0) AS video_available,
- IFNULL(ROUND(AVG(annotation_accuracy * 100), 2), 0) AS annotation_accuracy,
- IFNULL(ROUND(AVG(timing_accuracy * 100), 2), 0) AS timing_accuracy,
- IFNULL(ROUND(AVG(key_site_online * 100), 2), 0) AS key_site_online,
- IFNULL(ROUND(AVG(key_video_available * 100), 2), 0) AS key_video_available,
- IFNULL(ROUND(AVG(key_annotation_accuracy * 100), 2), 0) AS key_annotation_accuracy,
- IFNULL(ROUND(AVG(key_timing_accuracy * 100), 2), 0) AS key_timing_accuracy,
- IFNULL(ROUND(AVG(key_command_image_inspection * 100), 2), 0) AS key_command_image_inspection,
- IFNULL(ROUND(AVG(key_command_image_directory_tree * 100), 2), 0) AS key_command_image_directory_tree,
- IFNULL(ROUND(AVG(online_inspection_platform * 100), 2), 0) AS online_inspection_platform,
- IFNULL(ROUND(AVG(video_transmission_assets_accuracy * 100), 2), 0) AS video_transmission_assets_accuracy,
- IFNULL(ROUND(AVG(video_transmission_assets_weak_password_score * 100), 2), 0) AS video_transmission_assets_weak_password_score,
- IFNULL(ROUND(AVG(video_transmission_dangerous_assets_score * 100), 2), 0) AS video_transmission_dangerous_assets_score,
- IFNULL(ROUND(AVG(video_transmission_boundary_integrity_detection * 100), 2), 0) AS video_transmission_boundary_integrity_detection,
- IFNULL(ROUND(AVG(operating_rate * 100), 2), 0) AS operating_rate,
- IFNULL(ROUND(AVG(key_command_image_online * 100), 2), 0) AS key_command_image_online
+ IFNULL(ROUND(AVG(platform_online * 100), 0), 0) AS platform_online,
+ IFNULL(ROUND(AVG(monitor_qualification * 100), 0), 0) AS monitor_qualification,
+ IFNULL(ROUND(AVG(monitor_registration * 100), 0), 0) AS monitor_registration,
+ IFNULL(ROUND(AVG(archives_rate * 100), 0), 0) AS archives_rate,
+ IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
+ IFNULL(ROUND(AVG(video_available * 100), 0), 0) AS video_available,
+ IFNULL(ROUND(AVG(annotation_accuracy * 100), 0), 0) AS annotation_accuracy,
+ IFNULL(ROUND(AVG(timing_accuracy * 100), 0), 0) AS timing_accuracy,
+ IFNULL(ROUND(AVG(key_site_online * 100), 0), 0) AS key_site_online,
+ IFNULL(ROUND(AVG(key_video_available * 100), 0), 0) AS key_video_available,
+ IFNULL(ROUND(AVG(key_annotation_accuracy * 100), 0), 0) AS key_annotation_accuracy,
+ IFNULL(ROUND(AVG(key_timing_accuracy * 100), 0), 0) AS key_timing_accuracy,
+ IFNULL(ROUND(AVG(key_command_image_inspection * 100), 0), 0) AS key_command_image_inspection,
+ IFNULL(ROUND(AVG(key_command_image_directory_tree * 100), 0), 0) AS key_command_image_directory_tree,
+ IFNULL(ROUND(AVG(online_inspection_platform * 100), 0), 0) AS online_inspection_platform,
+ IFNULL(ROUND(AVG(video_transmission_assets_accuracy * 100), 0), 0) AS video_transmission_assets_accuracy,
+ IFNULL(ROUND(AVG(video_transmission_assets_weak_password_score * 100), 0), 0) AS video_transmission_assets_weak_password_score,
+ IFNULL(ROUND(AVG(video_transmission_dangerous_assets_score * 100), 0), 0) AS video_transmission_dangerous_assets_score,
+ IFNULL(ROUND(AVG(video_transmission_boundary_integrity_detection * 100), 0), 0) AS video_transmission_boundary_integrity_detection,
+ IFNULL(ROUND(AVG(operating_rate * 100), 0), 0) AS operating_rate,
+ IFNULL(ROUND(AVG(key_command_image_online * 100), 0), 0) AS key_command_image_online
FROM
t_check_index_video
<where>
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index a8335db..2c4687d 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -167,7 +167,7 @@
LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
WHERE d.del_flag = 0 AND d.area IS NOT NULL
<if test="dataScope == 1"> AND p.province_tag = 'province' </if>
- <if test="deptId != null"> /*AND p.dept_id = #{deptId}*/ </if>
+ <!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
GROUP BY d.area, d.dept_id
ORDER BY d.dept_id
</select>
--
Gitblit v1.8.0