From 95215ca3d8c4878642becde4d26bdfeca4f081b6 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 3 Aug 2023 10:30:46 +0800
Subject: [PATCH] updates

---
 .../service/IOcrApiCallStatisticsService.java |  6 ++++-
 .../impl/OcrApiCallStatisticsServiceImpl.java | 22 ++++++++++++++++---
 .../service/impl/OcrIdentifyServiceImpl.java  |  5 ++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java
index 6e6619b..1e860e8 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.ocr.entity.OcrApiCallStatistics;
 
+import java.util.Date;
+
 /**
  * @Description: api调用统计
  * @Author: jeecg-boot
@@ -15,5 +17,7 @@ public interface IOcrApiCallStatisticsService extends IService<OcrApiCallStatist
 
     IPage<OcrApiCallStatistics> pageList(Page<OcrApiCallStatistics> page, OcrApiCallStatistics ocrApiCallStatistics);
 
-    void saveLogs(String apiName, String apiUrl, int count);
+    String saveLogs(String apiName, String apiUrl, int count);
+
+    void updateLogsEndTime(String id, Date endTime);
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java
index 8609442..42701b7 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.ocr.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.ocr.entity.OcrApiCallStatistics;
@@ -8,6 +9,7 @@ import org.jeecg.modules.ocr.service.IOcrApiCallStatisticsService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -26,14 +28,19 @@ public class OcrApiCallStatisticsServiceImpl extends ServiceImpl<OcrApiCallStati
         Map<String,Object> map=new LinkedHashMap<>();
         map.put("apiUrl",ocrApiCallStatistics.getApiUrl());
         map.put("count",ocrApiCallStatistics.getCount());
-        map.put("startTime",ocrApiCallStatistics.getStartTime());
-        map.put("endTime",ocrApiCallStatistics.getEndTime());
+        if (ocrApiCallStatistics.getStartTime()!=null &&ocrApiCallStatistics.getEndTime()!=null) {
+            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+            map.put("startTime",sdf.format(ocrApiCallStatistics.getStartTime())+" 00:00:00");
+            map.put("endTime",sdf.format(ocrApiCallStatistics.getEndTime())+" 23:59:59");
+        }
+
+
         IPage<OcrApiCallStatistics> pageList = this.baseMapper.pageList(page,map);
         return pageList;
     }
 
     @Override
-    public void saveLogs(String apiName, String apiUrl, int count) {
+    public String saveLogs(String apiName, String apiUrl, int count) {
         OcrApiCallStatistics ocrApiCallStatistics = new OcrApiCallStatistics();
         ocrApiCallStatistics.setApiName(apiName);
         ocrApiCallStatistics.setApiUrl(apiUrl);
@@ -41,5 +48,14 @@ public class OcrApiCallStatisticsServiceImpl extends ServiceImpl<OcrApiCallStati
         ocrApiCallStatistics.setStartTime(new Date());
         ocrApiCallStatistics.setEndTime(null);
         super.save(ocrApiCallStatistics);
+        return ocrApiCallStatistics.getId();
+    }
+
+    @Override
+    public void updateLogsEndTime(String id, Date endTime) {
+        LambdaUpdateWrapper<OcrApiCallStatistics> updateWrapper=new LambdaUpdateWrapper<>();
+        updateWrapper.eq(OcrApiCallStatistics::getId,id);
+        updateWrapper.set(OcrApiCallStatistics::getEndTime,endTime);
+        super.update(updateWrapper);
     }
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
index 5bfa7cf..facac22 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrIdentifyServiceImpl.java
@@ -73,8 +73,9 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
 
     @Override
     public void getSemanticInfo(JSONObject responseBody) {
+        String ocrApiCallStatisticsId=null;
         try {
-            ocrApiCallStatisticsService.saveLogs("通用识别", "/ocr/ocrApi/identify", 1);
+            ocrApiCallStatisticsId = ocrApiCallStatisticsService.saveLogs("通用识别", "/ocr/ocrApi/identify", 1);
             Thread.sleep(1000l);
         } catch (InterruptedException e) {
             e.printStackTrace();
@@ -189,6 +190,8 @@ public class OcrIdentifyServiceImpl extends ServiceImpl<OcrIdentifyMapper, OcrId
 
         }
         //=========================
+
+        ocrApiCallStatisticsService.updateLogsEndTime(ocrApiCallStatisticsId,new Date());
     }
 
     public static String semanticResponse = "{\"execution_time\":69.1751720905304,\"img_path\":\"./static/ocrData/custom_2_44.jpg\",\"message\":\"成功\",\"semantic_result\":{\"医院名称\":[{\"area\":[[227,382],[441,388],[440,422],[226,416]],\"end\":7,\"ocrText\":\"开封市眼病医院\",\"probability\":0.9677108957485778,\"start\":0,\"text\":\"开封市眼病医院\"}],\"姓名\":[{\"area\":[[566,668],[691,668],[691,712],[566,712]],\"end\":3,\"ocrText\":\"闫利霞\",\"probability\":0.884488371938783,\"start\":0,\"text\":\"闫利霞\"}],\"时间\":[{\"area\":[[701,400],[874,400],[874,456],[701,456]],\"end\":5,\"ocrText\":\"10:40\",\"probability\":0.9626484940814066,\"start\":0,\"text\":\"10:40\"},{\"area\":[[502,422],[667,424],[667,452],[502,450]],\"end\":11,\"ocrText\":\"2023年05月17日\",\"probability\":0.815085233546764,\"start\":0,\"text\":\"2023年05月17日\"}],\"科室\":[]},\"task_id\":1}";