diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java index b8796133..faa609ba 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrTaskPackageController.java @@ -6,18 +6,41 @@ import cn.jyjz.xiaoyao.admin.service.UserService; import cn.jyjz.xiaoyao.common.base.config.XiaoyaoConfig; import cn.jyjz.xiaoyao.common.base.controller.BaseController; import cn.jyjz.xiaoyao.common.base.service.UserTokenService; +import cn.jyjz.xiaoyao.common.base.util.RequestBaseUtil; +import cn.jyjz.xiaoyao.common.base.vo.ResultVo; +import cn.jyjz.xiaoyao.common.base.vo.ResultVoUtil; +import cn.jyjz.xiaoyao.common.base.vo.UserToken; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrPlan; +import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskPackage; +import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateResultService; +import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateService; import cn.jyjz.xiaoyao.ocr.service.IOcrTaskPackageService; +import cn.jyjz.xiaoyao.ocr.service.OcrPictureService; +import cn.jyjz.xiaoyao.ocr.util.DataUtil; +import cn.jyjz.xiaoyao.ocr.util.SearchConfigEnum; +import cn.jyjz.xiaoyao.ocr.util.SearchParaFormatting; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** *
- * 任务包表 (新20240323) 前端控制器 + * 一键查重功能 *
* * @author author @@ -38,7 +61,149 @@ public class OcrTaskPackageController extends BaseController { private XiaoyaoConfig xiaoyaoConfig; @Resource private FtperrorService ftperrorService; + @Resource + private IOcrCheckDuplicateResultService ocrCheckDuplicateResultService; + @Resource + private IOcrCheckDuplicateService ocrCheckDuplicateService; + @Resource + private OcrPictureService ocrPictureService; + + @ApiOperation(value = "一键查重", notes = "一键查重") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", name = "X-Tenant-Id", value = "租户主键,用户登录时的信息“tenantList”中获得。", dataType = "String", required = true) + }) + @GetMapping(value = "/checkDuplicate") + public ResultVo checkDuplicate(OcrPicture ocrPicture, HttpServletRequest req) { + + //获取当前登录人 + UserToken userToken = this.userTokenService.getUserToken(RequestBaseUtil.getToken(req)); + + //租户主键,由前端页面传送 + String tenantId = req.getHeader("X-Tenant-Id"); + if (StringUtils.isBlank(tenantId)) { + return ResultVoUtil.error("租户主键不能为空"); + } + + QueryWrapper
* 任务包表 (新20240323) 服务类
@@ -13,4 +19,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IOcrTaskPackageService extends IService
* 查重任务表 服务实现类
@@ -17,4 +28,35 @@ import org.springframework.stereotype.Service;
@Service
public class OcrCheckDuplicateServiceImpl extends ServiceImpl
* 任务包表 (新20240323) 服务实现类
@@ -17,4 +36,207 @@ import org.springframework.stereotype.Service;
@Service
public class OcrTaskPackageServiceImpl extends ServiceImpl