管理员系统功能添加

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -4,14 +4,16 @@ package com.ai.da.controller;
 import com.ai.da.common.context.UserContext;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.DesignMapper;
-import com.ai.da.mapper.primary.TrialOrderMapper;
 import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.mapper.primary.entity.TrialOrder;
+import com.ai.da.model.dto.AccountAddDTO;
 import com.ai.da.model.dto.UserDesignStatisticDTO;
 import com.ai.da.model.vo.QuestionnaireFeedbackVO;
 import com.ai.da.model.vo.QuestionnaireVO;
+import com.ai.da.model.vo.QueryUserConditionsVO;
 import com.ai.da.service.ConvenientInquiryService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.netty.util.internal.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Nullable;
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -29,43 +32,37 @@ import java.util.*;
 @RestController
 @RequestMapping("/api/inquiry")
 public class ConvenientInquiryController {
-
-    @Resource
-    private TrialOrderMapper trialOrderMapper;
-
     @Resource
     private DesignMapper designMapper;
-
     @Resource
     private ConvenientInquiryService convenientInquiryService;
 
 
     @ApiOperation("获取当前所有试用用户")
-    @GetMapping("/getTrial")
-    public Response<List<TrialOrder>> getTrial(){
+    @PostMapping("/getTrial")
+    public Response<IPage<TrialOrder>> getTrial(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
         Long accountId = UserContext.getUserHolder().getId();
-        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){
-            List<TrialOrder> trialOrders = trialOrderMapper.selectList(null);
-            return Response.success(trialOrders);
-        }else {
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
+            return Response.success(convenientInquiryService.getTrial(queryUserConditionsVO));
+        } else {
             return Response.fail("Sorry, you don't have permission");
         }
     }
 
     @ApiOperation("获取指定时间区间内所有用户design的使用情况")
     @GetMapping("/getDesignStatistic")
-    public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam String startTime,@RequestParam String endTime){
+    public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime) {
         Long accountId = UserContext.getUserHolder().getId();
-        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
             if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00";
-            if (StringUtil.isNullOrEmpty(endTime)){
+            if (StringUtil.isNullOrEmpty(endTime)) {
                 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                 Date date = new Date();
                 endTime = simpleDateFormat.format(date);
             }
             List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime);
             return Response.success(designStatistic);
-        }else {
+        } else {
             return Response.fail("Sorry, you don't have permission");
         }
     }
@@ -74,57 +71,101 @@ public class ConvenientInquiryController {
     //调查问卷
     @ApiOperation("获取调查问卷统计详情")
     @GetMapping("/getQuestionnaireStatistic")
-    public Response<QuestionnaireFeedbackVO> getQuestionnaire(){
+    public Response<QuestionnaireFeedbackVO> getQuestionnaire() {
         return Response.success(convenientInquiryService.getQuestionnaireInfo());
     }
 
     @ApiOperation("获取所有调查问卷")
     @GetMapping("/getAllQuestionnaire")
-    public Response<List<QuestionnaireVO>> getAllQuestionnaire(){
+    public Response<List<QuestionnaireVO>> getAllQuestionnaire() {
         return Response.success(convenientInquiryService.getAllQuestionnaire());
     }
 
     @ApiOperation("获取近期新用户")
-    @PostMapping("/recentNewUser")
+    @GetMapping("/recentNewUser")
     public Response<IPage<Account>> recentNewUser(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
                                                   @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
-                                                  @ApiParam("userType") @RequestParam String userType,
-                                                  @ApiParam("pageNum") @RequestParam int pageNum,
-                                                  @ApiParam("size") @RequestParam int size){
-        return Response.success(convenientInquiryService.recentNewUser(startTime, endTime, userType, pageNum, size));
+                                                  @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));
     }
 
     @ApiOperation("获取近期新用户图表数据")
-    @PostMapping("/recentNewUserChart")
+    @GetMapping("/recentNewUserChart")
     public Response<Map<String, Object>> recentNewUserChart(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
-                                                  @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
-                                                  @ApiParam("userType") @RequestParam String userType){
+                                                            @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
+                                                            @ApiParam("userType") @RequestParam String userType) {
         return Response.success(convenientInquiryService.recentNewUserChart(startTime, endTime, userType));
     }
 
     @ApiOperation("获取近期活跃用户")
-    @PostMapping("/recentActiveUser")
+    @GetMapping("/recentActiveUser")
     public Response<IPage<Account>> recentActiveUser(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
-                                                  @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
-                                                  @ApiParam("pageNum") @RequestParam int pageNum,
-                                                  @ApiParam("size") @RequestParam int size){
-        return Response.success(convenientInquiryService.recentActiveUser(startTime, endTime, pageNum, size));
+                                                     @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));
     }
 
     @ApiOperation("获取近期活跃用户图表数据")
