增加时间统计时间条件

etax-income-controller/src/main/java/com/sxc/etaxincome/controller/JxSampleController.java

@@ -318,13 +318,15 @@ public class JxSampleController {
     }
 
     @GetMapping("/jx-analysis-query-income-success-elapsed-millis")
-    public String analysisQueryIncomeSuccessElapsedMillis(String username, String areaCode) {
+    public String analysisQueryIncomeSuccessElapsedMillis(String username, String areaCode, String startDateTime, String endDateTime) {
         try {
             Stopwatch stopwatch = Stopwatch.createStarted();
             String usernamePlain = this.getUserPlain(username);
             AnalysisCriteria analysisCriteria = new AnalysisCriteria();
             analysisCriteria.setUsername(usernamePlain);
             analysisCriteria.setAreaCode(areaCode);
+            analysisCriteria.setStartDateTime(startDateTime);
+            analysisCriteria.setEndDateTime(endDateTime);
             String response = queryIncomeSuccessAnalysisCommand.handle(analysisCriteria);
             List<IncomeApply> incomeApplyList = JSON.parseArray(response, IncomeApply.class);
             List<IncomeApply> incomeApplyListSorted = incomeApplyList.stream().sorted(Comparator.comparing(IncomeApply::getTimeDiff)).collect(Collectors.toList());

etax-income-domain/src/main/java/com/sxc/etaxincome/domain/command/analysis/QueryIncomeSuccessAnalysisCommand.java

@@ -34,13 +34,12 @@ public class QueryIncomeSuccessAnalysisCommand implements IAnalysisCommand {
 
     @Override
     public String handle(AnalysisCriteria analysisCriteria) {
-        DateTimeRange dateTimeRange = DateProvider.today();
         FinRealLogCriteria finRealLogCriteria = FinRealLogCriteria.builder()
                 .userCode(analysisCriteria.getUsername())
                 .zoneCode(analysisCriteria.getAreaCode())
                 .resCode(CommonConstants.SUCCESS)
-                .dateTimeStart(dateTimeRange.getStartDateTime())
-                .dateTimeEnd(dateTimeRange.getEndDateTime())
+                .dateTimeStart(analysisCriteria.getStartDateTime())
+                .dateTimeEnd(analysisCriteria.getEndDateTime())
                 .build();
         int start = 1;
         int limit = 100;

etax-income-server/src/main/webapp/js/jxIndex.js

@@ -630,6 +630,7 @@ function getIncomeSuccess(unit, data) {
 }
 
 function viewIncomeSuccessBar() {
+    initDateTimeLatest10Minutes('incomeSuccessBarStartDateTime', 'incomeSuccessBarEndDateTime');
     initAllUsernameList('incomeSuccessBarUsername');
     initAllAreaCodeList('incomeSuccessBarAreaCode');
     $('#incomeSuccessBarChartModal').modal('show');
@@ -638,12 +639,16 @@ function viewIncomeSuccessBar() {
 function executeIncomeSuccessBar() {
     var username = $("#incomeSuccessBarUsername").val();
     var areaCode = $("#incomeSuccessBarAreaCode").val();
+    var startDateTime = $("#incomeSuccessBarStartDateTime").val();
+    var endDateTime = $("#incomeSuccessBarEndDateTime").val();
     $.ajax({
         type: "GET",
         url: "jxSample/jx-analysis-query-income-success-elapsed-millis",
         data: {
             "username": username,
-            "areaCode": areaCode
+            "areaCode": areaCode,
+            "startDateTime": startDateTime,
+            "endDateTime": endDateTime
         },
         dataType: "json",
         contentType: "application/json",
@@ -667,6 +672,17 @@ function executeIncomeSuccessBar() {
     });
 }
 
+function initDateTimeLatest10Minutes(startDateTimeId, endDateTimeId) {
+    var startDateTime = $("#" + startDateTimeId).val();
+    var endDateTime = $("#" + endDateTimeId).val();
+    if (startDateTime === '') {
+        $("#" + startDateTimeId).val(getPastNMinutes(5));
+    }
+    if (endDateTime === '') {
+        $("#" + endDateTimeId).val(getNow());
+    }
+}
+
 function getIncomeSuccessElapsedMillis(unit, data) {
     var barColor = $("#incomeSuccessBarColor").val();
     var myEcharts = echarts.init(document.getElementById("incomeSuccessBarChart"));

etax-income-server/src/main/webapp/jxIndex.html

@@ -445,6 +445,28 @@
                                     </select>
                                 </div>
                             </div>
+                            <label class="col-sm-2 control-label text-right">开始时间:</label>
+                            <div class="col-sm-4">
+                                <input type="text" class="form-control" id="incomeSuccessBarStartDateTime"
+                                       onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',startDate:'%y-%M-%d 00:00:00'})"
+                                       placeholder="点击选择开始时间"/>
+                            </div>
+
+                            <label class="col-sm-2 control-label text-right">结束时间:</label>
+                            <div class="col-sm-4">
+                                <input type="text" class="form-control" id="incomeSuccessBarEndDateTime"
+                                       onFocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',startDate:'%y-%M-%d 23:59:59'})"
+                                       placeholder="点击选择结束时间"/>
+                            </div>
+                            <label class="col-sm-2 control-label text-right">快捷选择时间:</label>
+                            <div class="col-sm-10">
+                                <input type="radio" name="incomeSuccessBarQuickSelectTime" value="5" checked="checked">最近5分钟 |
+                                <input type="radio" name="incomeSuccessBarQuickSelectTime" value="10">最近10分钟 |
+                                <input type="radio" name="incomeSuccessBarQuickSelectTime" value="15">最近15分钟 |
+                                <input type="radio" name="incomeSuccessBarQuickSelectTime" value="20">最近20分钟 |
+                                <input type="radio" name="incomeSuccessBarQuickSelectTime" value="25">最近25分钟 |
+                                <input type="radio" name="incomeSuccessBarQuickSelectTime" value="30">最近30分钟
+                            </div>
                             <label class="col-sm-2 control-label text-right">颜色:</label>
                             <div class="col-sm-4">
                                 <div class="input-group">