From c0206ad1c229b12ddf9be477f11f7f0dca799a86 Mon Sep 17 00:00:00 2001 From: glj Date: Mon, 24 Apr 2023 16:39:35 +0800 Subject: [PATCH] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kening/vordm/vo/UserVo.java | 5 +++ .../controller/DisasterInfoController.java | 5 ++- .../kening/vordm/mapper/GuestInfoMapper.java | 12 +++++- .../kening/vordm/mapper/GuestInfoMapper.xml | 42 +++++++++++++++++++ .../vordm/service/DisasterInfoService.java | 2 + .../service/impl/DisasterInfoServiceImpl.java | 18 ++++++++ 6 files changed, 81 insertions(+), 3 deletions(-) diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java index e7013f2..51ce028 100644 --- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java +++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/vo/UserVo.java @@ -89,4 +89,9 @@ public class UserVo { //国家 private String country; + + private Integer byUserStatisticsOne; + private Integer byUserStatisticsTwo; + private Integer byUserStatisticsThree; + private Integer byUserStatisticsFour; } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java index b8b7595..1dfb97b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/DisasterInfoController.java @@ -410,5 +410,8 @@ public class DisasterInfoController { return R.data(disasterInfoService.updateById(disasterInfo)); } - + @GetMapping("/getByUserDisasterInfoStatistics") + public R getByUserDisasterInfo(Long userId) { + return R.data(disasterInfoService.getByUserDisasterInfoStatistics(userId)); + } } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java index f1309af..c32cf69 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.java @@ -17,7 +17,15 @@ public interface GuestInfoMapper extends BaseMapper { UserVo getBladeUserByEmail(@Param("email") String email); - int updatePassword(String email, String password); + int updatePassword(@Param("email") String email,@Param("password") String password); - int updateAccount(UserVo userVo); + int updateAccount(@Param("userVo") UserVo userVo); + + int getByUserStatisticsOne(@Param("userId") Long userId); + + int getByUserStatisticsTwo(@Param("userId") Long userId); + + int getByUserStatisticsThree(@Param("userId") Long userId); + + int getByUserStatisticsFour(@Param("userId") Long userId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml index c2d8902..41dd933 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/GuestInfoMapper.xml @@ -39,4 +39,46 @@ email = #{email} + + + + + + + diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java index 9793fa6..a2e93f6 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/DisasterInfoService.java @@ -70,4 +70,6 @@ public interface DisasterInfoService extends IService { UserVo getBladeUserByEmail(String email); Integer getByUserDisasterInfo(Long userId, Long disasterId); + + UserVo getByUserDisasterInfoStatistics(Long userId); } diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index 70e994e..c05023b 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -217,6 +217,24 @@ public class DisasterInfoServiceImpl extends ServiceImpl