From 9610cc33eb1fec9e9ba9dc9c8fc1032cb6e6058a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 18:44:56 +0800
Subject: [PATCH] 工单下发分页优化
---
ycl-server/src/main/java/com/ycl/platform/service/HKErrorTypeService.java | 76 +++++++++++++++++++
ycl-server/src/main/java/com/ycl/task/HKTask.java | 3
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 30 ++++++-
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java | 5 +
ycl-server/src/main/java/com/ycl/platform/service/impl/HKErrorTypeServiceImpl.java | 74 ++++++++++++++++++
5 files changed, 181 insertions(+), 7 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
index fab30c1..cfefabe 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
@@ -32,6 +32,11 @@
private Integer unitId;
/**
+ * 鏁呴殰绫诲瀷
+ */
+ private List<String> errorTypeList;
+
+ /**
* 宸ュ崟id
*/
@JsonProperty("ids")
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/HKErrorTypeService.java b/ycl-server/src/main/java/com/ycl/platform/service/HKErrorTypeService.java
new file mode 100644
index 0000000..5bf94ea
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/HKErrorTypeService.java
@@ -0,0 +1,76 @@
+package com.ycl.platform.service;
+
+import com.ycl.platform.domain.result.HK.*;
+
+import java.util.List;
+
+/**
+ * 娴峰悍妫�娴�
+ *
+ * @author锛歺p
+ * @date锛�2024/8/24 17:45
+ */
+public interface HKErrorTypeService {
+
+ /**
+ * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋� 杞﹁締/浜鸿劯
+ *
+ */
+ void snapshotDataMonitorTaskCheck(List<SnapshotDataMonitorResult> dataList);
+
+
+ /**
+ * 閲囬泦璁惧灞炴�х洃娴嬬粨鏋�(浜鸿劯)
+ *
+ */
+ void monitorDetailTaskCheck(List<MonitoringDetailResult> dataList);
+
+
+ /**
+ * 鍗″彛灞炴�х洃娴嬬粨鏋�
+ *
+ */
+ void crossDetailTaskCheck(List<CrossDetailResult> dataList);
+
+
+ /**
+ * 鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋�
+ *
+ */
+ void dataIntegrityMonitoringTaskCheck(List<DataIntegrityMonitoringResult> dataList);
+
+
+ /**
+ * 灞炴�ц瘑鍒噯纭洃娴嬬粨鏋�
+ *
+ */
+ void attrRecognitionMonitorTaskCheck(List<AttrRecognitionMonitorResult> dataList);
+
+
+ /**
+ * 鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉
+ *
+ */
+ void snapshopDelayMonitorTaskCheck(List<SnapshotDelayMonitorResult> dataList);
+
+
+ /**
+ * 鍥剧墖璁块棶鐩戞祴缁撴灉
+ *
+ */
+ void picAccessTaskCheck(List<PicAccessResult> dataList);
+
+
+ /**
+ * 杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+ *
+ */
+ void vehicleDeviceSamplingTaskCheck(List<VehicleDeviceSamplingResult> dataList);
+
+
+ /**
+ * 浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
+ *
+ */
+ void faceDeviceSamplingTaskCheck(List<FaceDeviceSamplingResult> dataList);
+}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/HKErrorTypeServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/HKErrorTypeServiceImpl.java
new file mode 100644
index 0000000..c36bdeb
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/HKErrorTypeServiceImpl.java
@@ -0,0 +1,74 @@
+package com.ycl.platform.service.impl;
+
+import com.ycl.platform.domain.entity.WorkOrder;
+import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.service.HKErrorTypeService;
+import com.ycl.platform.service.WorkOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/8/24 17:58
+ */
+@Service
+@RequiredArgsConstructor
+public class HKErrorTypeServiceImpl implements HKErrorTypeService {
+
+ private final WorkOrderService workOrderService;
+
+ /**
+ * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋� 杞﹁締/浜鸿劯
+ *
+ * @param dataList
+ */
+ @Override
+ public void snapshotDataMonitorTaskCheck(List<SnapshotDataMonitorResult> dataList) {
+
+ }
+
+ @Override
+ public void monitorDetailTaskCheck(List<MonitoringDetailResult> dataList) {
+
+ }
+
+ @Override
+ public void crossDetailTaskCheck(List<CrossDetailResult> dataList) {
+// dataList.stream().map(item -> {
+// WorkOrder workOrder = new WorkOrder();
+// if (item.get)
+// })
+ }
+
+ @Override
+ public void dataIntegrityMonitoringTaskCheck(List<DataIntegrityMonitoringResult> dataList) {
+
+ }
+
+ @Override
+ public void attrRecognitionMonitorTaskCheck(List<AttrRecognitionMonitorResult> dataList) {
+
+ }
+
+ @Override
+ public void snapshopDelayMonitorTaskCheck(List<SnapshotDelayMonitorResult> dataList) {
+
+ }
+
+ @Override
+ public void picAccessTaskCheck(List<PicAccessResult> dataList) {
+
+ }
+
+ @Override
+ public void vehicleDeviceSamplingTaskCheck(List<VehicleDeviceSamplingResult> dataList) {
+
+ }
+
+ @Override
+ public void faceDeviceSamplingTaskCheck(List<FaceDeviceSamplingResult> dataList) {
+
+ }
+}
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index 00b346a..6072c95 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -87,7 +87,7 @@
}
- //鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
+ // 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�
public void snapshotDataMonitorTask() {
log.info("寮�濮嬫墽琛屾姄鎷嶆暟鎹噺妫�娴嬬粨鏋滄暟鎹悓姝�");
/** 杞﹁締鏁版嵁 */
@@ -285,6 +285,7 @@
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
}
+
//杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉
public void vehicleDeviceSamplingTask() {
log.info("寮�濮嬫墽琛岃溅杈嗚澶囨娊妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 87b67e7..da3a49f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -39,11 +39,11 @@
FROM
t_work_order wo
INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
- LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
- LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
+ LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
WHERE
wo.deleted = 0
<if test="query.workOrderNo != null and query.workOrderNo != ''">
@@ -65,19 +65,25 @@
<select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
SELECT
- wo.*,
- u.unit_name,
+ wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ u.unit_name,
p.yw_person_name,
yp.province_tag,
yp.important_tag,
yp.important_command_image_tag,
odr.create_time as distributeTime,
- su.nick_name as realName
+ su.nick_name as realName,
+ tm.name as source,
+ GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR '銆�') AS errorType
FROM
t_work_order wo
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
+ INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
+ INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
+ collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
- INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_no = wo.work_order_no AND odr.deleted = 0
LEFT JOIN sys_user su ON su.user_id = odr.user_id
WHERE
@@ -88,6 +94,18 @@
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
</if>
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword}, '%'))
+ </if>
+ GROUP BY
+ wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ u.unit_name,
+ p.yw_person_name,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag,
+ odr.create_time,
+ su.nick_name
ORDER BY wo.create_time DESC
</select>
--
Gitblit v1.8.0