From e5a95972a57efc4d315b63c532f53c0b2766b176 Mon Sep 17 00:00:00 2001 From: xupei Date: Tue, 6 Aug 2024 11:29:33 +0800 Subject: [PATCH] =?UTF-8?q?modify=20:=20=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConvenientInquiryController.java | 21 +++------ .../da/mapper/primary/entity/TrialOrder.java | 3 ++ .../da/service/ConvenientInquiryService.java | 7 ++- .../da/service/impl/AccountServiceImpl.java | 11 ++++- .../impl/ConvenientInquiryServiceImpl.java | 47 +++++++++---------- 5 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index f4a7c9da..119baa5a 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -82,30 +82,23 @@ public class ConvenientInquiryController { } @ApiOperation("获取近期新用户") - @GetMapping("/recentNewUser") - public Response> recentNewUser(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime, - @ApiParam(value = "endTime") @RequestParam @Nullable String endTime, - @ApiParam("userType visitor/trial/official") @RequestParam String userType, - @ApiParam("page") @RequestParam int page, - @ApiParam("size") @RequestParam int size) { - return Response.success(convenientInquiryService.recentNewUser(startTime, endTime, userType, page, size)); + @PostMapping("/recentNewUser") + public Response> recentNewUser(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) { + return Response.success(convenientInquiryService.recentNewUser(queryUserConditionsVO)); } @ApiOperation("获取近期新用户图表数据") @GetMapping("/recentNewUserChart") public Response> recentNewUserChart(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime, @ApiParam(value = "endTime") @RequestParam @Nullable String endTime, - @ApiParam("userType") @RequestParam String userType) { + @ApiParam("userType") @RequestParam Integer userType) { return Response.success(convenientInquiryService.recentNewUserChart(startTime, endTime, userType)); } @ApiOperation("获取近期活跃用户") - @GetMapping("/recentActiveUser") - public Response> recentActiveUser(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime, - @ApiParam(value = "endTime") @RequestParam @Nullable String endTime, - @ApiParam("pageNum") @RequestParam int page, - @ApiParam("size") @RequestParam int size) { - return Response.success(convenientInquiryService.recentActiveUser(startTime, endTime, page, size)); + @PostMapping("/recentActiveUser") + public Response> recentActiveUser(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) { + return Response.success(convenientInquiryService.recentActiveUser(queryUserConditionsVO)); } @ApiOperation("获取近期活跃用户图表数据") diff --git a/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java b/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java index 0e908b59..ea7a9118 100644 --- a/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java +++ b/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java @@ -3,6 +3,7 @@ package com.ai.da.mapper.primary.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -49,11 +50,13 @@ public class TrialOrder implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private LocalDateTime createTime; /** * 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private LocalDateTime updateTime; diff --git a/src/main/java/com/ai/da/service/ConvenientInquiryService.java b/src/main/java/com/ai/da/service/ConvenientInquiryService.java index d32fd084..49424df6 100644 --- a/src/main/java/com/ai/da/service/ConvenientInquiryService.java +++ b/src/main/java/com/ai/da/service/ConvenientInquiryService.java @@ -8,7 +8,6 @@ import com.ai.da.model.vo.QuestionnaireFeedbackVO; import com.ai.da.model.vo.QuestionnaireVO; import com.ai.da.model.vo.QueryUserConditionsVO; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -22,11 +21,11 @@ public interface ConvenientInquiryService extends IService { List getAllQuestionnaire(); - IPage recentNewUser(String startTime, String endTime, String userType, int pageNum, int size); + IPage recentNewUser(QueryUserConditionsVO queryUserConditionsVO); - Map recentNewUserChart(String startTime, String endTime, String userType); + Map recentNewUserChart(String startTime, String endTime, Integer userType); - IPage recentActiveUser(String startTime, String endTime, int pageNum, int count); + IPage recentActiveUser(QueryUserConditionsVO queryUserConditionsVO); int recentActiveUserChart(String startTime, String endTime); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 5072e0a4..eec39d47 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1361,11 +1361,18 @@ public class AccountServiceImpl extends ServiceImpl impl case 0: // 游客 queryWrapper.eq("system_user", 0); + break; case 1: + queryWrapper.eq("system_user", 1); + break; + case 2: + queryWrapper.eq("system_user", 2); + break; + case 3: // 试用用户 queryWrapper.eq("system_user", 3).or().eq("system_user", 4); - case 2: - queryWrapper.eq("system_user", 1).or().eq("system_user", 2); + break; + } } } diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java index 536f26e4..b664ed21 100644 --- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java @@ -47,7 +47,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl getTrial(QueryUserConditionsVO queryUserConditionsVO) { - log.info("getTrial parameter : {},page:{}, size:{}",queryUserConditionsVO,queryUserConditionsVO.getPage(),queryUserConditionsVO.getSize()); + log.info("getTrial parameter : {},page:{}, size:{}", queryUserConditionsVO, queryUserConditionsVO.getPage(), queryUserConditionsVO.getSize()); /* 添加按条件查询试用用户 */ // 按用户邮箱/用户名/用户id查指定用户 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -251,29 +251,31 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl recentNewUser(String startTime, String endTime, String userType, int pageNum, int size) { - if (StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) { + public IPage recentNewUser(QueryUserConditionsVO queryUserConditionsVO) { + log.info("recentActiveUser parameter : {}, page:{}, size:{}", queryUserConditionsVO, queryUserConditionsVO.getPage(), queryUserConditionsVO.getSize()); + if (StringUtil.isNullOrEmpty(queryUserConditionsVO.getStartTime()) && StringUtil.isNullOrEmpty(queryUserConditionsVO.getEndTime())) { return null; } - if (!StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) { + if (!StringUtil.isNullOrEmpty(queryUserConditionsVO.getStartTime()) && StringUtil.isNullOrEmpty(queryUserConditionsVO.getEndTime())) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - endTime = LocalDateTime.now().format(formatter); + queryUserConditionsVO.setEndTime(LocalDateTime.now().format(formatter)); } Integer type = null; - if (!StringUtil.isNullOrEmpty(userType)) { - type = userType.equals("visitor") ? 0 : userType.equals("trial") ? 1 : 2; + if (!Objects.isNull(queryUserConditionsVO.getSystemUser())) { + type = queryUserConditionsVO.getSystemUser(); } - return accountService.getPageByDateAndUserType(startTime, endTime, type, pageNum, size); + return accountService.getPageByDateAndUserType(queryUserConditionsVO.getStartTime(), + queryUserConditionsVO.getEndTime(), + type, + queryUserConditionsVO.getPage(), + queryUserConditionsVO.getSize()); } // 图表数据 - public Map recentNewUserChart(String startTime, String endTime, String userType) { + public Map recentNewUserChart(String startTime, String endTime, Integer userType) { + log.info("recentNewUserChart startTime : {},endTime : {},userType:{}", startTime, endTime, userType); if (StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) { return null; } @@ -281,12 +283,8 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl countMap = accountService.getByDateAndUserType(startTime, endTime, type); + Map countMap = accountService.getByDateAndUserType(startTime, endTime, userType); long type1 = countMap.get("1") == null ? 0L : countMap.get("1"); long type2 = countMap.get("2") == null ? 0L : countMap.get("2"); long type3 = countMap.get("3") == null ? 0L : countMap.get("3"); @@ -304,13 +302,14 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl recentActiveUser(String startTime, String endTime, int pageNum, int size) { - if (!StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) { + public IPage recentActiveUser(QueryUserConditionsVO queryUserConditionsVO) { + log.info("recentActiveUser parameter : {}, page:{}, size:{}", queryUserConditionsVO, queryUserConditionsVO.getPage(), queryUserConditionsVO.getSize()); + if (!StringUtil.isNullOrEmpty(queryUserConditionsVO.getStartTime()) && StringUtil.isNullOrEmpty(queryUserConditionsVO.getEndTime())) { DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - endTime = LocalDateTime.now().format(formatter); + queryUserConditionsVO.setEndTime(LocalDateTime.now().format(formatter)); } - List accountIds = accountLoginLogService.getByDate(startTime, endTime); - return accountService.getPageByIds(accountIds, pageNum, size); + List accountIds = accountLoginLogService.getByDate(queryUserConditionsVO.getStartTime(), queryUserConditionsVO.getEndTime()); + return accountService.getPageByIds(accountIds, queryUserConditionsVO.getPage(), queryUserConditionsVO.getSize()); } // 图表数据 @@ -523,7 +522,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl getUserInfo(QueryUserConditionsVO queryUserConditionsVO) { - log.info("getUserInfo parameter : {},page:{}, size:{}",queryUserConditionsVO,queryUserConditionsVO.getPage(),queryUserConditionsVO.getSize()); + log.info("getUserInfo parameter : {},page:{}, size:{}", queryUserConditionsVO, queryUserConditionsVO.getPage(), queryUserConditionsVO.getSize()); // 按用户邮箱/用户名/用户id查指定用户 QueryWrapper queryWrapper = new QueryWrapper<>(); if (!Objects.isNull(queryUserConditionsVO.getIds()) && !queryUserConditionsVO.getIds().isEmpty()) {