-    @PostMapping("/recentActiveUserChart")
+    @GetMapping("/recentActiveUserChart")
     public Response<Integer> recentActiveUserChart(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
-                                                   @ApiParam(value = "endTime") @RequestParam @Nullable String endTime){
+                                                   @ApiParam(value = "endTime") @RequestParam @Nullable String endTime) {
         return Response.success(convenientInquiryService.recentActiveUserChart(startTime, endTime));
     }
 
     @ApiOperation("获取用户的各模块功能使用详情")
-    @PostMapping("/getActiveUserFunc")
+    @GetMapping("/getActiveUserFunc")
     public Response<Map<String, List<Object>>> getActiveUserFunc(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
-                                                    @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
-                                                    @ApiParam("userIdList") @RequestParam List<Long> userIdList){
+                                                                 @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
+                                                                 @ApiParam("userIdList") @RequestParam @Nullable List<Long> userIdList) {
         return Response.success(convenientInquiryService.getActiveUserFunc(startTime, endTime, userIdList));
     }
 
+    @ApiOperation("试用用户到正式用户的转化率")
+    @GetMapping("/conversionRate")
+    public Response<Map<String, Float>> conversionRate() {
+        return Response.success(convenientInquiryService.conversionRate());
+    }
+
+    @ApiOperation("试用用户国家/城市分布")
+    @GetMapping("/trialUserCountry")
+    public Response<Map<String, List<Object>>> trialUserCountry() {
+        return Response.success(convenientInquiryService.trialUserCountry());
+    }
+
+    @ApiOperation("添加用户")
+    @PostMapping("/addUser")
+    public Response<Boolean> addUser(@Valid @RequestBody AccountAddDTO accountAddDTO) {
+        return Response.success(convenientInquiryService.addUser(accountAddDTO));
+    }
+
+    @ApiOperation("修改用户信息")
+    @PostMapping("/modifyUser")
+    public Response<Boolean> modifyUser(@ApiParam(value = "用户id") @RequestParam @Nullable Long accountId,
+                                        @ApiParam(value = "有效期截止时间的毫秒级unix格式") @RequestParam @Nullable Long validEndTime,
+                                        @ApiParam(value = "用户类型 1/2/3/0 -> yearly/monthly/trial/visitor") @RequestParam @Nullable Integer systemUser,
+                                        @ApiParam("积分") @RequestParam @Nullable Long credits) {
+        return Response.success(convenientInquiryService.modifyUser(accountId, validEndTime, systemUser, credits));
+    }
+
+    @ApiOperation("获取用户信息")
+    @PostMapping("/getUserInfo")
+    public Response<IPage<Account>> getUserInfo(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
+        Long accountId = UserContext.getUserHolder().getId();
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
+            return Response.success(convenientInquiryService.getUserInfo(queryUserConditionsVO));
+        } else {
+            return Response.fail("Sorry, you don't have permission");
+        }
+    }
+
+    @ApiOperation("获取所有用户id")
+    @GetMapping("/getAllUserId")
+    public Response<List<Map<String, Object>>> getAllUsrIdList() {
+        return Response.success(convenientInquiryService.getAllUserIdList());
+    }
+
 
 }