add:AI一键查重功能改造基础类提交

.gitignore

@@ -2,3 +2,4 @@
 **/.idea/
 *.iml
 rebel.xml
+*.log

jyjz-framework/jyjz-framework-securityweb/src/main/java/cn/jyjz/xiaoyao/framework/security/authentication/JwtAuthenticationFilter.java

@@ -60,7 +60,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
         String[] excludespath = systemopenurlService.getOpenUrl();
 
         //不需要过滤的url
-        String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/druid"};
+        String[] excludesOther = {"/static","/json",".js",".css",".ico",".jpg",".png",".pcm","/druid","/doc.html","/swagger-ui.html","/swagger-resources","/webjars/**","/v2/api-docs"};
 
         String[] urls =  ArrayUtils.addAll(excludespath, excludesOther);
 
@@ -144,7 +144,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 //                        .respJson(ResultVoUtil.success(xiaoyaoConfig.getWebconfig().getLoginSuccessUrl(),token),response);
 
                 }
-            }else{
+            }
+            else{
                 //抛出filter异常到全局处理异常
                 HandlerExceptionResolver hadoopHandlerExceptionResolver = SpringUtils.getBean("handlerExceptionResolver");
                 hadoopHandlerExceptionResolver.resolveException(request,response,null, new ServiceException(CommonExceptionCodeEnum.DATA_TOKEN_NULL));

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

@@ -0,0 +1,44 @@
+package cn.jyjz.xiaoyao.ocr.controller;
+
+
+import cn.jyjz.xiaoyao.abase.service.FtperrorService;
+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.ocr.service.IOcrTaskPackageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 任务包表  (新20240323) 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@RestController
+@RequestMapping("/ocr/ocrTaskPackage")
+public class OcrTaskPackageController extends BaseController {
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Resource
+    private IOcrTaskPackageService ocrTaskPackageService;
+    @Resource
+    private UserTokenService userTokenService;
+    @Resource
+    private UserService userService;
+    @Resource
+    private XiaoyaoConfig xiaoyaoConfig;
+    @Resource
+    private FtperrorService ftperrorService;
+
+
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDuplicateMapper.java

@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 查重任务表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrCheckDuplicateMapper extends BaseMapper<OcrCheckDuplicate> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrCheckDuplicateResultMapper.java

@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrCheckDuplicateResultMapper extends BaseMapper<OcrCheckDuplicateResult> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrPictrueDuplicateHisMapper.java

@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictrueDuplicateHis;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 图片比对历史信息表 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrPictrueDuplicateHisMapper extends BaseMapper<OcrPictrueDuplicateHis> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataDao/OcrTaskPackageMapper.java

@@ -0,0 +1,18 @@
+package cn.jyjz.xiaoyao.ocr.dataDao;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskPackage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 任务包表  (新20240323) Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Mapper
+public interface OcrTaskPackageMapper extends BaseMapper<OcrTaskPackage> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicate.java

@@ -0,0 +1,71 @@
+package cn.jyjz.xiaoyao.ocr.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 查重任务表
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ocr_check_duplicate")
+@ApiModel(value="OcrCheckDuplicate对象", description="查重任务表")
+public class OcrCheckDuplicate implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value="id")
+    private Long id;
+
+    @ApiModelProperty(value = "查重任务编号")
+    private String checkDuplicateNo;
+
+    @ApiModelProperty(value = "1.执行中 2.执行完毕 3.执行异常")
+    private Integer status;
+
+    @ApiModelProperty(value = "完成时间")
+    private Long completionTime;
+
+    @ApiModelProperty(value = "租户标识")
+    private Long tenantId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    @ApiModelProperty(value = "查重时的筛选条件")
+    private String searchingJson;
+
+    @ApiModelProperty(value = "主图数量")
+    private Integer pictureCount;
+
+    @ApiModelProperty(value = "0可用 1删除")
+    private Integer isDelete;
+
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrCheckDuplicateResult.java

@@ -0,0 +1,54 @@
+package cn.jyjz.xiaoyao.ocr.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ocr_check_duplicate_result")
+@ApiModel(value="OcrCheckDuplicateResult对象", description="")
+public class OcrCheckDuplicateResult implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value="ID")
+    private Long id;
+
+    @ApiModelProperty(value = "图片id")
+    private Long pictureId;
+
+    @ApiModelProperty(value = "当前图片与任务包其他图片比对结果")
+    private String compareResultJson;
+
+    @ApiModelProperty(value = "查重任务id")
+    private Long checkDuplicateId;
+
+    @ApiModelProperty(value = "当前图片在当前任务包下比对最高阈值")
+    private Double maxSimilarity;
+
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPictrueDuplicateHis.java

