From e908138bfd64fb0a2da47cb621ee3c74808e9b5f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 07 一月 2026 09:21:56 +0800
Subject: [PATCH] 最新版本541200007最新版本541200007

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java |   76 +++++++++++++++++++++++++++++---------
 1 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java
index af3c4f0..6a2d6bb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/JiandaoyunCloudController.java
@@ -22,6 +22,7 @@
 import com.doumee.dao.web.reqeust.VisitRecordDTO;
 import com.doumee.dao.web.response.VisitRecordVO;
 import com.doumee.service.business.CarUseBookService;
+import com.doumee.service.business.CarsService;
 import com.doumee.service.business.third.model.ApiResponse;
 import com.doumee.service.business.third.model.PageData;
 import com.doumee.service.business.third.model.PageWrap;
@@ -68,12 +69,56 @@
     @Autowired
     private CarUseBookService carUseBookService;
 
+    @Autowired
+    private CarsService carsService;
+
+    public  static final String SECRET ="yKSKuO0LoFf06jWGrwwuGudK";
+    public  static final String LOCAl_SECRET ="tSoMiqC3GY6tItXY48tSTwY6";
+    public static final String LLCAL_CARINFO_SECRET = "4J1GMIAG3m6O2jkkaxTu5EOe";
+
+
     @LoginNoRequired
     @ApiOperation("绠�閬撲簯鎺ㄩ�佺敤杞︾敵璇�")
     @PostMapping("/pushCarApply")
     public void pushCarApply (HttpServletRequest request, HttpServletResponse response) {
-        log.error("绠�閬撲簯=========getRequestURI锛�"+request.getRequestURI());
-        log.error("绠�閬撲簯=========getRequestURL锛�"+request.getRequestURL());
+        log.error("銆愮畝閬撲簯銆� 鐢ㄨ溅鐢宠 =========getRequestURI锛�"+request.getRequestURI());
+        log.error("銆愮畝閬撲簯銆� 鐢ㄨ溅鐢宠 =========getRequestURL锛�"+request.getRequestURL());
+        try{
+            String jdy = request.getHeader("x-jdy-signature");
+            StringBuilder json = new StringBuilder();
+            String line;
+            BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream()));
+            while ((line = reader.readLine()) != null) {
+                json.append(line);
+            }
+//            String payload = IOUtils.toString(request.getInputStream(), "utf-8");
+            String payload = json.toString();
+            String uri = request.getRequestURI();
+            Map<String, String> parameterMap = parseParameter(request.getQueryString());
+            String nonce = parameterMap.get("nonce");
+            String timestamp = parameterMap.get("timestamp");
+            String signature = getSignature(nonce, payload, systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.SECRET).getCode(), timestamp);
+            if (!signature.equals(jdy)) {
+                response.setStatus(401);
+                response.getWriter().write("fail");
+                response.getWriter().close();;
+                return ;
+            }
+            carUseBookService.jdyPushCarUseBook(payload);
+            response.setStatus(200);
+            response.getWriter().write("success");
+            response.getWriter().close();
+        }catch (Exception e){
+            e.printStackTrace();
+            log.error("銆愮畝閬撲簯銆� 鐢ㄨ溅鐢宠 =========寮傚父锛�"+e.getMessage());
+        }
+    }
+
+
+    @LoginNoRequired
+    @ApiOperation("绠�閬撲簯鎺ㄩ�佽溅杈嗕俊鎭�")
+    @PostMapping("/pushCarInfo")
+    public void pushCarInfo (HttpServletRequest request, HttpServletResponse response) {
         try {
             String jdy = request.getHeader("x-jdy-signature");
             StringBuilder json = new StringBuilder();
@@ -88,18 +133,17 @@
             Map<String, String> parameterMap = parseParameter(request.getQueryString());
             String nonce = parameterMap.get("nonce");
             String timestamp = parameterMap.get("timestamp");
-            String signature = getSignature(nonce, payload, LOCAl_SECRET, timestamp);
-            log.error("绠�閬撲簯=========nonce锛�"+nonce);
-            log.error("绠�閬撲簯=========timestamp锛�"+timestamp);
-            log.error("绠�閬撲簯=========payload锛�"+payload);
-            log.error("绠�閬撲簯=========绛惧悕锛�"+jdy);
-            log.error("绠�閬撲簯=========绛惧悕(姝g‘锛夛細"+signature);
+            String signature = getSignature(nonce, payload,
+                    //LOCAl_SECRET
+                    systemDictDataBiz.queryByCode(Constants.JDY_CONFIG,Constants.CAR_SECRET).getCode()
+                    , timestamp);
             if (!signature.equals(jdy)) {
                 response.setStatus(401);
                 response.getWriter().write("fail");
                 response.getWriter().close();;
                 return ;
             }
+            carsService.jdyPushCarInfo(payload);
             response.setStatus(200);
             response.getWriter().write("success");
             response.getWriter().close();
@@ -107,8 +151,8 @@
             e.printStackTrace();
             log.error("绠�閬撲簯=========寮傚父锛�"+e.getMessage());
         }
-
     }
+
     @ApiOperation("绠�閬撲簯鎻愪氦閽ュ寵鍊熻繕淇℃伅")
     @PostMapping("/submitKeyRecord")
     public ApiResponse<JkCabinetLog> submitKeyRecord (HttpServletRequest request, HttpServletResponse response) {
@@ -118,9 +162,6 @@
         log.setMemberName("寮犱笁");
         return  ApiResponse.success(log);
     }
-
-    public  static final String SECRET ="yKSKuO0LoFf06jWGrwwuGudK";
-    public  static final String LOCAl_SECRET ="tSoMiqC3GY6tItXY48tSTwY6";
 
     private static String getSignature(String nonce, String payload, String secret, String timestamp) {
         return DigestUtils.sha1Hex(nonce + ":" + payload + ":" + secret + ":" + timestamp);
@@ -137,14 +178,13 @@
     }
 
     public static void main(String[] args) {
-        String url = "https://api.jiandaoyun.com/api/v1/automation/tenant/6909b792324dc197821895d1/hooks/6909d0fbdb93690b128a0d56b068192dc4a9c9722dbac428";
-//        String url = "https://api.jiandaoyun.com/api/v1/automation/tenant/6909b792324dc197821895d1/hooks/6909d0fbdb93690af97e41d1b068192dc4a9705aca3321e2";
+        String url = "https://lcdp.ahyc.com.cn:30443/api/v1/automation/tenant/6756636b8ff4da34799c9f92/hooks/69042b5d6d7269265c7732a41a461aec9135f0641f0156dc";
         JSONObject object = new JSONObject();
         object.put("create_date","20251104160000");
-        object.put("start_date",System.currentTimeMillis() );
-        object.put("end_date", System.currentTimeMillis() + 24*3600*1000);
-        object.put("id","10000020251105");
-        object.put("type",1);
+        object.put("start_date","20251104160000" );
+        object.put("end_date", "20251204160000");
+        object.put("id","202511260016");//
+        object.put("type",1);//0=棰嗙敤锛�1=褰掕繕
         String result = HttpsUtil.postJson(url,JSONObject.toJSONString(object));
         System.out.println(result);
     }

--
Gitblit v1.9.3