图片查询、图片查询-自定义过滤条件、相似度图片列表接口 增加是否在可疑文件夹排除

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

@@ -215,6 +215,7 @@ public class OcrPictureController extends BaseController {
 
         String search_month = req.getParameter("search_month");
         String ordertype = req.getParameter("ordertype");
+        queryWrapper.eq("suspiciousfile","0");
         if (StringUtils.isNotBlank(ordertype)) {
             if (ordertype.equals("0")) {
                 queryWrapper.orderByAsc("similarity_score");

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

@@ -56,6 +56,7 @@ public class OcrTaskchildPictureController extends BaseController {
     @Resource
     private UserService userService;
 
+
     /**
      * 方法描述：返回json字符串，接受参数，dto名称以及分页信息
      * 创建人：mail.zhangyong@gmail.com
@@ -169,6 +170,14 @@ public class OcrTaskchildPictureController extends BaseController {
             jsonObject.put("packageid", jsonObject.getOrDefault("packageid", null).toString());
             return jsonObject;
         }).collect(Collectors.toList());
+        for (JSONObject asd:collect){
+            QueryWrapper<OcrPicture> imgWrapper = new QueryWrapper<>();
+            imgWrapper.eq("id",asd.get("pictureid"));
+            OcrPicture one = ocrPictureService.getOne(imgWrapper);
+            if (one.getSuspiciousfile()!=0){
+                 collect.add(asd);
+            }
+        }
         IPage<JSONObject> objects = new Page<>();
         BeanUtils.copyProperties(page, objects);
         objects.setRecords(collect);

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

@@ -338,6 +338,11 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @TableField(value = "server_thumbnail_url")
     private String serverThumbnailUrl;
 
+    @ApiModelProperty(value = "可疑文件夹 0:不在，1：在")
+    @Schema(description = "可疑文件夹 0:不在，1：在")
+    @TableField(value = "suspiciousfile")
+    private Integer suspiciousfile;
+
     //图片分类
     @TableField(exist = false)
     private OcrPictureclass ocrPictureclass;
@@ -347,10 +352,6 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
     @JsonIgnore
     private SearchQuery searchQueryrolesShowleave;
 
-    @ApiModelProperty(value = "提报日期时间戳")
-    @TableField(value = "submit_date_timestamp")
-    private Long submitDateTimestamp;
-
     @TableField(exist = false)
     @JsonIgnore
     private final Map<String, String> query = Stream.of(
@@ -419,7 +420,8 @@ public class OcrPicture implements BaseDto, java.io.Serializable {
                     new SimpleEntry<>("localpictrueurl", "localpictrueurl"),
                     new SimpleEntry<>("imgHash", "imgHash"),
                     new SimpleEntry<>("serverThumbnailUrl", "serverThumbnailUrl"),
-                    new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl")
+                    new SimpleEntry<>("localThumbnailUrl", "localThumbnailUrl"),
+                    new SimpleEntry<>("suspiciousfile", "suspiciousfile")
             )
             .collect(Collectors.toMap(SimpleEntry::getKey, SimpleEntry::getValue));
 

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

@@ -754,7 +754,7 @@ public class OcrPictureServiceImpl extends BaseServiceImpl<OcrPictureMybatisDao,
 
         QueryWrapper<OcrPicture> queryWrapper = new QueryWrapper();
 
-
+        queryWrapper.eq("suspiciousfile","0");
         for (OcrUsersearchchild usersearchchild : ocrUsersearch.getOcrUsersearchchildList()) {
             this.formattingSearchChild(queryWrapper, usersearchchild);
 

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrPictureMapper.xml

@@ -64,6 +64,7 @@
 		<result column="field16" property="field16" jdbcType="VARCHAR"/>
 		<result column="field17" property="field17" jdbcType="VARCHAR"/>
 		<result column="field18" property="field18" jdbcType="VARCHAR"/>
+		<result column="suspiciousfile" property="suspiciousfile" jdbcType="INTEGER"/>
 	</resultMap>
 	<sql id="Base_Column_List">
 		ID AS id,
@@ -127,7 +128,8 @@
 		field15 AS field15,
 		field16 AS field16,
 		field17 AS field17,
-		field18 AS field18
+		field18 AS field18,
+	    suspiciousfile AS suspiciousfile
 	</sql>
 
 	<sql id="Base_Where">
@@ -195,6 +197,7 @@
 				<if test="field16 != null"> and field16 ${field16.dataOp} ${field16.likestar}#{field16.value}${field16.likeend}</if>
 				<if test="field17 != null"> and field17 ${field17.dataOp} ${field17.likestar}#{field17.value}${field17.likeend}</if>
 				<if test="field18 != null"> and field18 ${field18.dataOp} ${field18.likestar}#{field18.value}${field18.likeend}</if>
+				<if test="suspiciousfile != null"> and suspiciousfile ${suspiciousfile.dataOp} ${suspiciousfile.likestar}#{suspiciousfile.value}${suspiciousfile.likeend}</if>
 			</trim>
 		</where>
 		<if test="page != null">