下发判断修改

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java

@@ -372,10 +372,13 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
     }
 
     public void batchInsertReportData(String reportId, String mainId) {
+        log.info("batchInsertReportData reportId:" + reportId + ", mainId:" + mainId);
         long startTime = System.currentTimeMillis();
         List<PatrolResultRef> patrolResultRefs = patrolResultMapper.selectResultRefByLineId(mainId);
+        log.info("batchInsertReportData patrolResultRefs:" + patrolResultRefs);
         startTime = PrintUtil.useTime("SELECT RESULT", startTime);
         List<BasePointAreaInfo> basePointAreaInfoList = patrolResultMapper.selectBaseInfoByMainId(mainId);
+        log.info("batchInsertReportData basePointAreaInfoList:" + basePointAreaInfoList);
         PrintUtil.useTime("AREA INQUERY", startTime);
         log.info("REPORTS SIZE: {}", patrolResultRefs.size());
         List<InspectionReportData> reportDatas = new ArrayList<>();
@@ -441,6 +444,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
             final String reportDataId = reportId + "_" + (100000 + index);
             reportData.setLineId(reportDataId);
             reportDatas.add(reportData);
+            log.info("batchInsertReportData reportData:" + reportData);
             String resultContent = patrolResultRef.getResultContent();
             List<resultList> results = JSONObject.parseObject(resultContent).getJSONArray("resultList").toJavaList(resultList.class);
             String imgUrl = results.get(0).getResults().get(0).getResImageUrl();
@@ -455,6 +459,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
             reportImg.setImgType("0");
             reportImg.setCreatTime(new Date());
             reportImages.add(reportImg);
+            log.info("batchInsertReportData reportImg:" + reportImg);
         }
 
         index = reportDatas.size() / 50;

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

@@ -588,7 +588,7 @@ public class PatrolTaskStatusController extends BaseController {
                 if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) {
                     receiveCode = eqpBookMoMains.get(0).getMainSystemCode();
                 }
-                if (StringUtils.isNotEmpty(receiveCode) && (receiveCode.startsWith("areaPatrolServer") || receiveCode.startsWith("Client05"))) {
+                if (StringUtils.isNotEmpty(receiveCode)) {
                     SendTask sendTask = new SendTask();
                     sendTask.setReceiveCode(receiveCode);
                     sendTask.setSendCode(sendCode);