From a2fb06f8f5f685d753780b3d5befc5417f15af3a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 10 Aug 2021 16:14:21 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 3032cb3..f53a9fe 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -80,11 +80,11 @@
static BASE64Encoder encoder = new BASE64Encoder();
- private final String sm4Key = "bf679652628841dc8f35f84989abf350";
+ private final String sm4Key = "cd888d57e21a4ffc9be7ed601ab3ccd6";
- private final String clientCode = "909BCF57904BDBD3E053AF0A020A3760";
+ private final String clientCode = "369947";
- private final String url = "http://eid.gongqing.gov.cn/uias-test/fca/verifyFace";
+ private final String url = "http://218.87.21.104:59944/uias/verifyFace";
@PostMapping("/faceCompare")
public R upload(@RequestParam("name")String name,@RequestParam("idCardNo")String idCardNo,@RequestParam("file") MultipartFile file){
@@ -204,6 +204,15 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+
+ if (user.getExamination_type() == null || user.getExamination_type().equals("")){
+ user.setExamination_type("0");
+ }
+
+ if (user.getExamination_mx() == null || user.getExamination_mx().equals("")){
+ user.setExamination_mx("正常");
+ }
+
return R.status(userService.submit(user));
}
@@ -216,11 +225,12 @@
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- if (user.getOnline_status() == null || user.getOnline_status().equals("")){
- user.setOnline_status("0");
+ if (user.getExamination_type() == null || user.getExamination_type().equals("")){
+ user.setExamination_type("0");
}
- if (user.getWork_status() == null || user.getWork_status().equals("")){
- user.setWork_status("0");
+
+ if (user.getExamination_mx() == null || user.getExamination_mx().equals("")){
+ user.setExamination_mx("正常");
}
return R.status(userService.updateUser(user));
@@ -433,6 +443,29 @@
return R.data(userService.selectUser());
}
+ /**
+ * 统计用户注册数据
+ * @return
+ */
+ @GetMapping("/getUserRegisterStatisticsData")
+ public R getUserRegisterStatisticsData() {
+ return R.data(userService.getUserRegisterStatisticsData());
+ }
+
+ /**
+ * 统计六大队伍
+ */
+ @GetMapping("/getUserTypeCount")
+ public R getUserTypeCount() {
+ return R.data(userService.getUserTypeCount());
+ }
+ /**
+ * 按行政区统计六大队伍
+ */
+ @GetMapping("/getUserDistrictTypeCount")
+ public R getUserDistrictTypeCount() {
+ return R.data(userService.getUserDistrictTypeCount());
+ }
}
--
Gitblit v1.9.3