fix: 解决时间戳异常问题

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/impl/PrevailCloudApiImpl.java

@@ -32,10 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 图片数据接口实现类
@@ -73,9 +70,13 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         //map值转string 注意对日期类型进行操作,加密包要求值全部为string
         for (String key : queryParam.keySet()) {
             if (queryParam.get(key) != null) {
-                queryParamStr.put(key, queryParam.get(key).toString());
+                if(key.equals("startTime") || key.equals("endTime")){
+                    Date date = (Date) queryParam.get(key);
+                    queryParamStr.put(key,String.valueOf(date.getTime()));
+                }else{
+                    queryParamStr.put(key, queryParam.get(key).toString());
+                }
             }
-
         }
 
         //加密请求参数
@@ -141,7 +142,12 @@ public class PrevailCloudApiImpl implements PrevailCloudApi {
         //map值转string 注意对日期类型进行操作,加密包要求值全部为string
         for (String key : queryParam.keySet()) {
             if (queryParam.get(key) != null) {
-                queryParamStr.put(key, queryParam.get(key).toString());
+                if(key.equals("startTime") || key.equals("endTime")){
+                    Date date = (Date) queryParam.get(key);
+                    queryParamStr.put(key,String.valueOf(date.getTime()));
+                }else{
+                    queryParamStr.put(key, queryParam.get(key).toString());
+                }
             }
         }
 

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/api/thread/PullAllPictureSourceThread.java

@@ -19,6 +19,7 @@ import org.apache.commons.lang.time.DateFormatUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.*;
 
@@ -113,6 +114,7 @@ public class PullAllPictureSourceThread implements Runnable{
             Instant endInstant = startDate.offsetNew(DateField.DAY_OF_YEAR, 1).toInstant();
             pictureSourceParameter.setStartTime(Date.from(startInstant));
             pictureSourceParameter.setEndTime(Date.from(endInstant));
+
             //记录当前拉取日期
             pictureSourceAllPullMsg.setTimeStr(DateFormatUtils.format(startDate,"yyyy-MM-dd"));
             while (hasNextPage) {