From d81c370381c56875c1f44ee7945effb63a8a1a33 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:39:57 +0800
Subject: [PATCH] 保安列表修改
---
src/main/java/org/springblade/modules/investigate/Investigate.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/investigate/Investigate.java b/src/main/java/org/springblade/modules/investigate/Investigate.java
index 32389aa..52644be 100644
--- a/src/main/java/org/springblade/modules/investigate/Investigate.java
+++ b/src/main/java/org/springblade/modules/investigate/Investigate.java
@@ -45,14 +45,49 @@
+// /**
+// *
+// * @return
+// */
+// @GetMapping("/investigate/byUser")
+// public R investigateByUser(){
+// //查询用户数据,未删除的
+// List<User> users = userService.getAllUserList();
+// //遍历
+// users.forEach(InvestigateUtil.consumerWithIndex((user,index) ->{
+// if (index==80){
+// try {
+// Thread.sleep(500);
+// } 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());
+// }
+
/**
*
* @return
*/
@GetMapping("/investigate/byUser")
public R investigateByUser(){
- //查询用户数据,未删除的
- List<User> users = userService.getAllUserList();
+ //查询用户数据,未删除的,未审核的
+ List<User> users = userService.getNotAuditAllUserList();
//遍历
users.forEach(InvestigateUtil.consumerWithIndex((user,index) ->{
if (index==80){
@@ -72,7 +107,15 @@
user.setExaminationType("0");
}else {
user.setExaminationType("1");
- user.setExaminationMx(res.getJSONObject(0).get("zdxsfzqkry").toString());
+ for (int i = 0; i < res.length(); i++) {
+ if(res.getJSONObject(i).get("zdxsfzqkry").toString()!=null
+ && res.getJSONObject(i).get("zdxsfzqkry").toString()!=""){
+ user.setExaminationMx(res.getJSONObject(i).get("zdxsfzqkry").toString());
+ //更新用户数据
+ userService.updateById(user);
+ break;
+ }
+ }
}
//更新用户数据
userService.updateById(user);
--
Gitblit v1.9.3