组织画像--添加缓存

airport-admin/src/main/java/com/sundot/airport/web/controller/score/DeptPortraitController.java

@@ -12,6 +12,8 @@ import com.sundot.airport.ledger.service.IGroupPortraitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -46,6 +48,7 @@ public class DeptPortraitController extends BaseController {
      */
     @ApiOperation("获取部门内所有成员列表")
     @PostMapping("/members")
+    @Cacheable(value = "dept:members", key = "#query.deptId + ':' + (#query.startDate ?: 'default') + ':' + (#query.endDate ?: 'default')")
     public AjaxResult getDeptMembers(@RequestBody DeptPortraitQueryDTO query) {
         try {
             // 参数校验
@@ -83,6 +86,7 @@ public class DeptPortraitController extends BaseController {
      */
     @ApiOperation("获取部门成员基本情况分布")
     @PostMapping("/distribution")
+    @Cacheable(value = "dept:distribution", key = "#query.deptId + ':' + (#query.startDate ?: 'default') + ':' + (#query.endDate ?: 'default')")
     public AjaxResult getMemberDistribution(@RequestBody DeptPortraitQueryDTO query) {
         try {
             // 参数校验
@@ -120,6 +124,7 @@ public class DeptPortraitController extends BaseController {
      */
     @ApiOperation("获取部门成员职位情况分布")
     @PostMapping("/position-distribution")
+    @Cacheable(value = "dept:position", key = "#query.deptId + ':' + (#query.startDate ?: 'default') + ':' + (#query.endDate ?: 'default')")
     public AjaxResult getPositionDistribution(@RequestBody DeptPortraitQueryDTO query) {
         try {
             // 参数校验
@@ -156,6 +161,7 @@ public class DeptPortraitController extends BaseController {
      */
     @ApiOperation("维度得分一览")
     @PostMapping("/group-portrait")
+    @Cacheable(value = "portrait", key = "#query.deptId + ':' + (#query.startDate ?: 'default') + ':' + (#query.endDate ?: 'default')")
     public AjaxResult getGroupPortrait(@RequestBody DeptPortraitQueryDTO query) {
         try {
             // 参数校验
@@ -180,6 +186,21 @@ public class DeptPortraitController extends BaseController {
     }
 
     /**
+     * 清空所有画像相关缓存
+     * <p>
+     * 当录入新的事件数据后，调用此接口清空缓存，确保下次查询时重新计算
+     * </p>
+     *
+     * @return 操作结果
+     */
+    @ApiOperation("清空所有画像缓存")
+    @PostMapping("/clear-cache")
+    @CacheEvict(value = {"dept:members", "dept:distribution", "dept:position", "portrait"}, allEntries = true)
+    public AjaxResult clearPortraitCache() {
+        return success("缓存已清空");
+    }
+
+    /**
      * 获取站级别下所有部门的团队画像统计
      * <p>
      * 展示站下各部门的：
@@ -192,6 +213,7 @@ public class DeptPortraitController extends BaseController {
      */
     @ApiOperation("获取站级别下所有部门的团队画像统计")
     @PostMapping("/station-team-stats")
+    @Cacheable(value = "station:stats", key = "#query.deptId + ':' + (#query.startDate ?: 'default') + ':' + (#query.endDate ?: 'default')")
     public AjaxResult getStationTeamStats(@RequestBody DeptPortraitQueryDTO query) {
         try {
             // 参数校验
@@ -218,6 +240,7 @@ public class DeptPortraitController extends BaseController {
 
     @ApiOperation("获取部门的团队画像统计")
     @PostMapping("/team-stats")
+    @Cacheable(value = "team:stats", key = "#query.deptId + ':' + (#query.startDate ?: 'default') + ':' + (#query.endDate ?: 'default')")
     public AjaxResult getTeamStats(@RequestBody DeptPortraitQueryDTO query) {
         try {
             // 参数校验

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/GroupPortraitServiceImpl.java

@@ -233,14 +233,17 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         // 取第一个匹配的维度
         ScoreDimension lowerDim = lowerDims.get(0);
 
+        BigDecimal result;
         // 4. 根据下一级的org决定如何处理
         if (ScoreLevelEnum.PERSON.getCode().equals(lowerOrg)) {
             // 下一级是人员维度，计算人员事件平均值
-            return calculatePersonDimensionAverage(lowerDim, beginTime, endTime, deptId);
+            result = calculatePersonDimensionAverage(lowerDim, beginTime, endTime, deptId);
         } else {
             // 下一级是 TEAM 或 GROUP 层级，需要获取子部门并计算每个子部门的最终分数
-            return calculateChildDeptAverage(lowerDim, beginTime, endTime, deptId);
+            result = calculateChildDeptAverage(lowerDim, beginTime, endTime, deptId);
         }
+        
+        return result;
     }
 
     /**