From 9c1840e4302d8c4f7af549e5de412488073490bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 11 一月 2022 11:23:05 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 83 +++++++++++++++++++++++++++++++++++++----
1 files changed, 74 insertions(+), 9 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 d9f2fea..0bbfb16 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,16 +1,16 @@
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.Customer;
+import cn.exrick.xboot.your.entity.CustomerReceive;
import cn.exrick.xboot.your.entity.Fingerprint;
+import cn.exrick.xboot.your.service.ICustomerReceiveService;
+import cn.exrick.xboot.your.service.ICustomerService;
import cn.exrick.xboot.your.service.IFingerprintService;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,10 +21,6 @@
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;
/**
@@ -43,6 +39,12 @@
@Autowired
private UserService userService;
+ @Autowired
+ private ICustomerReceiveService iCustomerReceiveService;
+
+ @Autowired
+ private ICustomerService iCustomerService;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<Fingerprint> get(@PathVariable String id) {
@@ -52,10 +54,19 @@
}
@RequestMapping(value = "/getAll", method = RequestMethod.GET)
- @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鍙告満鍜岄厤閫佸憳鎸囩汗鏁版嵁")
public Result<List<Fingerprint>> getAll() {
QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
wrapper.isNotNull("user_id");
+ List<Fingerprint> list = iFingerprintService.list(wrapper);
+ return new ResultUtil<List<Fingerprint>>().setData(list);
+ }
+
+ @RequestMapping(value = "/getAllByAreaId", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鐗囧尯鍐呮寚绾规暟鎹�")
+ public Result<List<Fingerprint>> getAllByAreaId(String areaId) {
+ QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
+ wrapper.eq("area_id",areaId);
List<Fingerprint> list = iFingerprintService.list(wrapper);
return new ResultUtil<List<Fingerprint>>().setData(list);
}
@@ -77,6 +88,48 @@
return new ResultUtil<IPage<Fingerprint>>().setData(data);
}
+ @RequestMapping(value = "/getUserByCode", method = RequestMethod.GET)
+ @ApiOperation(value = "鐢ㄦ寚绾圭紪鍙峰徃鏈烘垨閰嶉�佸憳鐨勭櫥褰曞悕鍜屽瘑鐮�")
+ public Result<Object> getUserByCode(String code) {
+ QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
+ wrapper.eq("code",code);
+ wrapper.isNotNull("user_id");
+ Fingerprint one = iFingerprintService.getOne(wrapper);
+ return new ResultUtil<Object>().setData(one);
+ }
+
+ @RequestMapping(value = "/getCustomerByCode", method = RequestMethod.GET)
+ @ApiOperation(value = "鐢ㄦ寚绾圭紪鍙峰拰鍟嗘埛id鑾峰彇鎺ヨ揣浜轰俊鎭�")
+ public Result<Object> getCustomerByCode(String code,String customerId) {
+ Customer c = iCustomerService.getById(customerId);
+ QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
+ wrapper.eq("code",code);
+ wrapper.eq("area_id",c.getAreaId());
+ wrapper.eq("customer_id",customerId);
+ Fingerprint one = iFingerprintService.getOne(wrapper);
+ if(one==null){
+ return ResultUtil.error("鎸囩汗涓庡晢鎴蜂笉鍖归厤");
+ }
+
+ CustomerReceive customerReceive = iCustomerReceiveService.getById(one.getCustomerReceiveId());
+ return new ResultUtil<Object>().setData(customerReceive);
+ }
+
+ @RequestMapping(value = "/getCode2", method = RequestMethod.GET)
+ @ApiOperation(value = "鏍规嵁鍟嗘埛id鑾峰彇鎺ヨ揣浜虹紪鍙�")
+ public Result<Object> getCode2(String customerId) {
+ Customer c = iCustomerService.getById(customerId);
+ int code = iFingerprintService.maxCode2(c.getAreaId());
+ return new ResultUtil<Object>().setData(code);
+ }
+
+ @RequestMapping(value = "/getCode", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍙告満鎴栭厤閫佸憳鎸囩汗缂栧彿")
+ public Result<Object> getCode() {
+ int code = iFingerprintService.maxCode();
+ return new ResultUtil<Object>().setData(code);
+ }
+
@RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
@ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
public Result<Fingerprint> saveOrUpdate(Fingerprint fingerprint) {
@@ -84,6 +137,17 @@
User user = userService.get(fingerprint.getUserId());
fingerprint.setUsername(user.getUsername());
fingerprint.setPassword(user.getDescription());
+ fingerprint.setType(user.getType2());
+ }
+ if(StrUtil.isNotEmpty(fingerprint.getCustomerId())){
+ Customer byId = iCustomerService.getById(fingerprint.getCustomerId());
+ fingerprint.setAreaId(byId.getAreaId());
+ }
+
+ if(StrUtil.isNotEmpty(fingerprint.getCustomerReceiveId())){
+ CustomerReceive byId = iCustomerReceiveService.getById(fingerprint.getCustomerReceiveId());
+ byId.setFstatus(1);
+ iCustomerReceiveService.saveOrUpdate(byId);
}
if (iFingerprintService.saveOrUpdate(fingerprint)) {
return new ResultUtil<Fingerprint>().setData(fingerprint);
@@ -91,6 +155,7 @@
return new ResultUtil<Fingerprint>().setErrorMsg("鎿嶄綔澶辫触");
}
+
@RequestMapping(value = "/delByIds", method = RequestMethod.POST)
@ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
public Result<Object> delAllByIds(@RequestParam String[] ids) {
--
Gitblit v1.9.1