From d27176de051789e2725c5b21c7017729aa36b913 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 03 十二月 2024 11:30:35 +0800
Subject: [PATCH] 重构获取处理结果详情接口，照片列表、音频列表、视频列表改为JSONArray类型
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java | 13 ++--
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java | 18 +++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java | 94 +++++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java | 4
5 files changed, 121 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java
index c3ab70b..98bb782 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoOp/OpeProcessingResultMapper.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoOp.OpeProcessingResult;
-import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -54,5 +54,5 @@
* @param proResultId
* @return
*/
- VoProcessingResult getProResultById(Long proResultId);
+ VoProcessingResult_temp getProResultById(Long proResultId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java
index 5e4a1a5..3f5753d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrGlobal.voOp;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
@@ -12,9 +13,9 @@
/**
* @author ZhuBaoMin
- * @date 2024-11-08 14:59
- * @LastEditTime 2024-11-08 14:59
- * @Description
+ * @date 2024-12-03 10:56
+ * @LastEditTime 2024-12-03 10:56
+ * @Description 澶勭悊缁撴灉璇︽儏瑙嗗浘瀵硅薄
*/
@Data
@@ -47,17 +48,17 @@
/**
* 鐓х墖鍒楄〃
*/
- private String images;
+ private JSONArray images;
/**
* 闊抽鍒楄〃
*/
- private String audios;
+ private JSONArray audios;
/**
* 瑙嗛鍒楄〃
*/
- private String videos;
+ private JSONArray videos;
/**
* 缁忓害
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java
new file mode 100644
index 0000000..88852aa
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java
@@ -0,0 +1,94 @@
+package com.dy.pipIrrGlobal.voOp;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-11-08 14:59
+ * @LastEditTime 2024-11-08 14:59
+ * @Description 澶勭悊缁撴灉璇︽儏涓存椂瑙嗗浘瀵硅薄
+ */
+
+@Data
+@JsonPropertyOrder({"proResultId","workOrderId","inspector","content"," images"," audios"," videos","lng","lat","completeTime","reportTime","state","stateName"})
+public class VoProcessingResult_temp implements BaseEntity {
+ public static final long serialVersionUID = 202411081500001L;
+
+ /**
+ * 澶勭悊缁撴灉ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long proResultId;
+
+ /**
+ * 宸ュ崟ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long workOrderId;
+
+ /**
+ * 宸℃鍛�
+ */
+ private String inspector;
+
+ /**
+ * 缁撴灉鍐呭
+ */
+ private String content;
+
+ /**
+ * 鐓х墖鍒楄〃
+ */
+ private String images;
+
+ /**
+ * 闊抽鍒楄〃
+ */
+ private String audios;
+
+ /**
+ * 瑙嗛鍒楄〃
+ */
+ private String videos;
+
+ /**
+ * 缁忓害
+ */
+ private BigDecimal lng;
+
+ /**
+ * 绾害
+ */
+ private BigDecimal lat;
+
+ /**
+ * 浠诲姟瀹屾垚鏃堕棿;绮剧‘鍒板垎
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ private Date completeTime;
+
+ /**
+ * 涓婃姤鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date reportTime;
+
+ /**
+ * 鐘舵��;1-宸蹭笂鎶ワ紝2-宸查�氳繃锛�3-宸查┏鍥�
+ */
+ private Byte state;
+
+ /**
+ * 鐘舵�佸悕绉�
+ */
+ private String stateName;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
index 4315729..f6e39d6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/OpeProcessingResultMapper.xml
@@ -212,7 +212,7 @@
</update>
<!--鏍规嵁涓婚敭鑾峰彇澶勭悊缁撴灉瑙嗗浘瀵硅薄-->
- <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult">
+ <select id="getProResultById" resultType="com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp">
SELECT
res.id AS proResultId,
res.work_order_id AS workOrderId,
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
index b09f6c8..3b1c0c4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/workOrder/WorkOrderSv.java
@@ -1,5 +1,7 @@
package com.dy.pipIrrApp.workOrder;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrApp.workOrder.qo.QoWorkOrder;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
@@ -12,16 +14,19 @@
import com.dy.pipIrrGlobal.pojoOp.OpeWorkOrder;
import com.dy.pipIrrGlobal.voBa.VoRoleSimple;
import com.dy.pipIrrGlobal.voOp.VoProcessingResult;
+import com.dy.pipIrrGlobal.voOp.VoProcessingResult_temp;
import com.dy.pipIrrGlobal.voOp.VoTaskType;
import com.dy.pipIrrGlobal.voOp.VoWorkOrder;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
/**
* @author ZhuBaoMin
@@ -182,7 +187,18 @@
* @return
*/
public VoProcessingResult getProResultById(Long proResultId) {
- return opeProcessingResultMapper.getProResultById(proResultId);
+ VoProcessingResult_temp result_temp = opeProcessingResultMapper.getProResultById(proResultId);
+ VoProcessingResult result = new VoProcessingResult();
+ BeanUtils.copyProperties(result_temp, result);
+
+ JSONArray images_array = Optional.ofNullable(JSON.parseArray(result_temp.getImages())).orElse(new JSONArray());
+ JSONArray audios_array = Optional.ofNullable(JSON.parseArray(result_temp.getAudios())).orElse(new JSONArray());
+ JSONArray videos_array = Optional.ofNullable(JSON.parseArray(result_temp.getVideos())).orElse(new JSONArray());
+ result.setImages(images_array);
+ result.setAudios(audios_array);
+ result.setVideos(videos_array);
+
+ return result;
}
/**
--
Gitblit v1.8.0