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); } 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; /** * 经度 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voOp/VoProcessingResult_temp.java
New file @@ -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; } 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, 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; } /**
