首页增加部分接口

src/main/java/com/winhc/repal/controller/RepalBookController.java

@@ -2,19 +2,21 @@ package com.winhc.repal.controller;
 
 import com.winhc.common.base.BeanResponse;
 import com.winhc.common.enums.CodeMsg;
-
 import com.winhc.repal.annotation.RolePermission;
 import com.winhc.repal.enums.PermissionEnum;
-import com.winhc.repal.model.dto.DeleteRepalBillDTO;
 import com.winhc.repal.model.dto.DeleteRepalBookDTO;
-import com.winhc.repal.model.vo.RepalBookHomeVO;
+import com.winhc.repal.model.dto.HomeTypeDTO;
+import com.winhc.repal.model.vo.HomeGradeVO;
 import com.winhc.repal.model.vo.RepalBookInfoVO;
 import com.winhc.repal.service.RepalBookService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -36,12 +38,29 @@ public class RepalBookController {
     private RepalBookService repalBookService;
 
 
-//    @ApiOperation("首页接口")
-//    @RequestMapping(value = "/home", method = RequestMethod.GET)
-//    public BeanResponse<RepalBookHomeVO> getRepalHomeDetail() {
-//        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getRepalHomeDetail(repalGroupId));
+//    @ApiOperation("首页应收/应付部分")
+//    @RequestMapping(value = "/home/receivable/{billType}", method = RequestMethod.POST)
+//    public BeanResponse<HomeReceivableVO> getHomeReceivable(@PathVariable("billType")Integer billType, HomeTypeDTO dto) {
+//
 //    }
 
+
+    @ApiOperation("首页账本应收账款动态")
+    @RequestMapping(value = "/dynamic", method = RequestMethod.GET)
+    public BeanResponse<List<List<Integer>>> getRepalBookDynamic(HomeTypeDTO dto) {
+        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getRepalBookDynamic(dto));
+    }
+
+    @ApiOperation("首页账本账款评级数据")
+    @RequestMapping(value = "/grade", method = RequestMethod.GET)
+    public BeanResponse<List<HomeGradeVO>> getGradeRate(HomeTypeDTO dto) {
+        return BeanResponse.success(CodeMsg.SUCCESS, repalBookService.getGradeRateList(dto));
+    }
+
+//    @ApiOperation("首页账本回款统计折线图")
+//    @RequestMapping(value = "/graph", method = RequestMethod.GET)
+//    public BeanResponse<>
+
     @ApiOperation("删除账本")
     @RequestMapping(value = "/deleteRepalBook", method = RequestMethod.POST)
     @RolePermission(permission = PermissionEnum.BOOK_MANAGER)

src/main/java/com/winhc/repal/enums/HomeQueryTypeEnum.java

