From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/investigate/Investigate.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/investigate/Investigate.java b/src/main/java/org/springblade/modules/investigate/Investigate.java
index ad3a4a4..baeb84a 100644
--- a/src/main/java/org/springblade/modules/investigate/Investigate.java
+++ b/src/main/java/org/springblade/modules/investigate/Investigate.java
@@ -5,11 +5,19 @@
import org.json.JSONArray;
import org.json.JSONObject;
import org.springblade.common.utils.InvestigateUtil;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+import org.springframework.retry.backoff.Sleeper;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
/**
* @author zhongrj
@@ -19,6 +27,8 @@
@RestController
@AllArgsConstructor
public class Investigate {
+
+ private final IUserService userService;
/**
*
@@ -31,6 +41,46 @@
return InvestigateUtil.httpGet(idCardNo);
}
+
+
+
+
+ /**
+ *
+ * @param idCardNo 身份证号码
+ * @return
+ */
+ @GetMapping("/investigate/byUser")
+ public R investigateByUser(){
+ //查询用户数据,未删除的
+ List<User> users = userService.getAllUserList();
+ //遍历
+ users.forEach(InvestigateUtil.consumerWithIndex((user,index) ->{
+ if (index==99){
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+ String body = InvestigateUtil.httpGet(user.getCardid());
+ JSONObject jsonObject = new JSONObject(body);
+ Object data = jsonObject.get("data");
+ JSONObject jsonData = new JSONObject(data.toString());
+ JSONArray res = jsonData.getJSONArray("res");
+ if (res.length()==0){
+ //没有数据正常
+ user.setExaminationType("0");
+ }else {
+ user.setExaminationType("1");
+ user.setExaminationMx(res.getJSONObject(0).get("zdxsfzqkry").toString());
+ }
+ //更新用户数据
+ userService.updateById(user);
+ }));
+ return R.data(users.size());
+ }
+
/**
* 数据反向测试
* @param body 数据反向测试
@@ -38,16 +88,10 @@
*/
@PostMapping("/investigate/testBody")
public String testBody(@RequestBody String body){
- System.out.println("body = " + body);
JSONObject jsonObject = new JSONObject(body);
Object data = jsonObject.get("data");
- System.out.println("data = " + data.toString());
JSONObject jsonData = new JSONObject(data.toString());
- Object res = jsonData.get("res");
- System.out.println("res = " + res);
JSONArray jsonArray = jsonData.getJSONArray("res");
- System.out.println("jsonArray = " + jsonArray);
- System.out.println("jsonArray.length() = " + jsonArray.length());
if (jsonArray.length()>0){
String zdxsfzqkry = jsonArray.getJSONObject(0).get("zdxsfzqkry").toString();
return zdxsfzqkry;
--
Gitblit v1.9.3