From 1f19230e00b543b58f03853df1a38ebd8b508e55 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 16:55:01 +0800
Subject: [PATCH] 发布灌溉计划并生成开阀计划

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/issue/IssueSv.java |   74 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 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 367d6b9..7fc6ea1 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,20 +1,28 @@
 package com.dy.pipIrrWechat.issue;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.dy.common.util.NumUtil;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.daoSe.SeIssueReportMapper;
 import com.dy.pipIrrGlobal.daoSe.SeReportReplyMapper;
+import com.dy.pipIrrGlobal.dyFile.FileOperate;
+import com.dy.pipIrrGlobal.dyFile.FileRestVo;
 import com.dy.pipIrrGlobal.pojoSe.SeIssueReport;
 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.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author ZhuBaoMin
@@ -32,14 +40,48 @@
     @Autowired
     private SeReportReplyMapper seReportReplyMapper;
 
+    @Value("${dy.webFile.fmUrl}")
+    private String fmUrl ;
+
+    @Autowired
+    private FileOperate fileOp ;
+
+    private void dealWebFilePath(JSONArray jsonArray, boolean hasZipFile, boolean isVideo){
+        for (Object obj : jsonArray){
+            if(obj instanceof JSONObject){
+                JSONObject jsonObject = (JSONObject) obj;
+                Object hashObj = jsonObject.get("hash") ;
+                if(hashObj != null && NumUtil.isIntNumber(hashObj.toString())){
+                    FileRestVo fvo = fileOp.parseHashcode(fmUrl, Integer.valueOf(hashObj.toString()));
+                    if(fvo != null && fvo.fileWebUrl != null){
+                        jsonObject.put("webPath", fvo.fileWebUrl + jsonObject.get("filePath"));
+                        if(hasZipFile){
+                            if(!isVideo){
+                                jsonObject.put("webPathZip", fileOp.getFileZipPath(fvo.fileWebUrl + jsonObject.get("filePath")));
+                            }else{
+                                jsonObject.put("webPathZip", fileOp.getFileZipPath(fvo.fileWebUrl + jsonObject.get("filePath"), "jpg"));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
     /**
-     * 娣诲姞闂涓婃姤淇℃伅
+     * 娣诲姞鐢ㄦ埛闂涓婃姤
      * @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";
     }
 
     /**
@@ -78,7 +120,27 @@
         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());
+            this.dealWebFilePath(images_array, true, false) ;
+            this.dealWebFilePath(audios_array, false, false) ;
+            this.dealWebFilePath(videos_array, true, true) ;
+            report.setImages(images_array);
+            report.setAudios(audios_array);
+            report.setVideos(videos_array);
+            list.add(report);
+        }
+
+        rsVo.obj = list;
         return rsVo;
     }
 

--
Gitblit v1.8.0