拆分首页图表查询接口

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayment/controller/HlwPaymentDetailController.java

@@ -292,24 +292,51 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
 
 
     /**
-     * 获取首页（付款金额、用户总数、合作企业）
+     * 获取首页左上付款总金额
      */
-    @AutoLog(value = "获取首页（付款金额、用户总数、合作企业）")
-    @ApiOperation(value = "获取首页（付款金额、用户总数、合作企业）", notes = "获取首页（付款金额、用户总数、合作企业）")
-    @GetMapping(value = "/getIndexTopInfo")
-    public Result<?> getIndexTopInfo(@RequestParam(name = "beforeTotalNetpayment", required = true) String beforeTotalNetpayment, @RequestParam(name = "beforeTotalUser", required = true) String beforeTotalUser, @RequestParam(name = "beforeTotalCompany", required = true) String beforeTotalCompany) {
+    @AutoLog(value = "获取首页左上付款总金额")
+    @ApiOperation(value = "获取首页左上付款总金额", notes = "获取首页左上付款总金额")
+    @GetMapping(value = "/getIndexTopTotalpayment")
+    public Result<?> getIndexTopTotalpayment(@RequestParam(name = "beforeTotalNetpayment", required = true) String beforeTotalNetpayment) {
         //存放返回数据结果
         List list = new ArrayList();
         Double totalNetpayment = hlwPaymentDetailService.getTotalNetpayment();
-        int totalUser = hlwUserMapper.findSumUser();
-        int totalCompany = hlwCompanyMapper.findTotalCompany();
         list.add(totalNetpayment);
         //付款金额增长
         list.add(businessAccountUtils.sub(totalNetpayment, Double.parseDouble(beforeTotalNetpayment)));
+        return Result.ok(list);
+    }
+
+
+
+    /**
+     * 获取首页上方中间用户总数
+     */
+    @AutoLog(value = "获取首页上方中间用户总数")
+    @ApiOperation(value = "获取首页上方中间用户总数", notes = "获取首页上方中间用户总数")
+    @GetMapping(value = "/getIndexTopTotalUser")
+    public Result<?> getIndexTopTotalUser( @RequestParam(name = "beforeTotalUser", required = true) String beforeTotalUser) {
+        //存放返回数据结果
+        List list = new ArrayList();
+        int totalUser = hlwUserMapper.findSumUser();
         list.add(totalUser);
         //用户数增长
         list.add(totalUser - Integer.parseInt(beforeTotalUser));
-        list.add(totalCompany);
+        return Result.ok(list);
+    }
+
+
+
+    /**
+     * 获取首页右上企业总数
+     */
+    @AutoLog(value = "获取首页右上企业总数")
+    @ApiOperation(value = "获取首页右上企业总数", notes = "获取首页右上企业总数")
+    @GetMapping(value = "/getIndexTopTotalCompany")
+    public Result<?> getIndexTopTotalCompany( @RequestParam(name = "beforeTotalCompany", required = true) String beforeTotalCompany) {
+        //存放返回数据结果
+        List list = new ArrayList();
+        int totalCompany = hlwCompanyMapper.findTotalCompany();
         //企业数增长
         list.add(totalCompany - Integer.parseInt(beforeTotalCompany));
         return Result.ok(list);
@@ -317,12 +344,12 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
 
 
     /**
-     * 获取首页中间付款图表所需数据
+     * 获取首页中间左侧付款图表三个付款数字所需数据
      */
-    @AutoLog(value = "获取首页中间付款图表所需数据")
-    @ApiOperation(value = "获取首页中间付款图表所需数据", notes = "获取首页中间付款图表所需数据")
-    @GetMapping(value = "/getIndexMiddlePaymentInfo")
-    public Result<?> getIndexMiddlePaymentInfo() throws ParseException {
+    @AutoLog(value = "获取首页中间左侧付款图表三个付款数字所需数据")
+    @ApiOperation(value = "获取首页中间左侧付款图表三个付款数字所需数据", notes = "获取首页中间左侧付款图表三个付款数字所需数据")
+    @GetMapping(value = "/getIndexMiddleThreePaymentInfo")
+    public Result<?> getIndexMiddleThreePaymentInfo() throws ParseException {
         //存放返回数据结果
         List list = new ArrayList();
         Double weekPayment = hlwPaymentDetailService.weekPayment();
@@ -331,6 +358,19 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
         list.add(weekPayment);
         list.add(monthPayment);
         list.add(yearPayment);
+        return Result.ok(list);
+    }
+
+
+    /**
+     * 获取首页中间左侧付款图表所需数据
+     */
+    @AutoLog(value = "获取首页中间左侧付款图表所需数据")
+    @ApiOperation(value = "获取首页中间左侧付款图表所需数据", notes = "获取首页中间左侧付款图表所需数据")
+    @GetMapping(value = "/getIndexMiddlePaymentChartInfo")
+    public Result<?> getIndexMiddlePaymentChartInfo() throws ParseException {
+        //存放返回数据结果
+        List list = new ArrayList();
         //存放图表所需年月+付款数据
         List<Map> list1 = new ArrayList<>();
         //当天时间
@@ -349,6 +389,8 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
     }
 
 
+
+
     /**
      * 获取首页中间新增用户(周、月)及占比
      */