修改readme文件；优化代码逻辑；更新现场点位绑定样例

code/robot2ips/readme.md

@@ -1,2 +1,3 @@
 此程序为宁德核电开发.
-向IPS系统同步巡检数据
+向IPS系统同步巡检数据
+项目内IPSModule.xls 需放在项目同级目录下，为读取点位绑定关系。

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

@@ -64,10 +64,14 @@ public class CheckDataServiceImpl implements CheckDataService {
         Long lastDataId = (Long) redisUtils.get(RedisKey.UPLOAD_IPS_LAST_ID);
         //根据lastDataId查询基于上次上传后巡检数据
         List<RecordTaskPoint> checkDataList = uploadMapper.queryDataAfterId(lastDataId, count);
+        if (!CollectionUtils.isEmpty(checkDataList)) {
+            checkDataList = checkDataList.stream().filter(t -> t.getTaskId() != null).collect(Collectors.toList());
+        }
+
         if (CollectionUtils.isEmpty(checkDataList)) {
             return;
         }
-        Long maxId =null;
+        Long maxId = null;
         //lastDataId为空即为首次上传,倒叙查询最新的巡检数据取最大的一条数据id
         if (lastDataId == null) {
             maxId = Long.parseLong(checkDataList.get(0).getResultId());
@@ -97,8 +101,10 @@ public class CheckDataServiceImpl implements CheckDataService {
         }
         //未全部成功则判定全部失败 下次重新上传
         if (uploadResult.size() != successCount) {
+            logger.info("some data upload fail");
             redisUtils.set(RedisKey.UPLOAD_IPS_LAST_ID, lastDataId);
         } else {
+            logger.info("data upload success");
             //全部成功则更新redis上传的最新id
             redisUtils.set(RedisKey.UPLOAD_IPS_LAST_ID, maxId);
         }

code/robot2ips/src/main/resources/mapper/UploadMapper.xml

@@ -25,8 +25,9 @@
         ips.monitoring_point point_code,
         c.time update_time,
         c.robot_id
-        from ips_sw_point_link ips
-        left join check_data c on ips.point_id= c.point_id
+        from
+        ips_sw_point_link ips
+        LEFT JOIN  check_data c ON ips.point_id = c.point_id
         where
             c.time BETWEEN #{startDate} and #{endDate}
     </select>
@@ -52,7 +53,7 @@
         c.robot_id
         FROM
         ips_sw_point_link ips
-        LEFT JOIN check_data c ON ips.point_id = c.point_id
+        LEFT JOIN  check_data c ON ips.point_id = c.point_id
         LEFT JOIN check_task t ON t.id = c.task_id
         left join task_data d on c.task_id=d.task_id and c.run_times=d.run_times
         LEFT JOIN check_point p ON p.id = c.point_id AND c.robot_id = p.robot_id