新增数据上传准东

heheng

2025-11-19 247a4a1f10f233c89a4bd054dee3cb9b7d4a76f1

 src/main/java/com/ruoyi/doublePrevention/scheduls/ZhunDongSchedule.java

@@ -476,11 +476,11 @@
                reportCheckRecordFromTaskDTO.setMOBILE_ME(cjRecordFromTask.getMobileCode());
                reportCheckRecordFromTaskDTO.setIS_DEFEND(cjRecordFromTask.getDefend());
                reportCheckRecordFromTaskDTO.setCREATE_BY_MOBILE(cjRecordFromTask.getCreateByMobile());
                reportCheckRecordFromTaskDTO.setUPDATE_BY_MOBILE(cjRecordFromTask.getUpdateByMobile());
                reportCheckRecordFromTaskDTO.setUPDATE_BY_MOBILE(ObjectUtils.isEmpty(cjRecordFromTask.getUpdateByMobile()) ? cjRecordFromTask.getCreateByMobile() : cjRecordFromTask.getUpdateByMobile());
                reportCheckRecordFromTaskDTO.setCREATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRecordFromTask.getCreateDate()));
                reportCheckRecordFromTaskDTO.setUPDATE_TIME(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRecordFromTask.getUpdateDate()));
                reportCheckRecordFromTaskDTO.setUPDATE_TIME(ObjectUtils.isEmpty(cjRecordFromTask.getUpdateDate()) ? DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRecordFromTask.getCreateDate()):DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, cjRecordFromTask.getUpdateDate()));
                reportCheckRecordFromTaskDTO.setCREATE_BY(cjRecordFromTask.getCreateBy());
                reportCheckRecordFromTaskDTO.setUPDATE_BY(cjRecordFromTask.getUpdateBy());
                reportCheckRecordFromTaskDTO.setUPDATE_BY(ObjectUtils.isEmpty(cjRecordFromTask.getUpdateBy()) ? cjRecordFromTask.getCreateBy() :cjRecordFromTask.getUpdateBy());
                reportCheckRecordFromTaskDTO.setDELETE_MARK(cjRecordFromTask.getDeleted());
                reportCheckRecordFromTaskDTOS.add(reportCheckRecordFromTaskDTO);

@@ -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 {