From 2c19b1c16d392905e33e995e7c13faa598d5a867 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 05 Aug 2021 14:20:02 +0800
Subject: [PATCH] 巡逻任务问题修复
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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 296d19d..a6faf6f 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -87,7 +87,7 @@
private final String url = "http://eid.gongqing.gov.cn/uias-test/fca/verifyFace";
@PostMapping("/faceCompare")
- public R upload(String name,String idCardNo,MultipartFile file){
+ public R upload(@RequestParam("name")String name,@RequestParam("idCardNo")String idCardNo,@RequestParam("file") MultipartFile file){
Map<String, Object> resultData = new HashMap<>();
try {
String encode = encoder.encode(file.getBytes());
@@ -178,6 +178,23 @@
IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
return R.data(UserWrapper.build().pageVO(pages));
}
+
+ /**
+ * 自定义用户列表(带坐标)
+ */
+ @GetMapping("/pagetxl")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+ })
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "列表", notes = "传入account和realName")
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<IPage<UserVO>> pagetxl(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
+ IPage<User> pages = userService.selectUserPagetxl(Condition.getPage(query), user, deptId);
+ return R.data(UserWrapper.build().pageVO(pages));
+ }
+
/**
* 新增或修改
*/
@@ -187,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));
}
@@ -199,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));
@@ -366,7 +393,7 @@
@ApiOperationSupport(order = 17)
@ApiOperation(value = "查看平台详情", notes = "传入id")
@GetMapping("/platform-detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<UserVO> platformDetail(User user) {
return R.data(userService.platformDetail(user));
}
@@ -416,6 +443,15 @@
return R.data(userService.selectUser());
}
+ /**
+ * 统计用户注册数据
+ * @return
+ */
+ @GetMapping("/getUserRegisterStatisticsData")
+ public R getUserRegisterStatisticsData(){
+ return R.data(userService.getUserRegisterStatisticsData());
+ }
+
}
--
Gitblit v1.9.3