diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java index b5dc3bd..e448b23 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/controller/OcrApiCallStatisticsController.java +++ b/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> queryPageList(OcrApiCallStatistics ocrApiCallStatistics, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(CommonQueryModel commonQueryModel, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { Page page = new Page(pageNo, pageSize); - IPage pageList = ocrApiCallStatisticsService.pageList(page, ocrApiCallStatistics); + IPage pageList = ocrApiCallStatisticsService.pageList(page, commonQueryModel); return Result.OK(pageList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/model/CommonQueryModel.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/ocr/model/CommonQueryModel.java new file mode 100644 index 0000000..afc48ce --- /dev/null +++ b/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; +} 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 1e860e8..a678f5f 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 @@ -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 { - IPage pageList(Page page, OcrApiCallStatistics ocrApiCallStatistics); + IPage pageList(Page page, CommonQueryModel commonQueryModel); String saveLogs(String apiName, String apiUrl, int count); 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 42701b7..a3c38d7 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 @@ -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 implements IOcrApiCallStatisticsService { @Override - public IPage pageList(Page page, OcrApiCallStatistics ocrApiCallStatistics) { + public IPage pageList(Page page, CommonQueryModel commonQueryModel) { Map map=new LinkedHashMap<>(); - map.put("apiUrl",ocrApiCallStatistics.getApiUrl()); - map.put("count",ocrApiCallStatistics.getCount()); - if (ocrApiCallStatistics.getStartTime()!=null &&ocrApiCallStatistics.getEndTime()!=null) { + map.put("apiUrl",commonQueryModel.getApiUrl()); + map.put("count",commonQueryModel.getCount()); + 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("endTime",sdf.format(ocrApiCallStatistics.getEndTime())+" 23:59:59"); + map.put("startTime",commonQueryModel.getStartTime()+" 00:00:00"); + map.put("endTime",commonQueryModel.getEndTime()+" 23:59:59"); } - - IPage pageList = this.baseMapper.pageList(page,map); return pageList; }