From 40c448aee76f79e4cfc749eddb80f20c4291893c Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 26 Jul 2023 15:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/ding/controller/DingInfoPullController.java          |  3 +--
 .../com/ningdatech/pmapi/projectlib/model/entity/Project.java  |  2 --
 pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest2.java     | 10 ++++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java
index c52ad2f..d44891f 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/controller/DingInfoPullController.java
@@ -143,7 +143,6 @@ public class DingInfoPullController {
         long timestamp = System.currentTimeMillis();
         String appSecret = "496f0f2a19994f76b4fd9dae087366c7";
         String appKey = "A331101453557202109017383";
-        String dataName = "大数据管理局";
         String method = "POST";
         String secret = refreshTokenService.refreshToken(appKey,appSecret,govRequestTokenUrl,govRefreshTokenUrl,method);
         String sign = CryptUtils.MD5Encode(appKey + secret + timestamp);
@@ -160,7 +159,7 @@ public class DingInfoPullController {
         String url = "https://interface.zjzwfw.gov.cn/gateway/api/proxy/001003001029/" +
                 "dataSharing/5crv7i4727abLCv0.htm?requestTime=" + timestamp +
                 "&sign=" + sign + "&appKey=" + appKey +
-                "&capCode=abc&appId=abc&capTime=" + timestamp +
+                "&capCode=" + capCode + "&capTime=" + timestamp +
                 "&appId=" + appId + "&updateTime=" + updateTime;
         log.info("url :{}",url);
         ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java
index 9b890de..6856b51 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java
@@ -38,11 +38,9 @@ public class Project implements Serializable {
     private String area;
 
     @ApiModelProperty("项目阶段")
-    @Compare("项目阶段")
     private Integer stage;
 
     @ApiModelProperty("项目状态")
-    @Compare("项目状态")
     private Integer status;
 
     @ApiModelProperty("项目名称")
diff --git a/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest2.java b/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest2.java
index f2a8839..c91e139 100644
--- a/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest2.java
+++ b/pmapi/src/test/java/com/ningdatech/pmapi/irs/IrsTest2.java
@@ -67,4 +67,14 @@ public class IrsTest2 {
         System.out.println(sign1);
         System.out.println(sign2);
     }
+
+    @Test
+    public void test4(){
+        long timestamp = 1690354109541L;
+
+        long now = System.currentTimeMillis();
+
+        System.out.println( (timestamp - now)/1000 + "s");
+
+    }
 }