From ae32c3a7d77e2ed114555623c70e3fbd1d6aba59 Mon Sep 17 00:00:00 2001
From: wang-hao-jie <1550036656@qq.com>
Date: 星期四, 10 三月 2022 08:47:45 +0800
Subject: [PATCH] 违章记录
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 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 0bbfb16..d8b960e 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
@@ -2,16 +2,13 @@
import cn.exrick.xboot.core.common.utils.PageUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.utils.SecurityUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
import cn.exrick.xboot.core.entity.User;
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.exrick.xboot.your.entity.*;
+import cn.exrick.xboot.your.service.*;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -45,6 +42,15 @@
@Autowired
private ICustomerService iCustomerService;
+ @Autowired
+ private IAreaService iAreaService;
+
+ @Autowired
+ private ICarService iCarService;
+
+ @Autowired
+ private SecurityUtil securityUtil;
+
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@ApiOperation(value = "閫氳繃id鑾峰彇")
public Result<Fingerprint> get(@PathVariable String id) {
@@ -64,11 +70,32 @@
@RequestMapping(value = "/getAllByAreaId", method = RequestMethod.GET)
@ApiOperation(value = "鑾峰彇鍏ㄩ儴鐗囧尯鍐呮寚绾规暟鎹�")
- public Result<List<Fingerprint>> getAllByAreaId(String areaId) {
+ public Result<List<Fingerprint>> getAllByAreaId() {
+ Area area = getArea(securityUtil.getCurrUser().getId());
+ if(area==null){
+ return ResultUtil.error("璇ョ敤鎴疯繕鏈粦瀹氱墖鍖�");
+ }
QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
- wrapper.eq("area_id",areaId);
+ wrapper.eq("area_id",area.getId());
List<Fingerprint> list = iFingerprintService.list(wrapper);
return new ResultUtil<List<Fingerprint>>().setData(list);
+ }
+
+ public Area getArea(String userId){
+ QueryWrapper<Area> wrapper = new QueryWrapper<Area>();
+ wrapper.eq("user_id",userId);
+ Area area = iAreaService.getOne(wrapper);
+ if(area==null){
+ QueryWrapper<Car> carQueryWrapper = new QueryWrapper<Car>();
+ carQueryWrapper.eq("user_id",userId);
+ Car one = iCarService.getOne(carQueryWrapper);
+
+ QueryWrapper<Area> wrapper3 = new QueryWrapper<Area>();
+ wrapper3.eq("user_id",one.getFollowUserId());
+ area = iAreaService.getOne(wrapper3);
+ return area;
+ }
+ return area;
}
@RequestMapping(value = "/getCount", method = RequestMethod.GET)
@@ -95,6 +122,10 @@
wrapper.eq("code",code);
wrapper.isNotNull("user_id");
Fingerprint one = iFingerprintService.getOne(wrapper);
+ User byUsername = userService.findByUsername(one.getUsername());
+ if(byUsername==null){
+ return ResultUtil.error("鐢ㄦ埛宸插垹闄�");
+ }
return new ResultUtil<Object>().setData(one);
}
@@ -108,6 +139,15 @@
wrapper.eq("customer_id",customerId);
Fingerprint one = iFingerprintService.getOne(wrapper);
if(one==null){
+
+ QueryWrapper<Fingerprint> wrapper2 = new QueryWrapper<>();
+ wrapper2.eq("code",code);
+ wrapper2.eq("area_id",c.getAreaId());
+ Fingerprint one2 = iFingerprintService.getOne(wrapper2);
+ if(one2!=null){
+ c.setLikeCusotmerId(one2.getCustomerId());
+ iCustomerService.saveOrUpdate(c);
+ }
return ResultUtil.error("鎸囩汗涓庡晢鎴蜂笉鍖归厤");
}
--
Gitblit v1.9.1