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 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"), //发布地区、拜访城市