From 129c390345e8fa56e643238b9a71c23ffadcab92 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Wed, 20 Mar 2024 22:40:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8F=90=E6=8A=A5=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E6=97=B6=E9=97=B4=E6=88=B3=E3=80=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=9B=B8=E4=BC=BC=E5=BA=A6=E9=98=88=E5=80=BC=E5=8C=BA?=
 =?UTF-8?q?=E9=97=B4=E6=AF=94=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java     |  4 ++++
 .../xiaoyao/ocr/thread/tasks/PictureDisposeTask.java   | 10 ++++++++++
 .../cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java     |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
index f0b2534c..fb7c0e4e 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/dataobject/OcrPicture.java
@@ -347,6 +347,10 @@ 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(
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java
index 80212482..5b1dec8a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java
@@ -1,14 +1,17 @@
 package cn.jyjz.xiaoyao.ocr.thread.tasks;
 
+import cn.hutool.core.date.DateUtil;
 import cn.jyjz.xiaoyao.common.base.util.SpringUtils;
 import cn.jyjz.xiaoyao.common.base.util.StringUtils;
 import cn.jyjz.xiaoyao.ocr.api.entity.PictureSourceResult;
 import cn.jyjz.xiaoyao.ocr.dataobject.OcrPicture;
 import cn.jyjz.xiaoyao.ocr.service.OcrPictureService;
+import javafx.scene.input.DataFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -170,6 +173,13 @@ public class PictureDisposeTask implements Runnable{
                 picture.setField8(pictureSourceResult.getDiscoveredIssues());
                 //拜访日期
                 picture.setField11(pictureSourceResult.getVisitDate());
+                //拜访日期
+                if(StringUtils.isNotBlank(pictureSourceResult.getVisitDate())){
+                    Date date = DateUtil.parse(pictureSourceResult.getVisitDate(),"yyyy-MM-dd");
+                    picture.setSubmitDateTimestamp(date.getTime());
+                }
+
+
                 //定位距离
                 picture.setField12(pictureSourceResult.getDistance());
 
diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java
index bb12904a..cb2fbf9a 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/util/SearchConfigEnum.java
@@ -37,12 +37,12 @@ public enum SearchConfigEnum {
     //所属计划
     PLANSEARCH("izplan","planName"),
     //相似度
-//    SIMISEARCH("izsimilarity","pictureresult"),
+    SIMISEARCH("izsimilarity","similarity_score"),
     //分类搜索
     CLASSISEARCH("izshow","classificationid"),
 
     //是否展示年份
-    YEARSEARCH("izyear","upTime"),
+    YEARSEARCH("izyear","submit_date_timestamp"),
     //图片类型
     TYPESEARCH("izpicturetype","pictureclassid"),
     //发布地区、拜访城市