From 74d7aed668f67adea64ba507373b58b86fffd100 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期一, 08 十一月 2021 08:41:05 +0800
Subject: [PATCH] 用户表，片区表
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
index 53b8cec..d9f2fea 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
@@ -1,9 +1,15 @@
package cn.exrick.xboot.your.controller;
+import cn.exrick.xboot.core.common.constant.SettingConstant;
+import cn.exrick.xboot.core.common.utils.CommonUtil;
import cn.exrick.xboot.core.common.utils.PageUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.core.entity.Setting;
+import cn.exrick.xboot.core.entity.User;
+import cn.exrick.xboot.core.service.SettingService;
+import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.Fingerprint;
import cn.exrick.xboot.your.service.IFingerprintService;
import cn.hutool.core.util.StrUtil;
@@ -15,7 +21,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import java.io.InputStream;
import java.util.List;
/**
@@ -31,6 +40,9 @@
@Autowired
private IFingerprintService iFingerprintService;
+ @Autowired
+ private UserService userService;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<Fingerprint> get(@PathVariable String id) {
@@ -42,9 +54,19 @@
@RequestMapping(value = "/getAll", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
public Result<List<Fingerprint>> getAll() {
-
- List<Fingerprint> list = iFingerprintService.list();
+ QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
+ wrapper.isNotNull("user_id");
+ List<Fingerprint> list = iFingerprintService.list(wrapper);
return new ResultUtil<List<Fingerprint>>().setData(list);
+ }
+
+ @RequestMapping(value = "/getCount", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鎸囩汗鏁�")
+ public Result<Integer> getCount() {
+ QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
+ wrapper.isNotNull("user_id");
+ int a = iFingerprintService.count(wrapper);
+ return new ResultUtil<Integer>().setData(a);
}
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@@ -58,7 +80,11 @@
@RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) {
-
+ if(StrUtil.isNotEmpty(fingerprint.getUserId())){
+ User user = userService.get(fingerprint.getUserId());
+ fingerprint.setUsername(user.getUsername());
+ fingerprint.setPassword(user.getDescription());
+ }
if (iFingerprintService.saveOrUpdate(fingerprint)) {
return new ResultUtil<Fingerprint>().setData(fingerprint);
}
--
Gitblit v1.9.1