@@ -0,0 +1,48 @@
+package cn.jyjz.xiaoyao.ocr.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 图片比对历史信息表
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ocr_pictrue_duplicate_his")
+@ApiModel(value="OcrPictrueDuplicateHis对象", description="图片比对历史信息表")
+public class OcrPictrueDuplicateHis implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value="id")
+    private Long id;
+
+    @ApiModelProperty(value = "图片表id")
+    private Long pictureId;
+
+    @ApiModelProperty(value = "图片查重历史（该图片历史的查重任务中所对比的图片的集合)")
+    private String checkDuplicateResultHisJson;
+
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrTaskPackage.java

@@ -0,0 +1,64 @@
+package cn.jyjz.xiaoyao.ocr.dataobject;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 任务包表  (新20240323)
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("ocr_task_package")
+@ApiModel(value="OcrTaskPackage对象", description="任务包表  (新20240323)")
+public class OcrTaskPackage implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "任务包id")
+    @Schema(description = "主键")
+    @TableId(value = "id",type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value="id")
+    private Long id;
+
+    @ApiModelProperty(value = "任务包名称")
+    private String name;
+
+    @ApiModelProperty(value = "查重任务id")
+    private Long checkDuplicateId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    @ApiModelProperty(value = "修改人")
+    private String updateBy;
+
+    @ApiModelProperty(value = "修改时间")
+    private Long updateTime;
+
+    private Integer isDelete;
+
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateResultService.java

@@ -0,0 +1,16 @@
+package cn.jyjz.xiaoyao.ocr.service;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+public interface IOcrCheckDuplicateResultService extends IService<OcrCheckDuplicateResult> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrCheckDuplicateService.java

@@ -0,0 +1,16 @@
+package cn.jyjz.xiaoyao.ocr.service;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 查重任务表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+public interface IOcrCheckDuplicateService extends IService<OcrCheckDuplicate> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrPictrueDuplicateHisService.java

@@ -0,0 +1,16 @@
+package cn.jyjz.xiaoyao.ocr.service;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictrueDuplicateHis;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 图片比对历史信息表 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+public interface IOcrPictrueDuplicateHisService extends IService<OcrPictrueDuplicateHis> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/IOcrTaskPackageService.java

@@ -0,0 +1,16 @@
+package cn.jyjz.xiaoyao.ocr.service;
+
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskPackage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 任务包表  (新20240323) 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+public interface IOcrTaskPackageService extends IService<OcrTaskPackage> {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateResultServiceImpl.java

@@ -0,0 +1,20 @@
+package cn.jyjz.xiaoyao.ocr.service.impl;
+
+import cn.jyjz.xiaoyao.ocr.dataDao.OcrCheckDuplicateResultMapper;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicateResult;
+import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateResultService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Service
+public class OcrCheckDuplicateResultServiceImpl extends ServiceImpl<OcrCheckDuplicateResultMapper, OcrCheckDuplicateResult> implements IOcrCheckDuplicateResultService {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrCheckDuplicateServiceImpl.java

@@ -0,0 +1,20 @@
+package cn.jyjz.xiaoyao.ocr.service.impl;
+
+import cn.jyjz.xiaoyao.ocr.dataDao.OcrCheckDuplicateMapper;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrCheckDuplicate;
+import cn.jyjz.xiaoyao.ocr.service.IOcrCheckDuplicateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 查重任务表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Service
+public class OcrCheckDuplicateServiceImpl extends ServiceImpl<OcrCheckDuplicateMapper, OcrCheckDuplicate> implements IOcrCheckDuplicateService {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrPictrueDuplicateHisServiceImpl.java

@@ -0,0 +1,20 @@
+package cn.jyjz.xiaoyao.ocr.service.impl;
+
+import cn.jyjz.xiaoyao.ocr.dataDao.OcrPictrueDuplicateHisMapper;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrPictrueDuplicateHis;
+import cn.jyjz.xiaoyao.ocr.service.IOcrPictrueDuplicateHisService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 图片比对历史信息表 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Service
+public class OcrPictrueDuplicateHisServiceImpl extends ServiceImpl<OcrPictrueDuplicateHisMapper, OcrPictrueDuplicateHis> implements IOcrPictrueDuplicateHisService {
+
+}

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskPackageServiceImpl.java

@@ -0,0 +1,20 @@
+package cn.jyjz.xiaoyao.ocr.service.impl;
+
+import cn.jyjz.xiaoyao.ocr.dataDao.OcrTaskPackageMapper;
+import cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskPackage;
+import cn.jyjz.xiaoyao.ocr.service.IOcrTaskPackageService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 任务包表  (新20240323) 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-03-24
+ */
+@Service
+public class OcrTaskPackageServiceImpl extends ServiceImpl<OcrTaskPackageMapper, OcrTaskPackage> implements IOcrTaskPackageService {
+
+}