修改数据生成策略算法

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/service/impl/ChartServiceImpl.java

@@ -192,15 +192,16 @@ public class ChartServiceImpl implements ChartService {
                                     CursorRawData cursorRawData = currentCursorRawDataList.get(j);
                                     long time = DateUtil.strYmdhmssChangeDate(cursorRawData.getDataValueTime()).getTime();
                                     if (startTimeTime > time) {
-
+                                        currentCursorRawDataList.remove(j);
+                                        j--;
                                         continue;
                                     }
                                     if (startTimeTime <= time && time < endTimeTime) {
                                         orgList.add(JSON.parseObject(cursorRawData.getOrgDataValue(), BigDecimal.class));
                                         list.add(JSON.parseObject(cursorRawData.getDataValue(), BigDecimal.class));
+                                        currentCursorRawDataList.remove(j);
+                                        j--;
                                     }
-                                    currentCursorRawDataList.remove(j);
-                                    j--;
                                     if (time >= endTimeTime) {
                                         break;
                                     }

cqcy-ei/cqcy-ei-da/src/main/java/com/example/opc_da/task/ReportTask.java

@@ -55,12 +55,17 @@ public class ReportTask {
             for (int j = 0; j < curRawDataList.size(); j++) {
                 CursorRawData cursorRawData = curRawDataList.get(j);
                 long time = DateUtil.strYmdhmssChangeDate(cursorRawData.getDataValueTime()).getTime();
+                if (startTimeTime > time) {
+                    curRawDataList.remove(j);
+                    j--;
+                    continue;
+                }
                 if (startTimeTime <= time && time < endTimeTime) {
                     orgList.add(JSON.parseObject(cursorRawData.getOrgDataValue(), Boolean.class));
                     list.add(JSON.parseObject(cursorRawData.getDataValue(), Boolean.class));
+                    curRawDataList.remove(j);
+                    j--;
                 }
-                curRawDataList.remove(j);
-                j--;
                 if (time >= endTimeTime) {
                     break;
                 }
@@ -171,12 +176,17 @@ public class ReportTask {
             for (int j = 0; j < curRawDataList.size(); j++) {
                 CursorRawData cursorRawData = curRawDataList.get(j);
                 long time = DateUtil.strYmdhmssChangeDate(cursorRawData.getDataValueTime()).getTime();
+                if (startTimeTime > time) {
+                    curRawDataList.remove(j);
+                    j--;
+                    continue;
+                }
                 if (startTimeTime <= time && time < endTimeTime) {
                     orgList.add(JSON.parseObject(cursorRawData.getOrgDataValue(), BigDecimal.class));
                     list.add(JSON.parseObject(cursorRawData.getDataValue(), BigDecimal.class));
+                    curRawDataList.remove(j);
+                    j--;
                 }
-                curRawDataList.remove(j);
-                j--;
                 if (time >= endTimeTime) {
                     break;
                 }
@@ -266,12 +276,17 @@ public class ReportTask {
             for (int j = 0; j < curRawDataList.size(); j++) {
                 CursorRawData cursorRawData = curRawDataList.get(j);
                 long time = DateUtil.strYmdhmssChangeDate(cursorRawData.getDataValueTime()).getTime();
+                if (startTimeTime > time) {
+                    curRawDataList.remove(j);
+                    j--;
+                    continue;
+                }
                 if (startTimeTime <= time && time < endTimeTime) {
                     orgList.add(JSON.parseObject(cursorRawData.getOrgDataValue(), String.class));
                     list.add(JSON.parseObject(cursorRawData.getDataValue(), String.class));
+                    curRawDataList.remove(j);
+                    j--;
                 }
-                curRawDataList.remove(j);
-                j--;
                 if (time >= endTimeTime) {
                     break;
                 }