格式化代码

airport-common/src/main/java/com/sundot/airport/common/domain/portrait/BaseModuleIndicatorResult.java

@@ -8,7 +8,7 @@ import lombok.Data;
  */
 @Data
 public class BaseModuleIndicatorResult {
-    
+
     /**
      * 模块名称
      */
@@ -21,7 +21,8 @@ public class BaseModuleIndicatorResult {
 
     /**
      * 设置指标错误信息
-     * @param name 指标名称
+     *
+     * @param name    指标名称
      * @param message 错误信息
      */
     public void setError(String name, String message) {

airport-common/src/main/java/com/sundot/airport/common/domain/portrait/IndicatorCalculateParams.java

@@ -13,23 +13,33 @@ import java.util.List;
  */
 @Data
 public class IndicatorCalculateParams {
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
     @ApiModelProperty(value = "用户ID")
     private Long userId;
 
-    /** 部门ID */
+    /**
+     * 部门ID
+     */
     @ApiModelProperty(value = "部门ID")
     private Long deptId;
-    
-    /** 用户类型 */
+
+    /**
+     * 用户类型
+     */
     @ApiModelProperty(value = "用户类型(personal:个人 team:班级 department:科级  station:站级 )")
     private String userTypeStr;
 
-    /** 计算开始时间 */
+    /**
+     * 计算开始时间
+     */
     @ApiModelProperty(value = "计算开始时间")
     private Date startTime;
 
-    /** 计算结束时间 */
+    /**
+     * 计算结束时间
+     */
     @ApiModelProperty(value = "计算结束时间")
     private Date endTime;
 
@@ -40,12 +50,14 @@ public class IndicatorCalculateParams {
     @ApiModelProperty(value = "指定要计算的模块列表(system,attendance,item)")
     private List<String> modules;
 
-    /** 用户类型枚举 */
+    /**
+     * 用户类型枚举
+     */
     private UserType userType;
 
     /**
-     *  指标类型列表，如果为空则计算所有指标
-     *  IndicatorType
+     * 指标类型列表，如果为空则计算所有指标
+     * IndicatorType
      */
     private List<String> indicatorTypes;
 

airport-common/src/main/java/com/sundot/airport/common/domain/portrait/ModularIndicatorResult.java

@@ -11,34 +11,37 @@ import java.util.Map;
  */
 @Data
 public class ModularIndicatorResult {
-    
+
     /**
      * 模块指标结果映射
      * key: 模块名称
      * value: 模块指标结果
      */
     private Map<String, Object> moduleResults = new HashMap<>();
-    
+
     /**
      * 添加模块结果
+     *
      * @param moduleName 模块名称
-     * @param result 模块结果
+     * @param result     模块结果
      */
     public void addModuleResult(String moduleName, Object result) {
         this.moduleResults.put(moduleName, result);
     }
-    
+
     /**
      * 获取指定模块的结果
+     *
      * @param moduleName 模块名称
      * @return 模块结果
      */
     public Object getModuleResult(String moduleName) {
         return this.moduleResults.get(moduleName);
     }
-    
+
     /**
      * 获取所有模块结果
+     *
      * @return 模块结果映射
      */
     public Map<String, Object> getModuleResults() {

airport-common/src/main/java/com/sundot/airport/common/enums/portrait/IndicatorType.java

@@ -4,83 +4,117 @@ package com.sundot.airport.common.enums.portrait;
  * 指标类型枚举
  */
 public enum IndicatorType {
-    
-    /** 资质等级 */
-    QUALIFICATION_LEVEL(1, "qualificationLevel", "资质等级","system"),
-    
-    /** 可上岗岗位 */
-    AVAILABLE_POSITIONS(2, "availablePositions", "可上岗岗位","system"),
-    
-    /** 政治面貌 */
-    POLITICAL_STATUS(3, "politicalStatus", "政治面貌","system"),
-    
-    /** 年龄 */
-    AGE(4, "age", "年龄","system"),
-    
-    /** 身体健康状况 */
-    PHYSICAL_HEALTH_STATUS(5, "physicalHealthStatus", "身体健康状况","system"),
-    
-    /** 政审通过情况 */
-    POLITICAL_REVIEW_STATUS(6, "politicalReviewStatus", "政审通过情况","system"),
-    
-    /** 行政类处罚情况 */
-    ADMINISTRATIVE_PENALTY(7, "administrativePenalty", "行政类处罚情况","system"),
-    
-    /** 学历情况 */
-    EDUCATION(8, "education", "学历情况","system"),
-    
-    /** 工作奖励 */
+
+    /**
+     * 资质等级
+     */
+    QUALIFICATION_LEVEL(1, "qualificationLevel", "资质等级", "system"),
+
+    /**
+     * 可上岗岗位
+     */
+    AVAILABLE_POSITIONS(2, "availablePositions", "可上岗岗位", "system"),
+
+    /**
+     * 政治面貌
+     */
+    POLITICAL_STATUS(3, "politicalStatus", "政治面貌", "system"),
+
+    /**
+     * 年龄
+     */
+    AGE(4, "age", "年龄", "system"),
+
+    /**
+     * 身体健康状况
+     */
+    PHYSICAL_HEALTH_STATUS(5, "physicalHealthStatus", "身体健康状况", "system"),
+
+    /**
+     * 政审通过情况
+     */
+    POLITICAL_REVIEW_STATUS(6, "politicalReviewStatus", "政审通过情况", "system"),
+
+    /**
+     * 行政类处罚情况
+     */
+    ADMINISTRATIVE_PENALTY(7, "administrativePenalty", "行政类处罚情况", "system"),
+
+    /**
+     * 学历情况
+     */
+    EDUCATION(8, "education", "学历情况", "system"),
+
+    /**
+     * 工作奖励
+     */
     WORK_REWARDS(9, "workRewards", "工作奖励", "system"),
-    
-    /** 工作处罚 */
+
+    /**
+     * 工作处罚
+     */
     WORK_PENALTIES(10, "workPenalties", "工作处罚", "system"),
-    
-    /** 工作年限 */
+
+    /**
+     * 工作年限
+     */
     WORK_YEARS(11, "workYears", "工作年限", "system"),
-    
-    /** 安检工作年限 */
+
+    /**
+     * 安检工作年限
+     */
     SECURITY_WORK_YEARS(12, "securityWorkYears", "安检工作年限", "system"),
 
-    /** 安检工作职务 */
+    /**
+     * 安检工作职务
+     */
     SECURITY_WORK_POSITION(13, "securityWorkPosition", "安检工作职务", "system"),
-    
-    /** 出勤天数 */
-    WORKING_DATE(14, "workingDate", "出勤天数",  "attendance"),
-    
-    /** 上岗时长 */
+
+    /**
+     * 出勤天数
+     */
+    WORKING_DATE(14, "workingDate", "出勤天数", "attendance"),
+
+    /**
+     * 上岗时长
+     */
     WORKING_HOURS(15, "workingHours", "上岗时长", "attendance"),
-    
-    /** 有效查获数量 */
+
+    /**
+     * 有效查获数量
+     */
     EFFECTIVE_SEIZURE_COUNT(16, "effectiveSeizureCount", "有效查获数量", "item"),
-    
-    /** 故意隐匿查获数量 */
+
+    /**
+     * 故意隐匿查获数量
+     */
     WILLFUL_CONCEALMENT_COUNT(17, "willfulConcealmentCount", "故意隐匿查获数量", "item"),
-    
-    /** 移交公安查获数量 */
-    REFER_TO_POLICE_COUNT(18, "referToPoliceCount", "移交公安查获数量", "item")
 
-    ;
-    
+    /**
+     * 移交公安查获数量
+     */
+    REFER_TO_POLICE_COUNT(18, "referToPoliceCount", "移交公安查获数量", "item");
+
     private final int id;
     private final String code;
     private final String description;
     private final String module;
-    
+
     IndicatorType(int id, String code, String description, String module) {
         this.id = id;
         this.code = code;
         this.description = description;
         this.module = module;
     }
-    
+
     public int getId() {
         return id;
     }
-    
+
     public String getCode() {
         return code;
     }
-    
+
     public String getDescription() {
         return description;
     }
@@ -88,9 +122,10 @@ public enum IndicatorType {
     public String getModule() {
         return module;
     }
-    
+
     /**
      * 根据代码获取枚举值
+     *
      * @param code 代码
      * @return 对应的枚举值，找不到返回null
      */
@@ -102,9 +137,10 @@ public enum IndicatorType {
         }
         return null;
     }
-    
+
     /**
      * 根据ID获取枚举值
+     *
      * @param id ID
      * @return 对应的枚举值，找不到返回null
      */
@@ -119,6 +155,7 @@ public enum IndicatorType {
 
     /**
      * 获取指定模块的指标类型列表
+     *
      * @param module 模块名称
      * @return 指标类型列表
      */

airport-common/src/main/java/com/sundot/airport/common/service/portrait/AbstractModuleIndicatorService.java

@@ -18,47 +18,50 @@ import java.util.Set;
  * @param <T> 模块指标结果类型
  */
 public abstract class AbstractModuleIndicatorService<T extends BaseModuleIndicatorResult> implements ModuleIndicatorService {
-    
+
     private static final Logger log = LoggerFactory.getLogger(AbstractModuleIndicatorService.class);
-    
+
     /**
      * 创建模块特定的结果对象
+     *
      * @return 模块结果对象
      */
     protected abstract T createResult();
-    
+
     /**
      * 获取当前模块支持的指标类型
+     *
      * @return 指标类型列表
      */
     protected abstract Set<IndicatorType> getSupportedIndicatorTypes();
-    
+
     /**
      * 获取所有可用的指标
+     *
      * @return 指标集合
      */
     protected abstract Set<? extends Indicator<?>> getIndicators();
-    
+
     @Override
     public Object calculateIndicators(IndicatorCalculateParams params) {
         T result = createResult();
         result.setModuleName(getModuleName());
-        
+
         // 获取需要计算的指标类型列表
         List<IndicatorType> indicatorTypes = getIndicatorTypesToCalculate(params);
-        
+
         // 获取当前模块名称
         String currentModule = getModuleName();
-        
+
         // 检查是否指定了模块，如果指定了模块但不包含当前模块，则直接返回空结果
-        if (params.getModules() != null && !params.getModules().isEmpty() 
+        if (params.getModules() != null && !params.getModules().isEmpty()
                 && !params.getModules().contains(currentModule)) {
             return null;
         }
-        
+
         // 获取支持的指标类型
         Set<IndicatorType> supportedTypes = getSupportedIndicatorTypes();
-        
+
         for (IndicatorType indicatorType : indicatorTypes) {
             // 处理属于当前模块且被支持的指标类型
             if (currentModule.equals(indicatorType.getModule()) && supportedTypes.contains(indicatorType)) {
@@ -70,19 +73,20 @@ public abstract class AbstractModuleIndicatorService<T extends BaseModuleIndicat
                         // 注意：这里需要子类自己处理如何将指标值设置到结果对象中
                         setIndicatorResult(indicator, result);
                     } catch (Exception e) {
-                        log.error("指标计算出错: 指标名称={}, 模块={}, 错误信息={}", 
+                        log.error("指标计算出错: 指标名称={}, 模块={}, 错误信息={}",
                                 indicator.getName(), getModuleName(), e.getMessage(), e);
                         result.setError(indicator.getName(), e.getMessage());
                     }
                 }
             }
         }
-        
+
         return result;
     }
-    
+
     /**
      * 根据指标类型查找对应的指标实现
+     *
      * @param type 指标类型
      * @return 指标实现
      */
@@ -97,16 +101,18 @@ public abstract class AbstractModuleIndicatorService<T extends BaseModuleIndicat
         }
         return null;
     }
-    
+
     /**
      * 将指标值设置到结果对象中
+     *
      * @param indicator 指标
-     * @param result 结果对象
+     * @param result    结果对象
      */
     protected abstract void setIndicatorResult(Indicator<?> indicator, T result);
-    
+
     /**
      * 根据参数确定需要计算的指标类型列表
+     *
      * @param params 指标计算参数
      * @return 需要计算的指标类型列表
      */

airport-common/src/main/java/com/sundot/airport/common/service/portrait/Indicator.java

@@ -7,31 +7,35 @@ import com.sundot.airport.common.domain.portrait.BaseModuleIndicatorResult;
 /**
  * 指标接口 - 所有具体指标类的父接口
  * 定义了指标类需要实现的基本方法
- * 
+ *
  * @param <T> 指标值的类型
  */
 public interface Indicator<T> {
     /**
      * 获取指标名称
+     *
      * @return 指标名称字符串
      */
     String getName();
-    
+
     /**
      * 获取指标值
+     *
      * @return 指标值
      */
     T getValue();
 
-    
+
     /**
      * 计算指标值（使用参数对象）
+     *
      * @param params 指标计算参数
      */
-     void calculate(IndicatorCalculateParams params);
+    void calculate(IndicatorCalculateParams params);
 
     /**
      * 将指标值设置到结果对象中
+     *
      * @param result 结果对象
      */
     void setResult(BaseModuleIndicatorResult result);

airport-common/src/main/java/com/sundot/airport/common/service/portrait/ModuleIndicatorManager.java

@@ -17,28 +17,29 @@ import java.util.Set;
  */
 @Component
 public class ModuleIndicatorManager {
-    
+
     @Autowired
     private Set<ModuleIndicatorService> moduleIndicatorServices;
-    
+
     private Map<String, ModuleIndicatorService> moduleServiceMap = new HashMap<>();
-    
+
     @PostConstruct
     public void initModuleServiceMap() {
         for (ModuleIndicatorService service : moduleIndicatorServices) {
             moduleServiceMap.put(service.getModuleName(), service);
         }
     }
-    
+
     /**
      * 计算指定模块的指标
-     * @param params 指标计算参数
+     *
+     * @param params      指标计算参数
      * @param moduleNames 模块名称列表
      * @return 模块化指标结果
      */
     public ModularIndicatorResult calculateModuleIndicators(IndicatorCalculateParams params, List<String> moduleNames) {
         ModularIndicatorResult result = new ModularIndicatorResult();
-        
+
         if (moduleNames == null || moduleNames.isEmpty()) {
             // 计算所有模块的指标
             for (Map.Entry<String, ModuleIndicatorService> entry : moduleServiceMap.entrySet()) {
@@ -55,12 +56,13 @@ public class ModuleIndicatorManager {
                 }
             }
         }
-        
+
         return result;
     }
-    
+
     /**
      * 计算所有模块的指标
+     *
      * @param params 指标计算参数
      * @return 模块化指标结果
      */

airport-common/src/main/java/com/sundot/airport/common/service/portrait/ModuleIndicatorService.java

@@ -7,15 +7,17 @@ import com.sundot.airport.common.domain.portrait.IndicatorCalculateParams;
  * 各个模块需要实现此接口来提供自己的指标计算服务
  */
 public interface ModuleIndicatorService {
-    
+
     /**
      * 获取模块名称
+     *
      * @return 模块名称
      */
     String getModuleName();
-    
+
     /**
      * 计算指标数据
+     *
      * @param params 指标计算参数
      * @return 指标结果
      */

airport-item/src/main/java/com/sundot/airport/item/service/portrait/EffectiveSeizureCountIndicator.java

@@ -16,37 +16,37 @@ import java.util.Date;
 
 /**
  * 有效查获数量指标实现类
- * 个人：周期内数量    
+ * 个人：周期内数量
  * 组织：周期内总量
  */
 @Component
 public class EffectiveSeizureCountIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private IItemSeizureStatsService itemSeizureStatsService;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.EFFECTIVE_SEIZURE_COUNT.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
         UserType userType = params.getUserType();
         Long deptId = params.getDeptId();
-        
+
         // 默认查询最近30天的数据
         Date endTime = params.getEndTime();
         Date startTime = params.getStartTime();
-        
+
         if (UserType.PERSONAL.equals(userType)) {
             // 个人：周期内数量
             this.value = itemSeizureStatsService.getPersonalEffectiveSeizureCount(userId, startTime, endTime);
@@ -64,7 +64,7 @@ public class EffectiveSeizureCountIndicator implements Indicator<Object> {
             this.value = itemSeizureStatsService.getTeamEffectiveSeizureCount(deptId, startTime, endTime);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof ItemSeizureModuleIndicatorResult) {

airport-item/src/main/java/com/sundot/airport/item/service/portrait/ItemSeizureModuleIndicatorService.java

@@ -16,17 +16,17 @@ import java.util.*;
  */
 @Service
 public class ItemSeizureModuleIndicatorService extends AbstractModuleIndicatorService<ItemSeizureModuleIndicatorResult> {
-    
+
     @Autowired
     private Set<Indicator<?>> indicators;
-    
+
     private Set<IndicatorType> supportedIndicatorTypes = new HashSet<>();
-    
+
     @Override
     public String getModuleName() {
         return "item";
     }
-    
+
     @PostConstruct
     public void initSupportedIndicatorTypes() {
         // 初始化支持的指标类型
@@ -39,22 +39,22 @@ public class ItemSeizureModuleIndicatorService extends AbstractModuleIndicatorSe
             }
         }
     }
-    
+
     @Override
     protected ItemSeizureModuleIndicatorResult createResult() {
         return new ItemSeizureModuleIndicatorResult();
     }
-    
+
     @Override
     protected Set<IndicatorType> getSupportedIndicatorTypes() {
         return supportedIndicatorTypes;
     }
-    
+
     @Override
     protected Set<Indicator<?>> getIndicators() {
         return indicators;
     }
-    
+
     @Override
     protected void setIndicatorResult(Indicator<?> indicator, ItemSeizureModuleIndicatorResult result) {
         // 直接调用指标的setResult方法，将值设置到结果对象中

airport-item/src/main/java/com/sundot/airport/item/service/portrait/ReferToPoliceCountIndicator.java

@@ -16,33 +16,33 @@ import java.util.Date;
 
 /**
  * 移交公安查获数量指标实现类
- * 个人：周期内数量    
+ * 个人：周期内数量
  * 组织：周期内总量
  */
 @Component
 public class ReferToPoliceCountIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private IItemSeizureStatsService itemSeizureStatsService;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.REFER_TO_POLICE_COUNT.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
         UserType userType = params.getUserType();
         Long deptId = params.getDeptId();
-        
+
         // 默认查询最近30天的数据
         Date endTime = params.getEndTime();
         Date startTime = params.getStartTime();
@@ -65,7 +65,7 @@ public class ReferToPoliceCountIndicator implements Indicator<Object> {
             this.value = itemSeizureStatsService.getTeamReferToPoliceCount(deptId, startTime, endTime);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof ItemSeizureModuleIndicatorResult) {

airport-item/src/main/java/com/sundot/airport/item/service/portrait/WillfulConcealmentCountIndicator.java

@@ -16,33 +16,33 @@ import java.util.Date;
 
 /**
  * 故意隐匿查获数量指标实现类
- * 个人：周期内数量    
+ * 个人：周期内数量
  * 组织：周期内总量
  */
 @Component
 public class WillfulConcealmentCountIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private IItemSeizureStatsService itemSeizureStatsService;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.WILLFUL_CONCEALMENT_COUNT.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
         UserType userType = params.getUserType();
         Long deptId = params.getDeptId();
-        
+
         // 默认查询最近91天的数据
         Date endTime = params.getEndTime();
         Date startTime = params.getStartTime();
@@ -65,7 +65,7 @@ public class WillfulConcealmentCountIndicator implements Indicator<Object> {
             this.value = itemSeizureStatsService.getTeamWillfulConcealmentCount(deptId, startTime, endTime);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof ItemSeizureModuleIndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/AdministrativePenaltyIndicator.java

@@ -19,26 +19,26 @@ import java.util.Objects;
  */
 @Component
 public class AdministrativePenaltyIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private AdministrativePenaltyIndicatorMapper administrativePenaltyIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.ADMINISTRATIVE_PENALTY.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         List<Long> userIds = params.getUserIds();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人行政类处罚情况
@@ -48,7 +48,7 @@ public class AdministrativePenaltyIndicator implements Indicator<Object> {
             this.value = administrativePenaltyIndicatorMapper.queryOrgAdministrativePenaltyStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/AgeIndicator.java

@@ -19,35 +19,42 @@ import java.util.List;
  */
 @Component
 public class AgeIndicator implements Indicator<Object> {
-    
-    /** 指标值 */
+
+    /**
+     * 指标值
+     */
     private Object value;
-    
-    /** 年龄数据访问对象 */
+
+    /**
+     * 年龄数据访问对象
+     */
     @Autowired
     private AgeIndicatorMapper mapper;
-    
+
     /**
      * 获取指标名称
+     *
      * @return 指标名称
      */
     @Override
     public String getName() {
         return IndicatorType.AGE.getCode();
     }
-    
+
     /**
      * 获取指标值
+     *
      * @return 指标值
      */
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     /**
      * 计算指标值
      * 根据用户类型决定是计算个人年龄还是组织年龄统计
+     *
      * @param params 参数
      */
     @Override
@@ -60,10 +67,10 @@ public class AgeIndicator implements Indicator<Object> {
             this.value = mapper.queryPersonalAge(userId);
         } else {
             // 组织年龄统计
-            this.value = mapper.queryOrgAgeStats( userIds, userType);
+            this.value = mapper.queryOrgAgeStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/AvailablePositionsIndicator.java

@@ -24,27 +24,27 @@ import java.util.stream.Collectors;
  */
 @Component
 public class AvailablePositionsIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private AvailablePositionsIndicatorMapper availablePositionsIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.AVAILABLE_POSITIONS.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
-        List<Long> userIds =params.getUserIds();
+        UserType userType = params.getUserType();
+        List<Long> userIds = params.getUserIds();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人可上岗岗位列表
             this.value = availablePositionsIndicatorMapper.queryPersonalAvailablePositions(userId);
@@ -53,9 +53,10 @@ public class AvailablePositionsIndicator implements Indicator<Object> {
             calculateOrgPositionCompetencyStats(userIds);
         }
     }
-    
+
     /**
      * 在服务层计算组织岗位胜任统计，避免复杂SQL
+     *
      * @param userIds 用户ID列表
      */
     private void calculateOrgPositionCompetencyStats(List<Long> userIds) {
@@ -64,34 +65,34 @@ public class AvailablePositionsIndicator implements Indicator<Object> {
         for (Long userId : userIds) {
             positionInfos.addAll(availablePositionsIndicatorMapper.queryPersonalAvailablePositions(userId));
         }
-        
+
         // 统计各岗位的胜任人数
         Map<String, Integer> positionCountMap = new HashMap<>();
         for (PositionInfo positionInfo : positionInfos) {
             String postName = positionInfo.getPostName();
             positionCountMap.put(postName, positionCountMap.getOrDefault(postName, 0) + 1);
         }
-        
+
         // 构造岗位胜任统计列表
         List<PositionCompetencyStats> stats = new ArrayList<>();
         int totalUserCount = userIds.size();
-        
+
         for (Map.Entry<String, Integer> entry : positionCountMap.entrySet()) {
             PositionCompetencyStats stat = new PositionCompetencyStats();
             stat.setPostName(entry.getKey());
             stat.setCompetentCount(entry.getValue());
             stat.setTotalCount(totalUserCount);
-            
+
             // 计算胜任比例
             double percentage = (double) entry.getValue() / totalUserCount;
             stat.setPercentage(Math.round(percentage * 100.0) / 100.0); // 保留两位小数
-            
+
             stats.add(stat);
         }
-        
+
         this.value = stats;
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/EducationIndicator.java

@@ -18,26 +18,26 @@ import java.util.List;
  */
 @Component
 public class EducationIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private EducationIndicatorMapper educationIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.EDUCATION.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         List<Long> userIds = params.getUserIds();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人学历情况
@@ -47,7 +47,7 @@ public class EducationIndicator implements Indicator<Object> {
             this.value = educationIndicatorMapper.queryOrgEducationStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/PhysicalHealthIndicator.java

@@ -20,41 +20,48 @@ import java.util.Objects;
  */
 @Component
 public class PhysicalHealthIndicator implements Indicator<Object> {
-    
-    /** 指标值 */
+
+    /**
+     * 指标值
+     */
     private Object value;
-    
-    /** 身体健康状况数据访问对象 */
+
+    /**
+     * 身体健康状况数据访问对象
+     */
     @Autowired
     private PhysicalHealthIndicatorMapper mapper;
-    
+
     /**
      * 获取指标名称
+     *
      * @return 指标名称
      */
     @Override
     public String getName() {
         return IndicatorType.PHYSICAL_HEALTH_STATUS.getCode();
     }
-    
+
     /**
      * 获取指标值
+     *
      * @return 指标值
      */
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     /**
      * 计算指标值
      * 根据用户类型决定是计算个人身体健康状况还是组织身体健康状况统计
+     *
      * @param params 用户ID、用户类型、部门ID
      */
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         List<Long> userIds = params.getUserIds();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人身体健康状况
@@ -64,7 +71,7 @@ public class PhysicalHealthIndicator implements Indicator<Object> {
             this.value = mapper.queryOrgHealthStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/PoliticalReviewIndicator.java

@@ -18,26 +18,26 @@ import java.util.List;
  */
 @Component
 public class PoliticalReviewIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private PoliticalReviewIndicatorMapper politicalReviewIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.POLITICAL_REVIEW_STATUS.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         List<Long> userIds = params.getUserIds();
 
         if (UserType.PERSONAL.equals(userType)) {
@@ -48,7 +48,7 @@ public class PoliticalReviewIndicator implements Indicator<Object> {
             this.value = politicalReviewIndicatorMapper.queryOrgPoliticalReviewStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/PoliticalStatusIndicator.java

@@ -17,26 +17,26 @@ import java.util.List;
  */
 @Component
 public class PoliticalStatusIndicator implements Indicator<Object> {
-    
+
     private Object value;
-    
+
     @Autowired
     private PoliticalStatusIndicatorMapper mapper;
-    
+
     @Override
     public String getName() {
         return IndicatorType.POLITICAL_STATUS.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         List<Long> userIds = params.getUserIds();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人政治面貌
@@ -46,7 +46,7 @@ public class PoliticalStatusIndicator implements Indicator<Object> {
             this.value = mapper.queryOrgPoliticalStatusStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/QualificationLevelIndicator.java

@@ -23,42 +23,49 @@ import java.util.stream.Collectors;
  */
 @Component
 public class QualificationLevelIndicator implements Indicator<Object> {
-    
-    /** 指标值 */
+
+    /**
+     * 指标值
+     */
     private Object value;
-    
-    /** 资质等级数据访问对象 */
+
+    /**
+     * 资质等级数据访问对象
+     */
     @Autowired
     private QualificationLevelIndicatorMapper mapper;
 
-    
+
     /**
      * 获取指标名称
+     *
      * @return 指标名称
      */
     @Override
     public String getName() {
         return IndicatorType.QUALIFICATION_LEVEL.getCode();
     }
-    
+
     /**
      * 获取指标值
+     *
      * @return 指标值
      */
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     /**
      * 计算指标值
      * 根据用户类型决定是计算个人资质等级还是组织资质等级统计
+     *
      * @param params 用户ID、用户类型、部门ID
      */
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         List<Long> userIds = params.getUserIds();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人资质等级
@@ -68,7 +75,7 @@ public class QualificationLevelIndicator implements Indicator<Object> {
             this.value = mapper.queryOrgQualificationLevelStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/SecurityWorkPositionIndicator.java

@@ -16,26 +16,26 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SecurityWorkPositionIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private SecurityWorkPositionIndicatorMapper securityWorkPositionIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.SECURITY_WORK_POSITION.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人在安检工作中担任过的最高职务
             this.value = securityWorkPositionIndicatorMapper.queryPersonalSecurityWorkPosition(userId);
@@ -44,7 +44,7 @@ public class SecurityWorkPositionIndicator implements Indicator<Object> {
             this.value = securityWorkPositionIndicatorMapper.queryOrgSecurityWorkPositionStats(params.getUserIds(), userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/SecurityWorkYearsIndicator.java

@@ -16,26 +16,26 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SecurityWorkYearsIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private WorkExperienceIndicatorMapper workExperienceIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.SECURITY_WORK_YEARS.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人安检工作年限
             this.value = workExperienceIndicatorMapper.queryPersonalSecurityWorkYears(userId);
@@ -44,7 +44,7 @@ public class SecurityWorkYearsIndicator implements Indicator<Object> {
             this.value = workExperienceIndicatorMapper.queryOrgSecurityWorkYearsStats(params.getUserIds(), userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/SystemModuleIndicatorService.java

@@ -16,17 +16,17 @@ import java.util.*;
  */
 @Service
 public class SystemModuleIndicatorService extends AbstractModuleIndicatorService<IndicatorResult> {
-    
+
     @Autowired
     private Set<Indicator<?>> indicators;
-    
+
     private Set<IndicatorType> supportedIndicatorTypes = new HashSet<>();
-    
+
     @Override
     public String getModuleName() {
         return "system";
     }
-    
+
     @PostConstruct
     public void initSupportedIndicatorTypes() {
         // 初始化支持的指标类型
@@ -39,22 +39,22 @@ public class SystemModuleIndicatorService extends AbstractModuleIndicatorService
             }
         }
     }
-    
+
     @Override
     protected IndicatorResult createResult() {
         return new IndicatorResult();
     }
-    
+
     @Override
     protected Set<IndicatorType> getSupportedIndicatorTypes() {
         return supportedIndicatorTypes;
     }
-    
+
     @Override
     protected Set<Indicator<?>> getIndicators() {
         return indicators;
     }
-    
+
     @Override
     protected void setIndicatorResult(Indicator<?> indicator, IndicatorResult result) {
         // 直接调用指标的setResult方法，将值设置到结果对象中

airport-system/src/main/java/com/sundot/airport/system/service/portrait/UserPortraitService.java

@@ -15,27 +15,27 @@ import java.util.Set;
  */
 @Service
 public class UserPortraitService {
-    
+
     @Autowired
     private Set<Indicator<?>> indicators;
-    
+
     @Autowired
     private ModuleIndicatorManager moduleIndicatorManager;
-    
+
     /**
      * 获取模块化指标数据
-     * 
+     *
      * @param params 用户ID、用户类型、模块列表等参数
      * @return 模块化指标结果
      */
     public ModularIndicatorResult getIndicators(IndicatorCalculateParams params) {
         return moduleIndicatorManager.calculateAllModuleIndicators(params);
     }
-    
+
     /**
      * 获取指定模块的指标数据
-     * 
-     * @param params 用户ID、用户类型、模块列表等参数
+     *
+     * @param params      用户ID、用户类型、模块列表等参数
      * @param moduleNames 指定的模块名称列表
      * @return 模块化指标结果
      */

airport-system/src/main/java/com/sundot/airport/system/service/portrait/WorkPenaltiesIndicator.java

@@ -18,22 +18,22 @@ import java.util.List;
  */
 @Component
 public class WorkPenaltiesIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private RewardPenaltyIndicatorMapper rewardPenaltyIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.WORK_PENALTIES.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
@@ -47,7 +47,7 @@ public class WorkPenaltiesIndicator implements Indicator<Object> {
             this.value = rewardPenaltyIndicatorMapper.queryOrgWorkPenaltiesStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/WorkRewardsIndicator.java

@@ -18,22 +18,22 @@ import java.util.List;
  */
 @Component
 public class WorkRewardsIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private RewardPenaltyIndicatorMapper rewardPenaltyIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.WORK_REWARDS.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
@@ -47,7 +47,7 @@ public class WorkRewardsIndicator implements Indicator<Object> {
             this.value = rewardPenaltyIndicatorMapper.queryOrgWorkRewardsStats(userIds, userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {

airport-system/src/main/java/com/sundot/airport/system/service/portrait/WorkYearsIndicator.java

@@ -16,26 +16,26 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class WorkYearsIndicator implements Indicator<Object> {
-    
+
     @Autowired
     private WorkExperienceIndicatorMapper workExperienceIndicatorMapper;
-    
+
     private Object value;
-    
+
     @Override
     public String getName() {
         return IndicatorType.WORK_YEARS.getCode();
     }
-    
+
     @Override
     public Object getValue() {
         return value;
     }
-    
+
     @Override
     public void calculate(IndicatorCalculateParams params) {
         Long userId = params.getUserId();
-        UserType userType =params.getUserType();
+        UserType userType = params.getUserType();
         if (UserType.PERSONAL.equals(userType)) {
             // 个人工作年限
             this.value = workExperienceIndicatorMapper.queryPersonalWorkYears(userId);
@@ -44,7 +44,7 @@ public class WorkYearsIndicator implements Indicator<Object> {
             this.value = workExperienceIndicatorMapper.queryOrgWorkYearsStats(params.getUserIds(), userType);
         }
     }
-    
+
     @Override
     public void setResult(BaseModuleIndicatorResult result) {
         if (result instanceof IndicatorResult) {