修改物联数据丢失

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -773,18 +773,21 @@ public class TopographyController extends AbstractBaseController {
             }
             List<IotDataVO> timeList = iotDatalist.stream().filter(x -> "time".equals(x.getKey())).collect(Collectors.toList());
             List<EquipmentSpecificIndex> indexes = equipmentSpecificIndexMapper.getEquipmentSpeIndexByIotCode(iotCode);
+
             if (0 <indexes.size()) {
                 int j = 0;
                 Map<String, Object> map = new HashMap<>();
-                for (int i=0; i<iotDatalist.size(); i++) {
+
+
+                for (int i=0; i<timeList.size(); i++) {
                     TopographyIotVo iotVo = new TopographyIotVo();
                     List<TopographyIotDataVO> lists = new ArrayList<>();
-                    if (i == 0) {
-                        map.put(iotDatalist.get(i).getKey(), iotDatalist.get(i).getValue());
-                    }
-                    if (map.containsKey(iotDatalist.get(i).getKey())) {
-                        j++;
-                    }
+//                    if (i == 0) {
+//                        map.put(iotDatalist.get(i).getKey(), iotDatalist.get(i).getValue());
+//                    }
+//                    if (map.containsKey(iotDatalist.get(i).getKey())) {
+//                        j++;
+//                    }
                     for (EquipmentSpecificIndex x : indexes) {
                         if (x.getNameKey().equals(iotDatalist.get(i).getKey())) {
                             TopographyIotDataVO dataVO = new TopographyIotDataVO();
@@ -797,7 +800,7 @@ public class TopographyController extends AbstractBaseController {
                             try {
                                 //Date date = DateUtils.dateParse(String.valueOf(timeList.get(j-1).getValue()), DateUtils.DATE_TIME_T_PATTERN);
 
-                                String value = String.valueOf(timeList.get(j-1).getValue());
+                                String value = String.valueOf(timeList.get(i).getValue());
                                 String strDate = value.substring(0, 19);
                                 SimpleDateFormat sdf = new SimpleDateFormat(ISO8601_DATE_HOUR_MIN_SEC);
                                 SimpleDateFormat sdf1 = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);