From 99bf1c3e7115ef801ce67cb70ed2d012c932d7f0 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Thu, 14 Nov 2024 18:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/constant/CacheNames.java       | 18 +++++++++---------
 .../domain/vo/home/UserAmountInfoVo.java       |  8 ++++----
 .../business/domain/vo/home/UserAmountVo.java  |  2 +-
 .../business/service/impl/HomeServiceImpl.java |  5 ++++-
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java
index aaf03e7..59cf710 100644
--- a/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java
+++ b/pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/constant/CacheNames.java
@@ -75,40 +75,40 @@ public interface CacheNames {
     /**
      * 首页查询(成交金额)
      */
-    String HOME_A = "home_queryA#60s";
+    String HOME_A = "home_queryA#1200s";
     /**
      * 首页查询(回款统计与合同)
      */
-    String HOME_B = "home_queryB#60s";
+    String HOME_B = "home_queryB#1200s";
 
     /**
      * 首页查询(成交金额)
      */
-    String HOME_C = "home_queryC#60s";
+    String HOME_C = "home_queryC#1200s";
 
     /**
      * 首页查询
      */
-    String HOME_D = "home_queryD#60s";
+    String HOME_D = "home_queryD#1200s";
     /**
      * 首页查询
      */
-    String HOME_E = "home_queryE#60s";
+    String HOME_E = "home_queryE#1200s";
     /**
      * 首页查询
      */
-    String HOME_F = "home_queryF#60s";
+    String HOME_F = "home_queryF#1200s";
     /**
      * 首页查询
      */
-    String HOME_G = "home_queryG#60s";
+    String HOME_G = "home_queryG#1200s";
 
     /**
      * 首页查询
      */
-    String HOME_H = "home_queryH#60s";
+    String HOME_H = "home_queryH#1200s";
     /**
      * 首页查询
      */
-    String HOME_I = "home_queryI#60s";
+    String HOME_I = "home_queryI#1200s";
 }
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountInfoVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountInfoVo.java
index dc2db60..93edf81 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountInfoVo.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountInfoVo.java
@@ -19,19 +19,19 @@ public class UserAmountInfoVo {
     /**
      * 合同数量
      */
-    private Integer contractNum=0;
+    private Integer contractNum = 0;
     /**
      * 合同总金额
      */
-    private BigDecimal sumAmount=new BigDecimal(0);
+    private BigDecimal sumAmount = new BigDecimal(0);
     /**
      * 已支付总金额
      */
-    private BigDecimal payedSumAmount=new BigDecimal(0);
+    private BigDecimal payedSumAmount = new BigDecimal(0);
     /**
      * 未支付金额
      */
-    private BigDecimal unPaySumAmount=new BigDecimal(0);
+    private BigDecimal unPaySumAmount = new BigDecimal(0);
 
     /**
      * 托管类型合同总金额 类型号:4
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountVo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountVo.java
index c24df3d..91ca3b7 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountVo.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/vo/home/UserAmountVo.java
@@ -31,7 +31,7 @@ public class UserAmountVo {
     /**
      * 各人员成交金额
      */
-    private Collection<UserAmountInfoVo> userAmountList;
+    private List<UserAmountInfoVo> userAmountList;
 
 
     /**
diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
index 90461d8..7438d0f 100644
--- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
+++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
@@ -299,6 +299,7 @@ public class HomeServiceImpl implements HomeService {
      * @param isCaiwu
      * @return
      */
+    @Cacheable(cacheNames = CacheNames.HOME_E, key = "#type")
     public UserAmountVo getUserContractSourceAmountsByDeptId(Integer type, int tabType){
         Map<String, Object> mapParam = this.getDate(type);
         LocalDate startDate = (LocalDate)mapParam.get("startDate");
@@ -486,6 +487,7 @@ public class HomeServiceImpl implements HomeService {
      * @param type
      * @return
      */
+    @Cacheable(cacheNames = CacheNames.HOME_F, key = "#type")
     public UserAmountVo getUserContractAndPayInfo(Integer type, int tabType){
         Map<String, Object> mapParam = this.getDate(type);
         LocalDate startDate = (LocalDate)mapParam.get("startDate");
@@ -578,7 +580,7 @@ public class HomeServiceImpl implements HomeService {
         }
 
         UserAmountVo userAmountVo = new UserAmountVo();
-        userAmountVo.setUserAmountList(resMap.values());
+        userAmountVo.setUserAmountList(new ArrayList<>(resMap.values()));
         userAmountVo.setDateStr(date);
         userAmountVo.setAll(sumAmount);
         return userAmountVo;
@@ -743,6 +745,7 @@ public class HomeServiceImpl implements HomeService {
      * @param type
      * @return
      */
+    @Cacheable(cacheNames = CacheNames.HOME_G, key = "#type")
     public SalasVo salasData(Integer type){
         Map<String, Object> mapParam = this.getDateByUser(type);
         LocalDate startDate = (LocalDate)mapParam.get("startDate");