From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/web/TestController.java | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/web/TestController.java b/src/main/java/com/fzzy/web/TestController.java
index 9d3d200..29aed63 100644
--- a/src/main/java/com/fzzy/web/TestController.java
+++ b/src/main/java/com/fzzy/web/TestController.java
@@ -1,13 +1,14 @@
package com.fzzy.web;
+
+import com.alibaba.fastjson2.JSONObject;
import com.bstek.dorado.util.DateUtils;
import com.fzzy.api.data.ApiParam;
import com.fzzy.async.fzzy30.Fzzy30SyncService12;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
/**
* @author vince.xu
@@ -22,23 +23,89 @@
public class TestController {
@Autowired
private Fzzy30SyncService12 fzzySyncService12;
+
/**
*
*/
@RequestMapping(value = "test", method = RequestMethod.GET)
- public String test(@RequestParam(name = "kqdm")String kqdm, @RequestParam(name = "deptId")String deptId, @RequestParam(name = "start")String start,@RequestParam(name = "end") String end) {
+ public String test(@RequestParam(name = "kqdm") String kqdm, @RequestParam(name = "deptId") String deptId, @RequestParam(name = "start") String start, @RequestParam(name = "end") String end) {
try {
ApiParam apiParam = new ApiParam();
apiParam.setKqdm(kqdm);
apiParam.setDeptId(deptId);
- apiParam.setStart(DateUtils.parse("yyyy-MM-dd HH:mm:ss",start));
- apiParam.setEnd(DateUtils.parse("yyyy-MM-dd HH:mm:ss",end));
+ apiParam.setStart(DateUtils.parse("yyyy-MM-dd HH:mm:ss", start));
+ apiParam.setEnd(DateUtils.parse("yyyy-MM-dd HH:mm:ss", end));
fzzySyncService12.syncData(apiParam);
} catch (Exception e) {
- log.error(e.getMessage(),e);
+ log.error(e.getMessage(), e);
e.printStackTrace();
}
return "";
}
+
+
+ /**
+ * 娴嬭瘯璇诲彇韬唤璇�
+ *
+ * @return
+ */
+ @RequestMapping("/test/IDCARD")
+ public @ResponseBody
+ JSONObject testIdCard(@RequestParam(value = "callback", required = false) String callback,
+ @RequestParam(value = "waitTime", required = false) int waitTime) {
+
+ log.debug("============testIdCard==========={}", callback);
+
+
+ JSONObject json = new JSONObject();
+ json.put("cnName", "椋庢鑷磋繙");
+ json.put("idNum", "100000000000000001");
+ json.put("address", "閮戝窞甯傞珮鏂板尯鍥藉澶у绉戞妧鍥�1鍙锋ゼ502");
+
+ // return "fnCallback" + "(" + json.toJSONString() + ")";
+
+ return json;
+ }
+
+
+ /**
+ * 娴嬭瘯璇诲彇韬唤璇�
+ * JSONP娴嬭瘯
+ *
+ * @return
+ */
+ @RequestMapping("/test/IDCARD2")
+ public @ResponseBody
+ String testIdCard2(@RequestParam(value = "callback") String callback) {
+
+ log.debug("============testIdCard==========={}", callback);
+
+
+ JSONObject json = new JSONObject();
+
+ JSONObject result = new JSONObject();
+ result.put("idCardName", "TEST");
+ result.put("idCardNo", "100000000000000001");
+ result.put("idCardAddress", "閮戝窞甯傞珮鏂板尯鍥藉澶у绉戞妧鍥�1鍙锋ゼ502");
+ json.put("properties", result);
+
+
+ json.put("message", "鎴愬姛");
+ json.put("status", 0);
+ json.put("code", 200);
+ json.put("timestamp", System.currentTimeMillis());
+
+ return callback + "(" + json + ")";
+
+ }
+
+
+ @RequestMapping("/test/http")
+ public ModelAndView testHttp() {
+ ModelAndView view = new ModelAndView();
+ view.setViewName("test/demo");
+ return view;
+ }
+
}
--
Gitblit v1.9.3