From 247a4a1f10f233c89a4bd054dee3cb9b7d4a76f1 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期三, 19 十一月 2025 08:40:12 +0800
Subject: [PATCH] 新增数据上传准东

---
 src/main/java/com/ruoyi/doublePrevention/scheduls/ZhunDongSchedule.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ZhunDongSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ZhunDongSchedule.java
index 5fadd21..5fe3f44 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ZhunDongSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ZhunDongSchedule.java
@@ -588,8 +588,12 @@
                 //非必传
 //                cjReportDangerInfoDTO.setMANAGEMENT_CLASSIFICATION(cjDangerInfo.getManagementClassification());
 //                cjReportDangerInfoDTO.setOCCURRENCE_LINK(cjDangerInfo.getOccurrenceLink());
-//                cjReportDangerInfoDTO.setATTACHMENTS1(ImageToBase64.convertImageToBase64(cjDangerInfo.getPreRectifyPhoto()));
-//                cjReportDangerInfoDTO.setATTACHMENTS2(ImageToBase64.convertImageToBase64(cjDangerInfo.getPostRectifyPhoto()));
+                if(ObjectUtils.isNotEmpty(cjDangerInfo.getPreRectifyPhoto())){
+                    cjReportDangerInfoDTO.setATTACHMENTS1(ImageToBase64.convertImageToBase64More(cjDangerInfo.getPreRectifyPhoto()));
+                }
+                if (ObjectUtils.isNotEmpty(cjDangerInfo.getPostRectifyPhoto())) {
+                    cjReportDangerInfoDTO.setATTACHMENTS2(ImageToBase64.convertImageToBase64More(cjDangerInfo.getPostRectifyPhoto()));
+                }
                // cjReportDangerInfoDTO.setFJ(cjDangerInfo.getRectifyAttachment());
 
                 cjReportDangerInfoDTO.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjDangerInfo.getCreateDate()));
@@ -601,7 +605,7 @@
             }
 
             //数据上报
-            log.info("【F】隐患信息-处理数据【原始数据】" + JSONObject.toJSONString(reportDangerInfoLists));
+           // log.info("【F】隐患信息-处理数据【原始数据】" + JSONObject.toJSONString(reportDangerInfoLists));
             StringBuffer dangerInfoResultBuffer = null;
             //上报数据
             try {

--
Gitblit v1.9.2