updates

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.ocr.entity.OcrApiCallStatistics;
 import org.jeecg.modules.ocr.entity.OcrMetadataConfig;
+import org.jeecg.modules.ocr.model.CommonQueryModel;
 import org.jeecg.modules.ocr.service.IOcrApiCallStatisticsService;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.ocr.utils.DownloadTemplateUtil;
@@ -39,7 +40,7 @@ public class OcrApiCallStatisticsController extends JeecgController<OcrApiCallSt
 	/**
 	 * 分页列表查询
 	 *
-	 * @param ocrApiCallStatistics
+	 * @param commonQueryModel
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
@@ -48,12 +49,12 @@ public class OcrApiCallStatisticsController extends JeecgController<OcrApiCallSt
 	//@AutoLog(value = "api调用统计-分页列表查询")
 	@ApiOperation(value="api调用统计-分页列表查询", notes="api调用统计-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<OcrApiCallStatistics>> queryPageList(OcrApiCallStatistics ocrApiCallStatistics,
+	public Result<IPage<OcrApiCallStatistics>> queryPageList(CommonQueryModel commonQueryModel,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+								 HttpServletRequest req) {
 		Page<OcrApiCallStatistics> page = new Page<OcrApiCallStatistics>(pageNo, pageSize);
-		IPage<OcrApiCallStatistics> pageList = ocrApiCallStatisticsService.pageList(page, ocrApiCallStatistics);
+		IPage<OcrApiCallStatistics> pageList = ocrApiCallStatisticsService.pageList(page, commonQueryModel);
 		return Result.OK(pageList);
 	}
 	

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/model/CommonQueryModel.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.ocr.model;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 查询通用对象
+ * @Author ZhouWenTao
+ * @Date 2023/8/3 10:34
+ */
+@Data
+public class CommonQueryModel implements Serializable {
+    private String id;
+
+    private String configName;
+
+    private String apiUrl;
+    private Integer count;
+    private String startTime;
+    private String endTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/IOcrApiCallStatisticsService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.ocr.entity.OcrApiCallStatistics;
+import org.jeecg.modules.ocr.model.CommonQueryModel;
 
 import java.util.Date;
 
@@ -15,7 +16,7 @@ import java.util.Date;
  */
 public interface IOcrApiCallStatisticsService extends IService<OcrApiCallStatistics> {
 
-    IPage<OcrApiCallStatistics> pageList(Page<OcrApiCallStatistics> page, OcrApiCallStatistics ocrApiCallStatistics);
+    IPage<OcrApiCallStatistics> pageList(Page<OcrApiCallStatistics> page, CommonQueryModel commonQueryModel);
 
     String saveLogs(String apiName, String apiUrl, int count);
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/service/impl/OcrApiCallStatisticsServiceImpl.java

@@ -3,8 +3,10 @@ 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.apache.commons.lang.StringUtils;
 import org.jeecg.modules.ocr.entity.OcrApiCallStatistics;
 import org.jeecg.modules.ocr.mapper.OcrApiCallStatisticsMapper;
+import org.jeecg.modules.ocr.model.CommonQueryModel;
 import org.jeecg.modules.ocr.service.IOcrApiCallStatisticsService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,17 +26,15 @@ import java.util.Map;
 public class OcrApiCallStatisticsServiceImpl extends ServiceImpl<OcrApiCallStatisticsMapper, OcrApiCallStatistics> implements IOcrApiCallStatisticsService {
 
     @Override
-    public IPage<OcrApiCallStatistics> pageList(Page<OcrApiCallStatistics> page, OcrApiCallStatistics ocrApiCallStatistics) {
+    public IPage<OcrApiCallStatistics> pageList(Page<OcrApiCallStatistics> page, CommonQueryModel commonQueryModel) {
         Map<String,Object> map=new LinkedHashMap<>();
-        map.put("apiUrl",ocrApiCallStatistics.getApiUrl());
+        map.put("apiUrl",commonQueryModel.getApiUrl());
-        map.put("count",ocrApiCallStatistics.getCount());
+        map.put("count",commonQueryModel.getCount());
-        if (ocrApiCallStatistics.getStartTime()!=null &&ocrApiCallStatistics.getEndTime()!=null) {
+        if (StringUtils.isNotBlank(commonQueryModel.getStartTime())&&StringUtils.isNotBlank(commonQueryModel.getEndTime())) {
             SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
-            map.put("startTime",sdf.format(ocrApiCallStatistics.getStartTime())+" 00:00:00");
+            map.put("startTime",commonQueryModel.getStartTime()+" 00:00:00");
-            map.put("endTime",sdf.format(ocrApiCallStatistics.getEndTime())+" 23:59:59");
+            map.put("endTime",commonQueryModel.getEndTime()+" 23:59:59");
         }
-
-
         IPage<OcrApiCallStatistics> pageList = this.baseMapper.pageList(page,map);
         return pageList;
     }