更新联调后代码

code/robot2ips/src/main/java/com/sunwin/robot2ips/beans/vo/RecordData.java

@@ -32,6 +32,6 @@ public class RecordData {
     /**
      * 测点列表
      */
-    private List<RecordTaskPoint> recordTaskPoints;
+    private List<RecordTaskPoint> recordsTasksPoints;
 
 }

code/robot2ips/src/main/java/com/sunwin/robot2ips/beans/vo/RecordTaskPoint.java

@@ -69,23 +69,23 @@ public class RecordTaskPoint {
     /**
      * 任务的实际完成时间
      */
-    private Date recordCompleteDate;
+    private String recordCompleteDate;
     /**
      * 巡检日期yyyy-MM-ddHH:mm:ss
      */
-    private Date updateTime;
+    private String updateTime;
     /**
      * 计划开始时间
      */
-    private Date recordPlanStartDate;
+    private String recordPlanStartDate;
     /**
      * 计划完成时间
      */
-    private Date recordPlanCompleteDate;
+    private String recordPlanCompleteDate;
     /**
      * 任务的开始时间
      */
-    private Date recordStartDate;
+    private String recordStartDate;
 
     @JSONField(serialize = false)
     private Integer robotId;

code/robot2ips/src/main/java/com/sunwin/robot2ips/service/impl/CheckDataServiceImpl.java

@@ -137,7 +137,8 @@ public class CheckDataServiceImpl implements CheckDataService {
             RobotDTO robotDTO = robot.get(0);
             //初始化数据同步请求对象
             RecordData recordData = new RecordData();
-            recordData.setRobotCode(robotDTO.getId().toString());
+            //ips要求机器人编码至少六位
+            recordData.setRobotCode("robot" + robotDTO.getId());
             recordData.setRobotName(robotDTO.getRobotName());
             recordData.setTaskId(taskId);
             //初始化实例集合
@@ -148,17 +149,18 @@ public class CheckDataServiceImpl implements CheckDataService {
                 String base64 = FtpUtils.addrToBase64(recordTaskPoint.getImage());
                 recordTaskPoint.setImage(base64);
                 //取巡检数据的巡检时间的年月日作为任务日期
-                String yyyyMMdd = DateUtil.parseToString(recordTaskPoint.getUpdateTime(), DateUtil.DateFormat_yyyy_MM_dd);
-                Date start = DateUtil.strToDate(yyyyMMdd + " 00:00:00");
-                Date end = DateUtil.strToDate(yyyyMMdd + " 23:59:59");
+                Date updateDate = DateUtil.strToDate(recordTaskPoint.getUpdateTime());
+                String yyyyMMdd = DateUtil.parseToString(updateDate, DateUtil.DateFormat_yyyy_MM_dd);
+                String start = yyyyMMdd + " 00:00:00";
+                String end = yyyyMMdd + " 23:59:59";
                 //任务时间写死识别日期的00：00-23：59
-                //recordTaskPoint.setRecordPlanStartDate(start);
+                recordTaskPoint.setRecordPlanStartDate(start);
                 //recordTaskPoint.setRecordCompleteDate(end);
                 recordTaskPoint.setRecordPlanCompleteDate(end);
                 //recordTaskPoint.setRecordStartDate(start);
                 recordTaskPoints.add(recordTaskPoint);
             }
-            recordData.setRecordTaskPoints(recordTaskPoints);
+            recordData.setRecordsTasksPoints(recordTaskPoints);
             uploadResult.add(recordData);
         }
         return uploadResult;