@@ -0,0 +1,33 @@
+package com.winhc.repal.enums;
+
+/**
+ * @Description: HomeQueryTypeEnum
+ * @Author: xda
+ * @Date: 2022/5/6 18:43
+ */
+public enum HomeQueryTypeEnum {
+
+    /**
+     *  首页查询日期筛选类型
+     */
+    WEEK(1, "近7天"),
+    MONTH(2, "近30天"),
+    ALL(3, "全部");
+
+    private final Integer code;
+
+    private final String desc;
+
+    HomeQueryTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

src/main/java/com/winhc/repal/model/dto/HomeTypeDTO.java

@@ -0,0 +1,22 @@
+package com.winhc.repal.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: HomeTypeDTO
+ * @Author: xda
+ * @Date: 2022/5/6 18:20
+ */
+@Data
+@ApiModel("首页查询dto")
+public class HomeTypeDTO {
+
+    @ApiModelProperty(value = "查询类型。[1]近7天 [2]近30天 [3]全部.默认7天")
+    private Integer queryType = 1;
+
+    @ApiModelProperty(value = "账本id")
+    private Long repalBookId;
+
+}

src/main/java/com/winhc/repal/model/vo/HomeGradeVO.java

@@ -0,0 +1,24 @@
+package com.winhc.repal.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: HomeGradeVO
+ * @Author: xda
+ * @Date: 2022/5/6 18:49
+ */
+@Data
+@ApiModel("账本首页评级")
+public class HomeGradeVO {
+
+    @ApiModelProperty("级别描述")
+    private String grade;
+
+    @ApiModelProperty("数量")
+    private Integer count;
+
+    @ApiModelProperty("占比")
+    private String rate;
+}

src/main/java/com/winhc/repal/model/vo/HomeReceivableVO.java

@@ -0,0 +1,38 @@
+package com.winhc.repal.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description: HomeReceivableVO
+ * @Author: xda
+ * @Date: 2022/5/6 18:14
+ */
+@Data
+@ApiModel("首页应收/应付vo")
+public class HomeReceivableVO {
+
+    @ApiModelProperty("应收/应付金额，string")
+    private String totalMoneyStr;
+
+    @ApiModelProperty("应收/应付数量")
+    private Integer totalCount;
+
+    @ApiModelProperty("已逾期金额，string")
+    private String overdueTotalStr;
+
+    @ApiModelProperty("逾期笔数")
+    private Integer overdueTotalCount;
+
+    @ApiModelProperty("逾期比例")
+    private String overdueRate;
+
+    @ApiModelProperty("总账款金额，string")
+    private String totalBillMoneyStr;
+
+    @ApiModelProperty("已收/已付金额，string")
+    private String receivableStr;
+
+
+}

src/main/java/com/winhc/repal/model/vo/RepalBookHomeVO.java

@@ -1,56 +0,0 @@
-package com.winhc.repal.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.util.List;
-
-/**
- * @Description: RepalBookDetailVO
- * @Author: xda
- * @Date: 2022/4/14 17:39
- */
-@Data
-@ApiModel("账本详情")
-public class RepalBookHomeVO {
-
-    @ApiModelProperty("应收金额信息")
-    private BillMoney receivable;
-
-    @ApiModelProperty("应付金额信息")
-    private BillMoney payment;
-
-
-
-
-
-
-
-
-    @Getter
-    @Setter
-    @ToString
-    @ApiModel("应收/应付")
-    public static class BillMoney {
-
-        @ApiModelProperty("总应收/总应付string")
-        private String totalReceivableStr;
-
-        @ApiModelProperty("总逾期str")
-        private String totalOverdueStr;
-
-        @ApiModelProperty("总额")
-        private String totalMoneyStr;
-
-        @ApiModelProperty("总应收/总应付笔数")
-        private Integer totalReceivableCount;
-
-        @ApiModelProperty("总逾期笔数")
-        private Integer totalOverdueCount;
-
-    }
-}

src/main/java/com/winhc/repal/service/RepalBookService.java

@@ -3,7 +3,8 @@ package com.winhc.repal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.winhc.repal.entity.RepalBook;
 import com.winhc.repal.model.dto.DeleteRepalBookDTO;
-import com.winhc.repal.model.vo.RepalBookHomeVO;
+import com.winhc.repal.model.dto.HomeTypeDTO;
+import com.winhc.repal.model.vo.HomeGradeVO;
 import com.winhc.repal.model.vo.RepalBookInfoVO;
 
 import java.util.List;
@@ -17,15 +18,6 @@ import java.util.List;
 public interface RepalBookService extends IService<RepalBook> {
 
 
-//    /**
-//     * 个人首页账本信息
-//     * @param repalGroupId repalGroupId
-//     * @return com.winhc.repal.model.vo.RepalBookHomeVO
-//     * @author xda
-//     * @date 2022/4/18 09:55
-//     */
-//    RepalBookHomeVO getRepalHomeDetail(Long repalGroupId);
-
 
     /**
      * 删除账本
@@ -45,4 +37,23 @@ public interface RepalBookService extends IService<RepalBook> {
      */
     List<RepalBookInfoVO> getRepalBookInfoList();
 
+    /**
+     * 获取账本动态
+     * @param dto dto
+     * @return java.util.List<java.util.List < java.lang.Integer>>
+     * @author xda
+     * @date 2022/5/6 18:41
+     */
+    List<List<Integer>> getRepalBookDynamic(HomeTypeDTO dto);
+
+    /**
+     * 首页账本评级比例
+     * @param dto dto
+     * @return java.util.List<com.winhc.repal.model.vo.HomeGradeVO>
+     * @author xda
+     * @date 2022/5/6 18:52
+     */
+    List<HomeGradeVO> getGradeRateList(HomeTypeDTO dto);
+
+
 }

src/main/java/com/winhc/repal/service/impl/RepalBookServiceImpl.java

@@ -6,9 +6,9 @@ import com.winhc.common.enums.CodeMsg;
 import com.winhc.common.exception.CommonException;
 import com.winhc.repal.entity.RepalBook;
 import com.winhc.repal.enums.DeletedStatusEnum;
-import com.winhc.repal.enums.PermissionEnum;
 import com.winhc.repal.model.dto.DeleteRepalBookDTO;
-import com.winhc.repal.model.vo.RepalBookHomeVO;
+import com.winhc.repal.model.dto.HomeTypeDTO;
+import com.winhc.repal.model.vo.HomeGradeVO;
 import com.winhc.repal.model.vo.RepalBookInfoVO;
 import com.winhc.repal.repository.RepalBookMapper;
 import com.winhc.repal.service.RepalBillService;
@@ -44,12 +44,6 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
     @Autowired
     private RepalGroupMemberService repalGroupMemberService;
 
-//    @Override
-//    public RepalBookHomeVO getRepalHomeDetail(Long repalGroupId) {
-//        RepalBookHomeVO vo = new RepalBookHomeVO();
-//        return vo;
-//    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean deleteRepalBook(DeleteRepalBookDTO dto) {
@@ -80,4 +74,23 @@ public class RepalBookServiceImpl extends ServiceImpl<RepalBookMapper, RepalBook
         boolean receiptFlag = true;
         return repalBookMapper.getRepalBookInfoList(UserContextUtil.getUser().getUserId(), repalGroupMemberService.getUserGroupId(UserContextUtil.getUser().getUserId()), receivableFlag, receiptFlag);
     }
+
+    @Override
+    public List<List<Integer>> getRepalBookDynamic(HomeTypeDTO dto) {
+
+
+
+
+
+        return new ArrayList<>();
+    }
+
+    @Override
+    public List<HomeGradeVO> getGradeRateList(HomeTypeDTO dto) {
+
+
+
+
+        return null;
+    }
 }