修改实际功率图表

ipfcst-console/src/main/frontend/views/dataquery/realPowerQuery/charts/index.vue

@@ -61,7 +61,7 @@
             textStyle: {
               fontWeight: 'normal',
               fontSize: 16,
-              color: '#F1F1F3'
+              color: '#000000'
             },
             left: '1%'
           },
@@ -69,7 +69,7 @@
             trigger: 'axis',
             axisPointer: {
               lineStyle: {
-                color: '#57617B'
+                color: '#000000'
               }
             }
           },
@@ -83,7 +83,7 @@
             right: '4%',
             textStyle: {
               fontSize: 12,
-              color: '#F1F1F3'
+              color: '#000000'
             }
           },
           dataZoom: [{
@@ -94,7 +94,7 @@
             left: "15%",
             right: "15%",
             textStyle: {
-              color: "#ffffff"
+              color: "#000000"
             }
           }, {
             type: 'inside'
@@ -111,7 +111,7 @@
             boundaryGap: false,
             axisLine: {
               lineStyle: {
-                color: '#ffffff'
+                color: "#000000"
               }
             },
             data: timeaxis
@@ -124,7 +124,7 @@
             },
             axisLine: {
               lineStyle: {
-                color: '#ffffff'
+                color: '#000000'
               }
             },
             axisLabel: {
@@ -166,7 +166,8 @@
         option.yAxis[0].max = cap
 
         if(displayKyLl == 1){
-          option.legend.data = ['实际功率','可用功率','理论功率','参照理论功率(测风、测光法)','参照理论功率(样板机法)','参照可用功率(测风、测光法)','参照可用功率(样板机法)']
+          // option.legend.data = ['实际功率','可用功率','理论功率','参照理论功率(测风、测光法)','参照理论功率(样板机法)','参照可用功率(测风、测光法)','参照可用功率(样板机法)']
+          option.legend.data = ['实际功率','可用功率','理论功率']
           option.series.push({
             name: '可用功率',
             type: 'line',
@@ -179,19 +180,19 @@
                 width: 2
               }
             },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(219, 50, 51, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
+            // areaStyle: {
+            //   normal: {
+            //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            //       offset: 0,
+            //       color: 'rgba(219, 50, 51, 0.3)'
+            //     }, {
+            //       offset: 0.8,
+            //       color: 'rgba(219, 50, 51, 0)'
+            //     }], false),
+            //     shadowColor: 'rgba(0, 0, 0, 0.1)',
+            //     shadowBlur: 10
+            //   }
+            // },
             itemStyle: {
               normal: {
 
@@ -213,19 +214,19 @@
                 width: 2
               }
             },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(219, 50, 51, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
+            // areaStyle: {
+            //   normal: {
+            //     color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            //       offset: 0,
+            //       color: 'rgba(219, 50, 51, 0.3)'
+            //     }, {
+            //       offset: 0.8,
+            //       color: 'rgba(219, 50, 51, 0)'
+            //     }], false),
+            //     shadowColor: 'rgba(0, 0, 0, 0.1)',
+            //     shadowBlur: 10
+            //   }
+            // },
             itemStyle: {
               normal: {
 
@@ -235,141 +236,143 @@
               }
             },
             data: theorypower
-          },{
-            name: '参照理论功率(测风、测光法)',
-            type: 'line',
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 5,
-            showSymbol: false,
-            lineStyle: {
-              normal: {
-                width: 2
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(219, 50, 51, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
-            itemStyle: {
-              normal: {
-
-                color: cc.cfgf,
-                borderColor: 'rgba(219,50,51,0.2)',
-                borderWidth: 12
-              }
-            },
-            data: referencePowerByMeasuringpower
-          },{
-            name: '参照理论功率(样板机法)',
-            type: 'line',
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 5,
-            showSymbol: false,
-            lineStyle: {
-              normal: {
-                width: 2
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(219, 50, 51, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
-            itemStyle: {
-              normal: {
-
-                color: cc.ybjf,
-                borderColor: 'rgba(219,50,51,0.2)',
-                borderWidth: 12
-              }
-            },
-            data: referencePowerBySamplepower
-          },{
-            name: '参照可用功率(测风、测光法)',
-            type: 'line',
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 5,
-            showSymbol: false,
-            lineStyle: {
-              normal: {
-                width: 2
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(219, 50, 51, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
-            itemStyle: {
-              normal: {
-                color: cc.kycfgf,
-                borderColor: 'rgba(219,50,51,0.2)',
-                borderWidth: 12
-              }
-            },
-            data: ablePowerByMeasuringe
-          },{
-            name: '参照可用功率(样板机法)',
-            type: 'line',
-            smooth: true,
-            symbol: 'circle',
-            symbolSize: 5,
-            showSymbol: false,
-            lineStyle: {
-              normal: {
-                width: 2
-              }
-            },
-            areaStyle: {
-              normal: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                  offset: 0,
-                  color: 'rgba(219, 50, 51, 0.3)'
-                }, {
-                  offset: 0.8,
-                  color: 'rgba(219, 50, 51, 0)'
-                }], false),
-                shadowColor: 'rgba(0, 0, 0, 0.1)',
-                shadowBlur: 10
-              }
-            },
-            itemStyle: {
-              normal: {
-                color: cc.kyybjf,
-                borderColor: 'rgba(219,50,51,0.2)',
-                borderWidth: 12
-              }
-            },
-            data: ablePowerBySample
-          })
+          }
+          //   {
+          //   name: '参照理论功率(测风、测光法)',
+          //   type: 'line',
+          //   smooth: true,
+          //   symbol: 'circle',
+          //   symbolSize: 5,
+          //   showSymbol: false,
+          //   lineStyle: {
+          //     normal: {
+          //       width: 2
+          //     }
+          //   },
+          //   areaStyle: {
+          //     normal: {
+          //       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+          //         offset: 0,
+          //         color: 'rgba(219, 50, 51, 0.3)'
+          //       }, {
+          //         offset: 0.8,
+          //         color: 'rgba(219, 50, 51, 0)'
+          //       }], false),
+          //       shadowColor: 'rgba(0, 0, 0, 0.1)',
+          //       shadowBlur: 10
+          //     }
+          //   },
+          //   itemStyle: {
+          //     normal: {
+          //
+          //       color: cc.cfgf,
+          //       borderColor: 'rgba(219,50,51,0.2)',
+          //       borderWidth: 12
+          //     }
+          //   },
+          //   data: referencePowerByMeasuringpower
+          // },{
+          //   name: '参照理论功率(样板机法)',
+          //   type: 'line',
+          //   smooth: true,
+          //   symbol: 'circle',
+          //   symbolSize: 5,
+          //   showSymbol: false,
+          //   lineStyle: {
+          //     normal: {
+          //       width: 2
+          //     }
+          //   },
+          //   areaStyle: {
+          //     normal: {
+          //       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+          //         offset: 0,
+          //         color: 'rgba(219, 50, 51, 0.3)'
+          //       }, {
+          //         offset: 0.8,
+          //         color: 'rgba(219, 50, 51, 0)'
+          //       }], false),
+          //       shadowColor: 'rgba(0, 0, 0, 0.1)',
+          //       shadowBlur: 10
+          //     }
+          //   },
+          //   itemStyle: {
+          //     normal: {
+          //
+          //       color: cc.ybjf,
+          //       borderColor: 'rgba(219,50,51,0.2)',
+          //       borderWidth: 12
+          //     }
+          //   },
+          //   data: referencePowerBySamplepower
+          // },{
+          //   name: '参照可用功率(测风、测光法)',
+          //   type: 'line',
+          //   smooth: true,
+          //   symbol: 'circle',
+          //   symbolSize: 5,
+          //   showSymbol: false,
+          //   lineStyle: {
+          //     normal: {
+          //       width: 2
+          //     }
+          //   },
+          //   areaStyle: {
+          //     normal: {
+          //       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+          //         offset: 0,
+          //         color: 'rgba(219, 50, 51, 0.3)'
+          //       }, {
+          //         offset: 0.8,
+          //         color: 'rgba(219, 50, 51, 0)'
+          //       }], false),
+          //       shadowColor: 'rgba(0, 0, 0, 0.1)',
+          //       shadowBlur: 10
+          //     }
+          //   },
+          //   itemStyle: {
+          //     normal: {
+          //       color: cc.kycfgf,
+          //       borderColor: 'rgba(219,50,51,0.2)',
+          //       borderWidth: 12
+          //     }
+          //   },
+          //   data: ablePowerByMeasuringe
+          // },{
+          //   name: '参照可用功率(样板机法)',
+          //   type: 'line',
+          //   smooth: true,
+          //   symbol: 'circle',
+          //   symbolSize: 5,
+          //   showSymbol: false,
+          //   lineStyle: {
+          //     normal: {
+          //       width: 2
+          //     }
+          //   },
+          //   areaStyle: {
+          //     normal: {
+          //       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+          //         offset: 0,
+          //         color: 'rgba(219, 50, 51, 0.3)'
+          //       }, {
+          //         offset: 0.8,
+          //         color: 'rgba(219, 50, 51, 0)'
+          //       }], false),
+          //       shadowColor: 'rgba(0, 0, 0, 0.1)',
+          //       shadowBlur: 10
+          //     }
+          //   },
+          //   itemStyle: {
+          //     normal: {
+          //       color: cc.kyybjf,
+          //       borderColor: 'rgba(219,50,51,0.2)',
+          //       borderWidth: 12
+          //     }
+          //   },
+          //   data: ablePowerBySample
+          // }
+        )
         }
         this.chart.setOption(option,true)
       },

ipfcst-console/src/main/frontend/views/dataquery/realPowerQuery/index.vue

@@ -48,9 +48,7 @@
               :custom-config="{storage: true, checkMethod: checkColumnMethod}"
               :auto-resize="true"
               highlight-hover-row
-              :header-cell-style="{background:'black',color:'white',border:'white'}"
               max-height="90%"
-              :cell-style="{background:'black',color:'white'}"
               align="center"
               :data="tableData"
               :columns="tableColumn"
@@ -151,36 +149,36 @@ export default {
             { field: 'realValue', title: '实际功率',minWidth:"60"},
             { field: 'ableValue', title: '可用功率',minWidth:"60"},
             { field: 'theoryValue', title: '理论功率',minWidth:"60"},
-            { field: 'referencePowerByMeasuring', title: '参照理论功率(测风、测光法)',minWidth:"60"},
-            { field: 'referencePowerBySample', title: '参照理论功率(样板机法)',minWidth:"60"},
-            { field: 'ablePowerByMeasuring', title: '参照可用功率(测风、测光法)',minWidth:"60"},
-            { field: 'ablePowerBySample', title: '参照可用功率(样板机法)',minWidth:"60"},
+            // { field: 'referencePowerByMeasuring', title: '参照理论功率(测风、测光法)',minWidth:"60"},
+            // { field: 'referencePowerBySample', title: '参照理论功率(样板机法)',minWidth:"60"},
+            // { field: 'ablePowerByMeasuring', title: '参照可用功率(测风、测光法)',minWidth:"60"},
+            // { field: 'ablePowerBySample', title: '参照可用功率(样板机法)',minWidth:"60"},
             { field: 'openCapacity', title: '开机容量',minWidth:"60"},
-            { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
-            { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
-            { field: 'capacity', title: '装机容量',minWidth:"60"},
-            { field: 'onGridNum', title: '并网设备',minWidth:"60"}
+            // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
+            // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
+            { field: 'capacity', title: '装机容量',minWidth:"60"}
+            // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
           ]
         }else {
           this.tableColumn = [
             { field: 'time', title: '接入时间',formatter:this.dateFormat,sortable:true,minWidth:"150",width:"180" },
             { field: 'realValue', title: '实际功率',minWidth:"60"},
             { field: 'openCapacity', title: '开机容量',minWidth:"60"},
-            { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
-            { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
-            { field: 'capacity', title: '装机容量',minWidth:"60"},
-            { field: 'onGridNum', title: '并网设备',minWidth:"60"}
+            // { field: 'isRationingByManualControl', title: '人工判断是否限电',formatter:this.isRationingByManualControl,minWidth:"60"},
+            // { field: 'isRationingByAutoControl', title: '系统判断是否限电',formatter:this.isRationingByAutoControl,minWidth:"60"},
+            { field: 'capacity', title: '装机容量',minWidth:"60"}
+            // { field: 'onGridNum', title: '并网设备',minWidth:"60"}
           ]
         }
-        if(this.drawData.abnormalShow == '1'){
-          this.tableColumn .push({ field: 'abnormalOfMeasuring', title: '测风光法的异常值',minWidth:"60"})
-          this.tableColumn .push({ field: 'abnormalOfSample', title: '样板机法的异常值',minWidth:"60"})
-        }
-        if(this.drawData.displaySz == '1'){
-          this.tableColumn .push({ field: 'onSiteObstructed', title: '站内受阻功率',minWidth:"60"})
-          this.tableColumn .push({ field: 'offSiteObstructed', title: '站外受阻功率',minWidth:"60"})
-          this.tableColumn .push({ field: 'abandonmentRates', title: '弃电率指标%',minWidth:"60"})
-        }
+        // if(this.drawData.abnormalShow == '1'){
+        //   this.tableColumn .push({ field: 'abnormalOfMeasuring', title: '测风光法的异常值',minWidth:"60"})
+        //   this.tableColumn .push({ field: 'abnormalOfSample', title: '样板机法的异常值',minWidth:"60"})
+        // }
+        // if(this.drawData.displaySz == '1'){
+        //   this.tableColumn .push({ field: 'onSiteObstructed', title: '站内受阻功率',minWidth:"60"})
+        //   this.tableColumn .push({ field: 'offSiteObstructed', title: '站外受阻功率',minWidth:"60"})
+        //   this.tableColumn .push({ field: 'abandonmentRates', title: '弃电率指标%',minWidth:"60"})
+        // }
         if(!this.drawLoading && !this.tableLoading){
           this.loading = false
         }

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/controller/PowerStationStatusDataController.java

@@ -74,7 +74,7 @@ public class PowerStationStatusDataController {
    * @param sortOrder 排序
    * @return
    */
-  @GetMapping(value = "/powerStationStatus/{startTime}/{endTime}/{page}/{size}")
+  @GetMapping(value = "/powerStationStatus/{startTime}/{endTime}/{page}/{size}/{stationCode}")
   public ResponseVO findByTimeBetweenForPaging(@PathVariable("startTime") Long startTime,
                                                @PathVariable("endTime") Long endTime,
                                                @PathVariable("page") Integer page,

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/PowerStationStatusDataService.java

@@ -220,72 +220,67 @@ public class PowerStationStatusDataService extends BaseService {
       }
     }
 
-    String displayKyLl = "0";
-    SysParameter sysParameter = sysParameterRepository.findBySysKeyEquals("DISPLAY_KY_LL");
-
-    if (sysParameter != null && sysParameter.getSysValue().equals("1")) {
-      displayKyLl = "1";
-
-      List<BigDecimal> ableValue = checkList.stream().map(PowerStationStatusData::getAbleValue).collect(Collectors.toList());
-      List<BigDecimal> theoryValue = checkList.stream().map(PowerStationStatusData::getTheoryValue).collect(Collectors.toList());
-      List<BigDecimal> referencePowerByMeasuring = checkList.stream().map(PowerStationStatusData::getReferencePowerByMeasuring).collect(Collectors.toList());
-      List<BigDecimal> referencePowerBySample = checkList.stream().map(PowerStationStatusData::getReferencePowerBySample).collect(Collectors.toList());
-      for (BigDecimal b : ableValue) {
-        if (b.compareTo(nullValue) == 0) {
-          ableValueDatas.add(null);
-        } else {
-          ableValueDatas.add(b.floatValue());
-        }
-      }
-      for (BigDecimal b : theoryValue) {
-        if (b.compareTo(nullValue) == 0) {
-          theoryValueDatas.add(null);
-        } else {
-          theoryValueDatas.add(b.floatValue());
-        }
-      }
+    String displayKyLl = "1";
 
-      for (BigDecimal b : referencePowerByMeasuring) {
-        if (b.compareTo(nullValue) == 0) {
-          referencePowerByMeasuringDatas.add(null);
-        } else {
-          referencePowerByMeasuringDatas.add(b.floatValue());
-        }
+    List<BigDecimal> ableValue = checkList.stream().map(PowerStationStatusData::getAbleValue).collect(Collectors.toList());
+    List<BigDecimal> theoryValue = checkList.stream().map(PowerStationStatusData::getTheoryValue).collect(Collectors.toList());
+//    List<BigDecimal> referencePowerByMeasuring = checkList.stream().map(PowerStationStatusData::getReferencePowerByMeasuring).collect(Collectors.toList());
+//    List<BigDecimal> referencePowerBySample = checkList.stream().map(PowerStationStatusData::getReferencePowerBySample).collect(Collectors.toList());
+    for (BigDecimal b : ableValue) {
+      if (b.compareTo(nullValue) == 0) {
+        ableValueDatas.add(null);
+      } else {
+        ableValueDatas.add(b.floatValue());
       }
-
-      for (BigDecimal b : referencePowerBySample) {
-        if (b.compareTo(nullValue) == 0) {
-          referencePowerBySampleDatas.add(null);
-        } else {
-          referencePowerBySampleDatas.add(b.floatValue());
-        }
+    }
+    for (BigDecimal b : theoryValue) {
+      if (b.compareTo(nullValue) == 0) {
+        theoryValueDatas.add(null);
+      } else {
+        theoryValueDatas.add(b.floatValue());
       }
+    }
 
-      List<BigDecimal> ablePowerByMeasuring = checkList.stream().map(PowerStationStatusData::getAblePowerByMeasuring).collect(Collectors.toList());
-      List<BigDecimal> ablePowerBySample = checkList.stream().map(PowerStationStatusData::getAblePowerBySample).collect(Collectors.toList());
-
-      for (BigDecimal b : ablePowerByMeasuring) {
-        if (b == null || b.compareTo(nullValue) == 0) {
-          ablePowerByMeasuringDatas.add(null);
-        } else {
-          ablePowerByMeasuringDatas.add(b.floatValue());
-        }
+//    for (BigDecimal b : referencePowerByMeasuring) {
+//      if (b.compareTo(nullValue) == 0) {
+//        referencePowerByMeasuringDatas.add(null);
+//      } else {
+//        referencePowerByMeasuringDatas.add(b.floatValue());
+//      }
+//    }
+//
+//    for (BigDecimal b : referencePowerBySample) {
+//      if (b.compareTo(nullValue) == 0) {
+//        referencePowerBySampleDatas.add(null);
+//      } else {
+//        referencePowerBySampleDatas.add(b.floatValue());
+//      }
+//    }
+
+    List<BigDecimal> ablePowerByMeasuring = checkList.stream().map(PowerStationStatusData::getAblePowerByMeasuring).collect(Collectors.toList());
+    List<BigDecimal> ablePowerBySample = checkList.stream().map(PowerStationStatusData::getAblePowerBySample).collect(Collectors.toList());
+
+    for (BigDecimal b : ablePowerByMeasuring) {
+      if (b == null || b.compareTo(nullValue) == 0) {
+        ablePowerByMeasuringDatas.add(null);
+      } else {
+        ablePowerByMeasuringDatas.add(b.floatValue());
       }
-      for (BigDecimal b : ablePowerBySample) {
-        if (b == null || b.compareTo(nullValue) == 0) {
-          ablePowerBySampleDatas.add(null);
-        } else {
-          ablePowerBySampleDatas.add(b.floatValue());
-        }
+    }
+    for (BigDecimal b : ablePowerBySample) {
+      if (b == null || b.compareTo(nullValue) == 0) {
+        ablePowerBySampleDatas.add(null);
+      } else {
+        ablePowerBySampleDatas.add(b.floatValue());
       }
-      map.put("ablePowerByMeasuringDatas", ablePowerByMeasuringDatas);
-      map.put("ablePowerBySampleDatas", ablePowerBySampleDatas);
-
-      map.put("ableValueDatas", ableValueDatas);
-      map.put("theoryValueDatas", theoryValueDatas);
-      map.put("referencePowerByMeasuringDatas", referencePowerByMeasuringDatas);
-      map.put("referencePowerBySampleDatas", referencePowerBySampleDatas);
     }
+//    map.put("ablePowerByMeasuringDatas", ablePowerByMeasuringDatas);
+//    map.put("ablePowerBySampleDatas", ablePowerBySampleDatas);
+
+    map.put("ableValueDatas", ableValueDatas);
+    map.put("theoryValueDatas", theoryValueDatas);
+//    map.put("referencePowerByMeasuringDatas", referencePowerByMeasuringDatas);
+//    map.put("referencePowerBySampleDatas", referencePowerBySampleDatas);
 
 
     String displaySz = "0";
@@ -324,7 +319,7 @@ public class PowerStationStatusDataService extends BaseService {
   public Map<String, Object> findByTimeBetweenForContrast(Date startTime, Date endTime, Long timeStep, String stationCode) {
     Map<String, Object> map = new HashMap<>();
     List<PowerStationStatusData> list = powerStationStatusDataRepository.findByTimeBetweenAndStationCode(startTime, endTime, stationCode);
-    
+
     long startTimeLong = startTime.getTime();
     long endTimeLong = endTime.getTime();
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");