From 66fe25d4e30f0d7b85a5408570d187a28cd714b6 Mon Sep 17 00:00:00 2001 From: 18123374652 <2265829957@qq.com> Date: Wed, 13 Mar 2024 14:21:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9VIN=E5=85=85=E7=94=B5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XhpcAppUserController.java | 33 +++++++++++++++---- .../user/mapper/XhpcUserVehicleMapper.java | 8 +++++ .../user/service/IXhpcUserVehicleService.java | 6 ++++ .../impl/XhpcUserVehicleServiceImpl.java | 26 +++++++++++++-- .../resources/mapper/XhpcCommonMapper.xml | 12 +++---- .../mapper/XhpcUserVehicleMapper.xml | 18 +++++++++- 6 files changed, 86 insertions(+), 17 deletions(-) diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java index 5e364c0d..0b418c29 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -612,8 +612,8 @@ public class XhpcAppUserController extends BaseController { //小程序用户车牌列表 @ApiOperation("小程序用户车牌列表") @GetMapping("/getUserVehicleList") - public TableDataInfo getUserVehicleList(HttpServletRequest request,Long userId,Integer source) { - List> list = xhpcUserVehicleService.getUserVehicleList(request,userId,source); + public TableDataInfo getUserVehicleList(HttpServletRequest request,Long appUserId,Integer source) { + List> list = xhpcUserVehicleService.getUserVehicleList(request,appUserId,source); return getDataTable(list); } @@ -624,7 +624,7 @@ public class XhpcAppUserController extends BaseController { //同一个用户一天只有10次机会 Integer number = redisService.getCacheObject("vehicle:userId:"+appUserId+source); - if(number>10){ + if(number !=null && number>10){ return R.fail("今天开通VIN码自动识别已达到上线,请手动输入车牌号和VIN开通"); } com.aliyun.ocr20191230.Client client = createClient(accessKeyId, accessKeySecret); @@ -660,14 +660,17 @@ public class XhpcAppUserController extends BaseController { map.put("vehicleName",faceResult.getPlateNumber()); map.put("vehicleId",xhpcUserVehicle.getVehicleId()); - redisService.setCacheObject("vehicle:userId:"+appUserId+source,number+1); - + if(number==null){ + redisService.setCacheObject("vehicle:userId:"+appUserId+source,1); + }else{ + redisService.setCacheObject("vehicle:userId:"+appUserId+source,number+1); + } return R.ok(map); }else{ return R.fail("请重新上传行驶证"); } }catch (Exception e){ - + e.printStackTrace(); } return R.fail("请重新上传行驶证"); } @@ -694,5 +697,23 @@ public class XhpcAppUserController extends BaseController { } + @ApiOperation("删除VIN或者车牌接口") + @PostMapping("/deleteUserVehicleById") + public R deleteUserVehicleById(@RequestBody XhpcUserVehicle xhpcUserVehicle){ + return xhpcUserVehicleService.deleteUserVehicleById(xhpcUserVehicle.getVehicleId()); + } + + + @ApiOperation("默认车辆") + @PostMapping("/defaultUserVehicle") + public R defaultUserVehicle(@RequestBody XhpcUserVehicle xhpcUserVehicle){ + return xhpcUserVehicleService.defaultUserVehicle(xhpcUserVehicle.getVehicleId(),xhpcUserVehicle.getAppUserId(),xhpcUserVehicle.getSource()); + } + + @ApiOperation("开通VIN码") + @PostMapping("/enlightenedUserVehicle") + public R enlightenedUserVehicle(@RequestBody XhpcUserVehicle xhpcUserVehicle){ + return xhpcUserVehicleService.enlightenedUserVehicle(xhpcUserVehicle.getVehicleId(),xhpcUserVehicle.getAppUserId(),xhpcUserVehicle.getSource(),xhpcUserVehicle.getStatus()); + } } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserVehicleMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserVehicleMapper.java index ba667ee1..63927459 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserVehicleMapper.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserVehicleMapper.java @@ -29,4 +29,12 @@ public interface XhpcUserVehicleMapper { //查询黑名单 int getVinBlacklist(@Param("vinSpecCode") String vinSpecCode); + + int deleteUserVehicleById(@Param("vehicleId")Long vehicleId); + + int defaultUserVehicle(@Param("vehicleId")Long vehicleId); + + int defaultUserVehicleList(@Param("vehicleId")Long vehicleId,@Param("userId") Long userId,@Param("source") Integer source); + + int enlightenedUserVehicle(@Param("vehicleId")Long vehicleId,@Param("status") Integer status); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserVehicleService.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserVehicleService.java index be39ade7..d3834d60 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserVehicleService.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/IXhpcUserVehicleService.java @@ -20,4 +20,10 @@ public interface IXhpcUserVehicleService { List> getUserVehicleList(HttpServletRequest request,Long userId,Integer source); R getXhpcUserVehicleMessage(Long userId,Integer source); + + R deleteUserVehicleById(Long vehicleId); + + R defaultUserVehicle(Long vehicleId,Long appUserId,Integer source); + + R enlightenedUserVehicle(Long vehicleId,Long appUserId,Integer source,Integer stauts); } diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserVehicleServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserVehicleServiceImpl.java index 67179d4c..e0668e5f 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserVehicleServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserVehicleServiceImpl.java @@ -84,9 +84,9 @@ public class XhpcUserVehicleServiceImpl extends BaseService implements IXhpcUser @Override public List> getUserVehicleList(HttpServletRequest request,Long userId,Integer source) { //获取登陆用户 - LoginUser loginUser = tokenService.getLoginUser(request); - String tenantId = loginUser.getTenantId(); - List> list = xhpcUserVehicleMapper.getUserVehicleList(userId,source,tenantId); +// LoginUser loginUser = tokenService.getLoginUser(request); +// String tenantId = loginUser.getTenantId(); + List> list = xhpcUserVehicleMapper.getUserVehicleList(userId,source,""); return list; } @@ -98,4 +98,24 @@ public class XhpcUserVehicleServiceImpl extends BaseService implements IXhpcUser } return R.ok(map); } + + @Override + public R deleteUserVehicleById(Long vehicleId) { + xhpcUserVehicleMapper.deleteUserVehicleById(vehicleId); + return R.ok(); + } + + @Override + public R defaultUserVehicle(Long vehicleId, Long appUserId, Integer source) { + + xhpcUserVehicleMapper.defaultUserVehicleList(vehicleId,appUserId,source); + xhpcUserVehicleMapper.defaultUserVehicle(vehicleId); + return R.ok(); + } + + @Override + public R enlightenedUserVehicle(Long vehicleId, Long appUserId, Integer source,Integer stauts) { + xhpcUserVehicleMapper.enlightenedUserVehicle(vehicleId,stauts); + return R.ok(); + } } diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml index 596ff88b..9b5e2751 100644 --- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml +++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml @@ -28,11 +28,10 @@ xau.tenant_id tenantId, xau.soc_protect socProtect, ten.status tenantStatus, - xuv.vehicle_name as vehicleName, + (select vehicle_name as vehicleName from xhpc_user_vehicle where app_user_id = xau.app_user_id and source=0 and del_flag=0 and vin_blacklist !=1 order by type,create_time desc LIMIT 1) as vehicleName, xau.create_time as createTime from xhpc_app_user xau left join xhpc_tenant ten on ten.tenant_id = xau.tenant_id and ten.is_deleted =0 - left join xhpc_user_vehicle xuv on xuv.app_user_id = xau.app_user_id and xuv.source=0 and xuv.del_flag=0 where xau.del_flag=0 and xau.phone =#{phone} @@ -43,6 +42,7 @@ and xau.tenant_id =#{tenantId} + @@ -183,4 +183,20 @@ + + + update xhpc_user_vehicle set del_flag =1 where vehicle_id =#{vehicleId} + + + + update xhpc_user_vehicle set type =1 where vehicle_id =#{vehicleId} + + + + update xhpc_user_vehicle set type =0 where vehicle_id !=#{vehicleId} and source =#{source} and app_user_id =#{userId} + + + + update xhpc_user_vehicle set status =#{status} where vehicle_id =#{vehicleId} +