From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序
---
src/main/java/org/springblade/modules/investigate/Investigate.java | 211 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 174 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/springblade/modules/investigate/Investigate.java b/src/main/java/org/springblade/modules/investigate/Investigate.java
index baeb84a..5723ded 100644
--- a/src/main/java/org/springblade/modules/investigate/Investigate.java
+++ b/src/main/java/org/springblade/modules/investigate/Investigate.java
@@ -10,10 +10,7 @@
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 org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.function.BiConsumer;
@@ -31,52 +28,149 @@
private final IUserService userService;
/**
- *
+ * 单个人员审查
* @param idCardNo 身份证号码
* @return
*/
@GetMapping("/investigate")
- public String getInvestigate(String idCardNo){
- System.out.println("idCardNo = " + idCardNo);
- return InvestigateUtil.httpGet(idCardNo);
+ public String getInvestigate(String idCardNo,
+ @RequestParam(defaultValue = "1")Integer pageNum,
+ @RequestParam(defaultValue = "10")Integer pageSize){
+ return InvestigateUtil.httpGetOne(idCardNo);
+ }
+
+ /**
+ * 枪支定位
+ * @param idCardNo 护卫员身份证号
+ * @param deptName 所在单位名称
+ * @param startTime 定位开始时间
+ * @param endTime 定位结束时间
+ */
+ @GetMapping("/investigate/gun")
+ public String getInvestigateGun(String idCardNo,
+ String deptName,
+ String startTime,
+ String endTime,
+ @RequestParam(defaultValue = "1")Integer pageNum,
+ @RequestParam(defaultValue = "10")Integer pageSize){
+ return InvestigateUtil.httpGetGunPosition(idCardNo,deptName,startTime,endTime,pageNum,pageSize);
}
+// /**
+// *
+// * @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());
+// }
/**
- *
- * @param idCardNo 身份证号码
+ * 人员审查
* @return
*/
@GetMapping("/investigate/byUser")
- public R investigateByUser(){
- //查询用户数据,未删除的
- List<User> users = userService.getAllUserList();
+ public R investigateByUser(@RequestParam(defaultValue = "1") Integer pageNum,
+ @RequestParam(defaultValue = "1000")Integer pageSize){
+ //查询用户数据,未删除的,未审核的
+ List<User> users = userService.getNotAuditAllUserList();
//遍历
users.forEach(InvestigateUtil.consumerWithIndex((user,index) ->{
- if (index==99){
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- e.printStackTrace();
+ if (null!=user.getCardid() && user.getCardid()!="") {
+ if (index == 1000) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
+ String body = InvestigateUtil.httpGetOne(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 {
+ int count = 0;
+ user.setExaminationType("1");
+ for (int i = 0; i < res.length(); i++) {
+ if (res.getJSONObject(i).get("zdrylbjh").toString() != null
+ && res.getJSONObject(i).get("zdrylbjh").toString() != ""
+ && res.getJSONObject(i).get("zdrylbjh").toString() != "null"
+ ) {
+ user.setExaminationMx(res.getJSONObject(i).get("zdrylbjh").toString());
+ //更新用户数据
+ userService.updateById(user);
+ break;
+ }
+ if (res.getJSONObject(i).get("zdryxlmc").toString() != null
+ && res.getJSONObject(i).get("zdryxlmc").toString() != ""
+ && res.getJSONObject(i).get("zdryxlmc").toString() != "null"
+ ) {
+ user.setExaminationMx(res.getJSONObject(i).get("zdryxlmc").toString());
+ //更新用户数据
+ userService.updateById(user);
+ break;
+ }
+ if (res.getJSONObject(i).get("ztrylx").toString() != null
+ && res.getJSONObject(i).get("ztrylx").toString() != ""
+ && res.getJSONObject(i).get("ztrylx").toString() != "null"
+ ) {
+ user.setExaminationMx(res.getJSONObject(i).get("ztrylx").toString());
+ //更新用户数据
+ userService.updateById(user);
+ break;
+ }
+// if (res.getJSONObject(i).get("ajlbmc").toString() != null
+// && res.getJSONObject(i).get("ajlbmc").toString() != "") {
+// user.setExaminationMx(res.getJSONObject(i).get("ajlbmc").toString());
+// //更新用户数据
+// userService.updateById(user);
+// break;
+// }
+ count++;
+ //条件中的数据都为空，则审查为正常
+ if (count==res.length()){
+ //更新用户数据,设为正常
+ user.setExaminationType("0");
+ userService.updateById(user);
+ }
+ }
+ }
+ //更新用户数据
+ userService.updateById(user);
}
- 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());
}
@@ -87,14 +181,57 @@
* @return
*/
@PostMapping("/investigate/testBody")
- public String testBody(@RequestBody String body){
+ public R testBody(@RequestBody String body){
JSONObject jsonObject = new JSONObject(body);
Object data = jsonObject.get("data");
JSONObject jsonData = new JSONObject(data.toString());
- JSONArray jsonArray = jsonData.getJSONArray("res");
- if (jsonArray.length()>0){
- String zdxsfzqkry = jsonArray.getJSONObject(0).get("zdxsfzqkry").toString();
- return zdxsfzqkry;
+ JSONArray res = jsonData.getJSONArray("res");
+ User user = new User();
+ if (res.length()>0){
+// String zdxsfzqkry = res.getJSONObject(0).get("zdxsfzqkry").toString();
+ int count = 0;
+ for (int i = 0; i < res.length(); i++) {
+ System.out.println("res.length() =" + res.length());
+ if (res.getJSONObject(i).get("zdrylbjh").toString() != null
+ && res.getJSONObject(i).get("zdrylbjh").toString() != ""
+ && res.getJSONObject(i).get("zdrylbjh").toString() != "null"
+ ) {
+ user.setExaminationMx(res.getJSONObject(i).get("zdrylbjh").toString());
+ //更新用户数据
+ userService.updateById(user);
+ break;
+ }
+ if (res.getJSONObject(i).get("zdryxlmc").toString() != null
+ && res.getJSONObject(i).get("zdryxlmc").toString() != ""
+ && res.getJSONObject(i).get("zdryxlmc").toString() != "null"
+ ) {
+ user.setExaminationMx(res.getJSONObject(i).get("zdryxlmc").toString());
+ //更新用户数据
+ userService.updateById(user);
+ break;
+ }
+ if (res.getJSONObject(i).get("ztrylx").toString() != null
+ && res.getJSONObject(i).get("ztrylx").toString() != ""
+ && res.getJSONObject(i).get("ztrylx").toString() != "null"
+ ) {
+ user.setExaminationMx(res.getJSONObject(i).get("ztrylx").toString());
+ //更新用户数据
+ userService.updateById(user);
+ break;
+ }
+ count++;
+ System.out.println("count = " + count);
+// if (res.getJSONObject(i).get("ajlbmc").toString() != null
+// && res.getJSONObject(i).get("ajlbmc").toString() != ""
+// && res.getJSONObject(i).get("ajlbmc").toString() != "null"
+// ) {
+// user.setExaminationMx(res.getJSONObject(i).get("ajlbmc").toString());
+// //更新用户数据
+// userService.updateById(user);
+// break;
+// }
+ }
+ return R.data(user);
}
return null;
}
--
Gitblit v1.9.3