From 73b403d969d248f30b160c82ea9edeb9d94d815e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 11:45:08 +0800
Subject: [PATCH] 新增用户审查接口
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 5 ++
src/main/java/org/springblade/modules/investigate/Investigate.java | 50 +++++++++++++++++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 9 ++++
src/main/java/org/springblade/common/utils/InvestigateUtil.java | 16 ++++++++
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 6 +++
src/main/java/org/springblade/modules/system/service/IUserService.java | 6 +++
6 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/common/utils/InvestigateUtil.java b/src/main/java/org/springblade/common/utils/InvestigateUtil.java
index 22d1a06..2c66657 100644
--- a/src/main/java/org/springblade/common/utils/InvestigateUtil.java
+++ b/src/main/java/org/springblade/common/utils/InvestigateUtil.java
@@ -4,6 +4,9 @@
import okhttp3.Request;
import okhttp3.Response;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
/**
* @author zhongrj
* @date 2021-08-12
@@ -25,4 +28,17 @@
}
return null;
}
+
+
+ // 工具方法
+ public static <T> Consumer<T> consumerWithIndex(BiConsumer<T, Integer> consumer) {
+ class Obj {
+ int i;
+ }
+ Obj obj = new Obj();
+ return t -> {
+ int index = obj.i++;
+ consumer.accept(t, index);
+ };
+ }
}
diff --git a/src/main/java/org/springblade/modules/investigate/Investigate.java b/src/main/java/org/springblade/modules/investigate/Investigate.java
index eaf6a4d..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
@@ -20,6 +28,8 @@
@AllArgsConstructor
public class Investigate {
+ private final IUserService userService;
+
/**
*
* @param idCardNo 身份证号码
@@ -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 数据反向测试
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 43fc080..1b35d08 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -67,4 +67,10 @@
* 自定义用户列表(只有保安员)
*/
List<User> selectUserPageSecurity(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+
+ /**
+ * 查询所有未注销用户
+ * @return
+ */
+ List<User> getAllUserList();
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 2083156..897fd9f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -176,4 +176,9 @@
update blade_user set hold=#{hold} where cardid=#{cardid}
</update>
+ <!--查询所有未注销用户-->
+ <select id="getAllUserList" resultType="org.springblade.modules.system.entity.User">
+ select id,cardid from blade_user where is_deleted = 0
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index ddea1a7..9f9251d 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -212,4 +212,10 @@
* 自定义用户列表(只有保安员)
*/
IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s);
+
+ /**
+ * 查询所有未注销用户
+ * @return
+ */
+ List<User> getAllUserList();
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index e383d75..3e6cdb8 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -436,4 +436,13 @@
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
}
+
+ /**
+ * 查询所有未注销用户
+ * @return
+ */
+ @Override
+ public List<User> getAllUserList() {
+ return baseMapper.getAllUserList();
+ }
}
--
Gitblit v1.9.3