fix: api注释

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrAiApprovalTools.java

@@ -14,6 +14,7 @@ import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPictureAppro;
 import cn.jyjz.xiaoyao.ocr.service.IOcrSearchHistoryService;
 import cn.jyjz.xiaoyao.framework.security.sms.MsmService;
+import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,7 @@ import java.util.Map;
  * AI审批工单
  * @Date 2024-03-17 19:53:30
  */
+@Api(tags = "ocr_数据统计")
 @CrossOrigin
 @RestController
 @RequestMapping("/ocr/aitools")

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrCheckDuplicateController.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +43,7 @@ import java.util.Map;
  * @version 1.0
  * @date 2024/3/25 1:31
  */
+@Api(tags = "一键查重")
 @RestController
 @RequestMapping("/ocr/checkDuplicate")
 public class OcrCheckDuplicateController {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrFieldController.java

@@ -20,10 +20,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrFieldService;
 import cn.jyjz.xiaoyao.ocr.vo.OcrFieldVo;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.*;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import liquibase.pro.packaged.S;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -39,6 +36,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+@Api(tags = "ocr_高级检索")
 @RestController
 @RequestMapping("/ocr/field")
 public class OcrFieldController extends BaseController {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java

@@ -13,6 +13,7 @@ import cn.jyjz.xiaoyao.ocr.util.PageRequest;
 import cn.jyjz.xiaoyao.ocr.vo.OcrMsgVO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +34,7 @@ import java.util.stream.Collectors;
  * @author 你的肉
  * @Date 2024-03-13 20:21:38
  */
+@Api(tags = "ocr_消息通知")
 @CrossOrigin
 @RestController
 @RequestMapping("/ocr/msg")

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPackagetaskController.java

@@ -52,7 +52,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.multipart.MultipartFile;
 
-@Api(tags="ocr_任务包")
 @RestController
 @RequestMapping("/ocr/ocrPackagetask")
 public class OcrPackagetaskController extends BaseController{
@@ -69,13 +68,13 @@ public class OcrPackagetaskController extends BaseController{
 	private UserTokenService userTokenService;
 	@Resource
 	private UserService userService;
-	
+
 	@Resource
 	private XiaoyaoConfig xiaoyaoConfig;
-	
+
 	@Resource
 	private FtperrorService ftperrorService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -94,7 +93,7 @@ public class OcrPackagetaskController extends BaseController{
 													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													   HttpServletRequest request) {
-		
+
 		//租户主键，由前端页面传送
 		String tenantId = request.getHeader("X-Tenant-Id");
 		if(StringUtils.isBlank(tenantId)){
@@ -104,7 +103,7 @@ public class OcrPackagetaskController extends BaseController{
 
 		//获取当前登录人
 		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-		
+
 		QueryWrapper<OcrPackagetask> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("tenant_id",tenantId);
 		if(StringUtils.isNotBlank(packageName)){
@@ -171,17 +170,17 @@ public class OcrPackagetaskController extends BaseController{
 							 @RequestParam(value = "file", required = true) MultipartFile imgfile) throws IOException{
 
 		String filepat = SystemConstantsOa.OCR_IMG_UP_PATH;
-		
+
 		//上传参考图
 		if (null != imgfile && !imgfile.isEmpty()) {
 			//获得文件后缀
 			String fileType = org.apache.commons.io.FilenameUtils.getExtension(imgfile.getOriginalFilename());
-			
+
 			List<String> allowedExtensions = Arrays.asList("jpg", "jpeg", "png", "gif"); // 允许上传的文件类型列表
 			if (!allowedExtensions.contains(fileType.toLowerCase())) {
 				return ResultVoUtil.error("不支持的文件类型.");
 			}
-			
+
 			//重新命名
 			String fileName = System.currentTimeMillis() + "_c." + fileType;
 			ResultVo rs = UploadSpringUtil.springUpload(imgfile, xiaoyaoConfig,filepat, fileName,ftperrorService);
@@ -191,94 +190,7 @@ public class OcrPackagetaskController extends BaseController{
 				}
 			}
 		}
-		
+
 		return ResultVoUtil.error();
 	}
-//
-//	/**
-//	 * 任务包详情
-//	 *
-//	 * @param ocrPackagetask
-//	 * @return
-//	 */
-//	//@AutoLog(value = "ocr_packagetask-分页列表查询")
-//	@ApiOperation(value="ocr_任务包详情", notes="ocr_任务包详情")
-//	@ApiImplicitParams({
-//			@ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true),
-//			@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键", required = true)
-//	})
-//	@GetMapping(value = "/listorderbytask")
-//	public ResultVo<List<OcrPicture>> listorderbytask(OcrPackagetask ocrPackagetask,
-//													@RequestParam(name="packageid") String packageid,
-//													HttpServletRequest request) {
-//		//租户主键，由前端页面传送
-//		String tenantId = request.getHeader("X-Tenant-Id");
-//		if(StringUtils.isBlank(tenantId)){
-//			return ResultVoUtil.error("租户主键不能为空");
-//		}
-//
-//		//获取当前登录人
-//		UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(request));
-//
-//		List<OcrPicture> pageList = ocrPictureService.listByTaskChild(tenantId,userToken.getLoginname(),null,null,packageid);
-//
-//		return ResultVoUtil.success(pageList);
-//	}
-	
-	
-//	/**
-//	 * 工单主图真假标记
-//	 *
-//	 * @param req
-//	 * @return
-//	 */
-//	@ApiOperation(value="工单主图真假标记", notes="工单主图真假标记")
-//	@ApiImplicitParams({
-//			@ApiImplicitParam(paramType = "path",name = "childpictureid", value = "工单主键", required = true),
-//			@ApiImplicitParam(paramType = "path",name = "izTrueorfalse", value = "主图片真假0:假，1：真", required = true),
-//			@ApiImplicitParam(paramType = "path",name = "judgeid", value = "主图判真假原因id,从字典表中获得", required = true),
-//			@ApiImplicitParam(paramType = "path",name = "packageid", value = "任务包主键", required = true)
-//	})
-//	@PostMapping(value = "/ordertrueorfalse")
-//	public ResultVo ordertrueorfalse(@RequestParam(name="childpictureid",required=true) String childpictureid,
-//								   @RequestParam(name="izTrueorfalse",required=true) String izTrueorfalse,
-//								   @RequestParam(name="judgeid",required=true) String judgeid,
-//								   @RequestParam(name="packageid",required=true) String packageid,
-//								   HttpServletRequest req) {
-//		//TODO 如果是历史图片，允许进行设置
-//		//TODO 如果是已经审批完成的图片不允许是指
-//
-//		OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture();
-////		ocrTaskchildPicture.setIztrueorfalse(izTrueorfalse);
-////		ocrTaskchildPicture.setJudgeid(judgeid);
-//		ocrTaskchildPicture.setPackageid(Long.parseLong(packageid));
-//
-//		return ocrTaskchildPictureService.trueorfalse(childpictureid,ocrTaskchildPicture)?ResultVoUtil.success():ResultVoUtil.error("失败。");
-//	}
-//
-//	/**
-//	 * 工单查重图是否合格标记
-//	 *
-//	 * @param req
-//	 * @return
-//	 */
-//	@ApiOperation(value="工单查重图是否合格标记", notes="工单查重图是否合格标记")
-//	@ApiImplicitParams({
-//			@ApiImplicitParam(paramType = "path",name = "childpictureid", value = "工单主键", required = true),
-//			@ApiImplicitParam(paramType = "path",name = "izPass", value = "主图片是否合格0：否，1：是", required = true),
-//			@ApiImplicitParam(paramType = "path",name = "judgePassid", value = "主图判是否合格原因id,从字典表中获得", required = true),
-//			@ApiImplicitParam(paramType = "path",name = "packageid", value =  "任务包主键", required = true)
-//	})
-//	@PostMapping(value = "/orderpass")
-//	public ResultVo<List<OcrPicture>> orderpass(@RequestParam(name="childpictureid",required=true) String childpictureid,
-//											  @RequestParam(name="izPass",required=true) String izPass,
-//											  @RequestParam(name="judgePassid",required=true) String judgePassid,
-//											  @RequestParam(name="packageid",required=true) String packageid,
-//											  HttpServletRequest req) {
-//		OcrTaskchildPicture ocrTaskchildPicture = new OcrTaskchildPicture();
-////		ocrTaskchildPicture.setIzpass(izPass);
-////		ocrTaskchildPicture.setJudgepass(Long.parseLong(judgePassid));
-//		ocrTaskchildPicture.setPackageid(Long.parseLong(packageid));
-//		return ocrTaskchildPictureService.pass(childpictureid,ocrTaskchildPicture)?ResultVoUtil.success():ResultVoUtil.error("失败。");
-//	}
 }

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogController.java

@@ -12,6 +12,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrPictureLogService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-
+@Api(tags = "ocr_无量云api日志")
 @RestController
 @RequestMapping("/ocr/picturelog")
 public class OcrPictureLogController extends BaseController {
@@ -48,6 +49,7 @@ public class OcrPictureLogController extends BaseController {
 		ParamterPage paramterPage = new ParamterPage();
 		paramterPage.setPagesize(pageSize);
 		paramterPage.setStart(start);
+		queryWrapper.orderByDesc("create_time");
 		IPage<OcrPictureLog> ocrPictureLogIPage = ocrPictureLogService.selectSearchListPage(paramterPage, queryWrapper);
 		resultVo.setData(ocrPictureLogIPage);
 		resultVo.addOK("查询成功");

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPictureLogHtmlController.java

@@ -4,6 +4,7 @@ import cn.jyjz.xiaoyao.admin.service.UserService;
 import cn.jyjz.xiaoyao.common.base.controller.BaseController;
 import cn.jyjz.xiaoyao.common.base.service.UserTokenService;
 import cn.jyjz.xiaoyao.ocr.service.OcrConfigurationService;
+import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+@Api(tags = "ocr_模型日志")
 @Controller
 @RequestMapping("/backstage/oa/picturelogHtml")
 public class OcrPictureLogHtmlController extends BaseController{

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrPrevailCloudLogController.java

@@ -46,6 +46,7 @@ public class OcrPrevailCloudLogController {
         ParamterPage paramterPage = new ParamterPage();
         paramterPage.setPagesize(pageSize);
         paramterPage.setStart(start);
+        queryWrapper.orderByDesc("create_time");
         IPage<OcrPrevailCloudLog> ocrPictureLogIPage = ocrPrevailCloudLogService.selectSearchListPage(paramterPage, queryWrapper);
         resultVo.setData(ocrPictureLogIPage);
         resultVo.addOK("查询成功");

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSUserTController.java

@@ -13,6 +13,7 @@ import cn.jyjz.xiaoyao.ocr.service.OcrTaskchildPictureService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -30,6 +31,7 @@ import java.util.Map;
  * @author 你的肉
  * @Date 2024-03-12 19:25:17
  */
+@Api(tags = "ocr_忘记密码")
 @CrossOrigin
 @RestController
 @RequestMapping("/ocr/sUser")

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrSearchHistoryController.java

@@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil;
 import cn.jyjz.xiaoyao.common.base.vo.UserToken;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrSearchHistory;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@ import java.util.Map;
  * @author 你的肉
  * @Date 2024-03-15 19:53:30
  */
+@Api(tags = "ocr_全局检索")
 @CrossOrigin
 @RestController
 @RequestMapping("/ocr/history")

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java

@@ -13,6 +13,7 @@ import cn.jyjz.xiaoyao.ocr.dto.OcrTaskPackageDto;
 import cn.jyjz.xiaoyao.ocr.service.IOcrTaskPackageService;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +31,7 @@ import java.util.Map;
  * @author author
  * @since 2024-03-24
  */
+@Api(tags = "ocr_任务包")
 @RestController
 @RequestMapping("/ocr/ocrTaskPackage")
 public class OcrTaskPackageController extends BaseController {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskchildDubiousFileController.java

@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
  * @author 你的肉
  * @Date 2024-03-21 19:00:57
  */
-@Api(tags="ocr可疑文件控制器")
+@Api(tags="ocr_可疑文件控制器")
 @RestController
 @RequestMapping("/ocr/dubiousfile")
 public class OcrTaskchildDubiousFileController  {

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrUserFieldController.java

@@ -7,6 +7,7 @@ import cn.jyjz.xiaoyao.ocr.dataobject.OcrUserField;
 import cn.jyjz.xiaoyao.ocr.dto.OcrUserFieldDto;
 import cn.jyjz.xiaoyao.ocr.service.OcrUserFieldService;
 import cn.jyjz.xiaoyao.ocr.vo.OcrUserFieldVo;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
@@ -15,6 +16,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+@Api(tags = "ocr_用户自定义展示列")
 @RestController
 @RequestMapping("/ocr/user/field")
 public class OcrUserFieldController extends BaseController{

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/PrevailCloudApiController.java

@@ -21,6 +21,8 @@ import cn.jyjz.xiaoyao.ocr.thread.TaskQueue;
 import cn.jyjz.xiaoyao.ocr.util.RequestParameterFormat;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Maps;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.compress.utils.Lists;
@@ -50,6 +52,7 @@ import java.util.concurrent.TimeUnit;
  * @version 1.0
  * @date 2024/3/14 19:47
  */
+@Api(tags = "ocr_无量云拉取")
 @Slf4j
 @RestController
 @RequestMapping("/test/api")
@@ -94,6 +97,7 @@ public class PrevailCloudApiController {
      * @param request
      * @return
      */
+    @ApiOperation(value = "全量拉取", notes = "全量拉取")
     @GetMapping("pullPictureAllByAccountNo")
     public String pullPictureAllByAccountNo(HttpServletRequest request) {
 
@@ -143,6 +147,7 @@ public class PrevailCloudApiController {
      * @return
      */
     @GetMapping("pullPictureByOneAccountNo")
+    @ApiOperation(value = "单次拉取", notes = "单业务主体拉取指定条数")
     public String pullPictureByOneAccountNo(HttpServletRequest request) {
         String beginStr = request.getParameter("beginStr");
         String endStr = request.getParameter("endStr");
@@ -205,83 +210,6 @@ public class PrevailCloudApiController {
         return "处理失败";
     }
 
-    @GetMapping("psTest")
-    public String psTset(HttpServletRequest request) {
-        String beginStr = request.getParameter("beginStr");
-        String endStr = request.getParameter("endStr");
-        String pageSize = request.getParameter("pageSize");
-        String pageNo = request.getParameter("pageNo");
-        String tenantNoStr = request.getParameter("tenantNo");
-        if (StringUtils.isBlank(tenantNoStr)) {
-            return "租户不能为空";
-        }
-        String accountNoStr = request.getParameter("accountNo");
-        if (StringUtils.isBlank(accountNoStr)) {
-            return "业务主体不能为空";
-        }
-
-        List<Department> departments = departmentMybatisDao.selectList(new QueryWrapper<>());
-        if (CollectionUtils.isEmpty(departments)) {
-            return "业务主体数据为空";
-        }
-
-        Map<Long, Department> departmentMap = Maps.newHashMapWithExpectedSize(departments.size());
-        for (Department department : departments) {
-            departmentMap.put(department.getId(), department);
-        }
-
-        if (departmentMap.isEmpty()) {
-            return "业务主体数据为空";
-        }
-
-        PictureSourceParameter pictureSourceParameter = new PictureSourceParameter();
-        DateTime dateTime = DateUtil.parse(beginStr + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
-        DateTime dateTime1 = DateUtil.parse(endStr + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
-        Instant binstant = dateTime.toInstant();
-        Instant einstant = dateTime1.toInstant();
-        pictureSourceParameter.setStartTime(Date.from(binstant));
-        pictureSourceParameter.setEndTime(Date.from(einstant));
-        pictureSourceParameter.setPageNo(Integer.parseInt(pageNo));
-        pictureSourceParameter.setPageSize(Integer.parseInt(pageSize));
-
-        List<PictureSourceResult> totalList = Lists.newArrayList();
-        for (Department department : departments) {
-            if (!departmentMap.containsKey(department.getParentid())) {
-                continue;
-            }
-
-            Long tenantNo = Long.valueOf(departmentMap.get(department.getParentid()).getDeptno());
-            Long accountNo = Long.valueOf(department.getDeptno());
-            pictureSourceParameter.setTenantNo(tenantNo);
-            pictureSourceParameter.setAccountNo(accountNo);
-
-            List<PictureSourceResult> resultList = prevailCloudApi.getPictureSourceResultApiPage(pictureSourceParameter, false);
-            if (CollectionUtils.isEmpty(resultList)) {
-                continue;
-            }
-
-            totalList.addAll(resultList);
-        }
-
-        for (PictureSourceResult pictureSourceResult : totalList) {
-            //1.如果不存在图片默认一个默认图片，方便走测试。
-            if (pictureSourceResult.getLivePhoto() == null) {
-                List<Map<String, Object>> livePhoto = new ArrayList<>();
-                Map<String, Object> map = new HashMap<>();
-                map.put("imgUrl", StringUtils.isEmpty(apiConfig.getDefaultPictureImg()) ? "http://47.93.59.251/api/image/default.png" : apiConfig.getDefaultPictureImg());
-                map.put("imgName", "default.png");
-                livePhoto.add(map);
-                pictureSourceResult.setLivePhoto(livePhoto);
-            }
-            //赋值默认参数
-            pictureSourceResult.setRequestParam(pictureSourceParameter);
-            //将可以处理数据放入处理队列中
-            TaskQueue.pictureDisposePushData(pictureSourceResult, ocrPictureService, ocrPrevailCloudLogService);
-        }
-
-        return "处理成功";
-    }
-
     @GetMapping("/pullPictureByParameter")
     public Boolean pullPictureByParameter(String parameterString, Long id) {
         OcrPrevailCloudLog byId = ocrPrevailCloudLogService.getById(id);
@@ -334,8 +262,9 @@ public class PrevailCloudApiController {
     }
 
 
-    @GetMapping("psTest01")
+    @GetMapping("/pullBatchPictureByParameter")
-    public String psTset01(HttpServletRequest request) {
+    @ApiOperation(value = "批量拉取", notes = "时间区间多业务主体拉取")
+    public String pullBatchPictureByParameter(HttpServletRequest request) {
         String beginStr = request.getParameter("beginStr");
         String endStr = request.getParameter("endStr");
         String pageSize = request.getParameter("pageSize");