From e36d6d9718f6e0bd6c262ffbec46938674f33008 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 03 十二月 2024 16:07:10 +0800
Subject: [PATCH] 重构获取巡检员问题上报接口，重构获取农户问题上报接口

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
index 101be67..3354a6f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java
@@ -1,5 +1,7 @@
 package com.dy.pipIrrWechat.issue;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.daoSe.SeIssueReportMapper;
 import com.dy.pipIrrGlobal.daoSe.SeReportReplyMapper;
@@ -7,14 +9,15 @@
 import com.dy.pipIrrGlobal.pojoSe.SeReportReply;
 import com.dy.pipIrrGlobal.voSe.VoIssueReport;
 import com.dy.pipIrrGlobal.voSe.VoIssueReportReply;
+import com.dy.pipIrrGlobal.voSe.VoIssueReport_temp;
 import com.dy.pipIrrWechat.issue.qo.QoIssueReport;
 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.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author ZhuBaoMin
@@ -33,13 +36,29 @@
     private SeReportReplyMapper seReportReplyMapper;
 
     /**
-     * 娣诲姞闂涓婃姤淇℃伅
+     * 娣诲姞鐢ㄦ埛闂涓婃姤
      * @param po
      * @return
      */
-    public Long insertIssueReport(SeIssueReport po) {
+    public String addIssueReport(SeIssueReport po) {
+        po.setReportTime(new Date());
+        po.setState((byte)1);
         seIssueReportMapper.insert(po);
-        return po.getId();
+        Long issueReportId = po.getId();
+        if(issueReportId == null) {
+            return "鍐滄埛闂涓婃姤澶辫触";
+        }
+
+        return "success";
+    }
+
+    /**
+     * 淇敼鍐滄埛闂涓婃姤鐘舵�侊紝鍥炲鍙婂垹闄ゆ椂浣跨敤
+     * @param po
+     * @return
+     */
+    public Integer updateIssueReport(SeIssueReport po) {
+        return seIssueReportMapper.updateByPrimaryKeySelective(po);
     }
 
     /**
@@ -69,11 +88,38 @@
         rsVo.pageCurr = queryVo.pageCurr;
 
         rsVo.calculateAndSet(itemTotal, params);
-        rsVo.obj = seIssueReportMapper.getIssueReports(params);
+
+        List<VoIssueReport_temp> list_temp = seIssueReportMapper.getIssueReports(params);
+        List<VoIssueReport> list = new ArrayList<>();
+        for (int i = 0; i < list_temp.size(); i++) {
+            VoIssueReport_temp report_temp = list_temp.get(i);
+            VoIssueReport report = new VoIssueReport();
+            BeanUtils.copyProperties(report_temp, report);
+
+            JSONArray images_array = Optional.ofNullable(JSON.parseArray(report_temp.getImages())).orElse(new JSONArray());
+            JSONArray audios_array = Optional.ofNullable(JSON.parseArray(report_temp.getAudios())).orElse(new JSONArray());
+            JSONArray videos_array = Optional.ofNullable(JSON.parseArray(report_temp.getVideos())).orElse(new JSONArray());
+            report.setImages(images_array);
+            report.setAudios(audios_array);
+            report.setVideos(videos_array);
+            list.add(report);
+        }
+
+        rsVo.obj = list;
         return rsVo;
     }
 
     /**
+     * 鏍规嵁涓婃姤ID鍙婂啘鎴稩D鑾峰彇鏈垹闄ょ殑涓婃姤锛屽垹闄や笂鎶ュ垽鏂娇鐢�
+     * @param issueReportId
+     * @param clientId
+     * @return
+     */
+    public SeIssueReport getReport(Long issueReportId, Long clientId) {
+        return seIssueReportMapper.getReport(issueReportId, clientId);
+    }
+
+    /**
      * 鍒犻櫎鍐滄埛闂涓婃姤
      * @param issueReportId
      * @return

--
Gitblit v1.8.0