Merge remote-tracking branch 'origin/master'

zhangzeli

2021-11-09 fe2b2e037a91fbc22bd887174d37c7dd229333d3

 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);
        }