首页-巡检

airport-admin/src/main/java/com/sundot/airport/web/controller/check/CheckLargeScreenController.java

@@ -206,8 +206,8 @@ public class CheckLargeScreenController extends BaseController {
 //            unless = "!T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isSuccess(#result) ||T(com.sundot.airport.common.cache.StatisticsCacheConditionUtil).isEmptyData(#result)"
 //    )
     @GetMapping("/homePage")
-    public AjaxResult homePage(BaseLargeScreenQueryParamDto dto) {
-        CheckLargeScreenHomePageDto result = checkLargeScreenService.homePage(dto);
+    public AjaxResult homePage(BaseLargeScreenQueryParamDto dto, @RequestHeader(value = "X-Request-Source", defaultValue = "mobile") String source) {
+        CheckLargeScreenHomePageDto result = checkLargeScreenService.homePage(dto, source);
         return success(result);
     }
 

airport-check/src/main/java/com/sundot/airport/check/domain/CheckLargeScreenHomePageUserInfoSqlDto.java

@@ -1,69 +0,0 @@
-package com.sundot.airport.check.domain;
-
-import lombok.Data;
-
-/**
- * 首页-用户信息
- *
- * @author ruoyi
- * @date 2025-09-07
- */
-@Data
-public class CheckLargeScreenHomePageUserInfoSqlDto {
-
-    /**
-     * 用户ID
-     */
-    private Long userId;
-
-    /**
-     * 用户账号
-     */
-    private String userName;
-
-    /**
-     * 用户昵称
-     */
-    private String nickName;
-
-    /**
-     * 班组ID
-     */
-    private Long teamId;
-
-    /**
-     * 班组名称
-     */
-    private String teamName;
-
-    /**
-     * 科室ID
-     */
-    private Long departmentId;
-
-    /**
-     * 科室名称
-     */
-    private String departmentName;
-
-    /**
-     * 大队ID
-     */
-    private Long brigadeId;
-
-    /**
-     * 大队名称
-     */
-    private String brigadeName;
-
-    /**
-     * 站ID
-     */
-    private Long stationId;
-
-    /**
-     * 站名称
-     */
-    private String stationName;
-
-}

airport-check/src/main/java/com/sundot/airport/check/mapper/CheckLargeScreenMapper.java

@@ -7,7 +7,6 @@ import com.sundot.airport.check.domain.CheckLargeScreenCorrectionPortraitSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageCheckCorrectionSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageCheckRecordSqlDto;
-import com.sundot.airport.check.domain.CheckLargeScreenHomePageUserInfoSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteItemDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteUserDto;
@@ -237,13 +236,6 @@ public interface CheckLargeScreenMapper {
     public CheckLargeScreenCorrectionDto managementPromotionCorrection(CheckLargeScreenCorrectionQueryParamDto dto);
 
     /**
-     * 首页-用户信息
-     *
-     * @return 首页-巡检单
-     */
-    public List<CheckLargeScreenHomePageUserInfoSqlDto> homePageUserInfo();
-
-    /**
      * 首页-巡检单
      *
      * @param dto 查询参数

airport-check/src/main/java/com/sundot/airport/check/service/ICheckLargeScreenService.java

@@ -161,7 +161,7 @@ public interface ICheckLargeScreenService {
      * @param dto 首页查询参数
      * @return 首页
      */
-    public CheckLargeScreenHomePageDto homePage(BaseLargeScreenQueryParamDto dto);
+    public CheckLargeScreenHomePageDto homePage(BaseLargeScreenQueryParamDto dto, String source);
 
     /**
      * 首页-巡检-巡检合格率

airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckLargeScreenServiceImpl.java

@@ -16,7 +16,6 @@ import com.sundot.airport.check.domain.CheckLargeScreenCorrectionQueryParamDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageCheckCorrectionSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageCheckRecordSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenHomePageDto;
-import com.sundot.airport.check.domain.CheckLargeScreenHomePageUserInfoSqlDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteItemDto;
 import com.sundot.airport.check.domain.CheckLargeScreenInspectionExecuteUserDto;
@@ -32,6 +31,7 @@ import com.sundot.airport.common.constant.CacheConstants;
 import com.sundot.airport.common.core.domain.BaseLargeScreenQueryParamDto;
 import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageItemDto;
 import com.sundot.airport.common.core.domain.CheckLargeScreenHomePageRankingDto;
+import com.sundot.airport.common.core.domain.LargeScreenHomePageUserInfoSqlDto;
 import com.sundot.airport.common.core.domain.SysLargeScreenDetailDto;
 import com.sundot.airport.common.core.domain.entity.SysDept;
 import com.sundot.airport.common.core.domain.entity.SysDictData;
@@ -2036,7 +2036,18 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
      * @return 首页
      */
     @Override
-    public CheckLargeScreenHomePageDto homePage(BaseLargeScreenQueryParamDto dto) {
+    public CheckLargeScreenHomePageDto homePage(BaseLargeScreenQueryParamDto dto, String source) {
+        if (StrUtil.equals(SourceTypeEnum.web.getCode(), source)) {
+            List<SysDept> sysDeptList = sysDeptService.selectAllDept(SecurityUtils.getLoginUser().getDeptId());
+            Collections.reverse(sysDeptList);
+            SysDept sysDept = sysDeptList.stream().filter(x -> StrUtil.equals(DeptType.STATION.getCode(), x.getDeptType())).findFirst().orElse(null);
+            if (ObjectUtil.isNull(sysDept)) {
+                throw new ServiceException("未查询到站级部门信息");
+            }
+            dto.setUserId(null);
+            dto.setDeptId(sysDept.getDeptId());
+        }
+
         if (ObjUtil.isNull(dto.getUserId()) && ObjUtil.isNull(dto.getDeptId())) {
             throw new ServiceException("用户ID和部门ID不能同时为空");
         }
@@ -2396,47 +2407,47 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
     @Override
     public List<CheckLargeScreenHomePageItemDto> getCheckLargeScreenHomePageItemDtoList(BaseLargeScreenQueryParamDto dto) {
         List<CheckLargeScreenHomePageItemDto> result = new ArrayList<>();
-        String key = CacheConstants.USER_CHECK_PASS_RATE_KEY + dto.getStartDate() + ":" + dto.getEndDate() + ":" + dto.getSpecifiedDate();
-        List<CheckLargeScreenHomePageItemDto> cacheList = redisCache.getCacheList(key);
-        if (CollUtil.isNotEmpty(cacheList)) {
-            result.addAll(cacheList);
-        } else {
-            List<CheckLargeScreenHomePageUserInfoSqlDto> userInfoListAll = checkLargeScreenMapper.homePageUserInfo();
-            if (CollUtil.isEmpty(userInfoListAll)) {
-                return Collections.emptyList();
-            }
-            List<CheckLargeScreenHomePageCheckRecordSqlDto> checkRecordListAll = checkLargeScreenMapper.homePageCheckRecord(dto);
-            if (CollUtil.isEmpty(checkRecordListAll)) {
-                return Collections.emptyList();
-            }
-            userInfoListAll.forEach(userInfoSqlDto -> {
-                CheckLargeScreenHomePageItemDto itemDto = new CheckLargeScreenHomePageItemDto();
-                itemDto.setId(userInfoSqlDto.getUserId());
-                itemDto.setName(userInfoSqlDto.getNickName());
-                List<CheckLargeScreenHomePageCheckRecordSqlDto> brigadeList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.BRIGADE_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getBrigadeId(), checkRecordSqlDto.getCheckedBrigadeId())).collect(Collectors.toList());
-                long brigadeTotal = brigadeList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long brigadeUnqualifiedNum = brigadeList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long brigadeQualifiedNum = brigadeTotal - brigadeUnqualifiedNum;
-                List<CheckLargeScreenHomePageCheckRecordSqlDto> departmentList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.DEPARTMENT_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getDepartmentId(), checkRecordSqlDto.getCheckedDepartmentId())).collect(Collectors.toList());
-                long departmentTotal = departmentList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long departmentUnqualifiedNum = departmentList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long departmentQualifiedNum = departmentTotal - departmentUnqualifiedNum;
-                List<CheckLargeScreenHomePageCheckRecordSqlDto> teamList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.TEAM_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getTeamId(), checkRecordSqlDto.getCheckedTeamId())).collect(Collectors.toList());
-                long teamTotal = teamList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long teamUnqualifiedNum = teamList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long teamQualifiedNum = teamTotal - teamUnqualifiedNum;
-                List<CheckLargeScreenHomePageCheckRecordSqlDto> personalList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.PERSONNEL_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getUserId(), checkRecordSqlDto.getCheckedPersonnelId())).collect(Collectors.toList());
-                long personalTotal = personalList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long personalUnqualifiedNum = personalList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
-                long personalQualifiedNum = personalTotal - personalUnqualifiedNum;
-                long total = personalTotal + teamTotal + departmentTotal + brigadeTotal;
-                long qualifiedNum = brigadeQualifiedNum + departmentQualifiedNum + teamQualifiedNum + personalQualifiedNum;
-                itemDto.setPassRate(total == 0 ? BigDecimal.ONE : new BigDecimal(qualifiedNum).divide(new BigDecimal(total), 4, RoundingMode.HALF_UP));
-                result.add(itemDto);
-            });
-            redisCache.setCacheList(key, result);
-            redisCache.expire(key, 6, TimeUnit.HOURS);
+//        String key = CacheConstants.USER_CHECK_PASS_RATE_KEY + dto.getStartDate() + ":" + dto.getEndDate() + ":" + dto.getSpecifiedDate();
+//        List<CheckLargeScreenHomePageItemDto> cacheList = redisCache.getCacheList(key);
+//        if (CollUtil.isNotEmpty(cacheList)) {
+//            result.addAll(cacheList);
+//        } else {
+        List<LargeScreenHomePageUserInfoSqlDto> userInfoListAll = sysUserService.homePageUserInfo();
+        if (CollUtil.isEmpty(userInfoListAll)) {
+            return Collections.emptyList();
         }
+        List<CheckLargeScreenHomePageCheckRecordSqlDto> checkRecordListAll = checkLargeScreenMapper.homePageCheckRecord(dto);
+        if (CollUtil.isEmpty(checkRecordListAll)) {
+            return Collections.emptyList();
+        }
+        userInfoListAll.forEach(userInfoSqlDto -> {
+            CheckLargeScreenHomePageItemDto itemDto = new CheckLargeScreenHomePageItemDto();
+            itemDto.setId(userInfoSqlDto.getUserId());
+            itemDto.setName(userInfoSqlDto.getNickName());
+            List<CheckLargeScreenHomePageCheckRecordSqlDto> brigadeList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.BRIGADE_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getBrigadeId(), checkRecordSqlDto.getCheckedBrigadeId())).collect(Collectors.toList());
+            long brigadeTotal = brigadeList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long brigadeUnqualifiedNum = brigadeList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long brigadeQualifiedNum = brigadeTotal - brigadeUnqualifiedNum;
+            List<CheckLargeScreenHomePageCheckRecordSqlDto> departmentList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.DEPARTMENT_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getDepartmentId(), checkRecordSqlDto.getCheckedDepartmentId())).collect(Collectors.toList());
+            long departmentTotal = departmentList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long departmentUnqualifiedNum = departmentList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long departmentQualifiedNum = departmentTotal - departmentUnqualifiedNum;
+            List<CheckLargeScreenHomePageCheckRecordSqlDto> teamList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.TEAM_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getTeamId(), checkRecordSqlDto.getCheckedTeamId())).collect(Collectors.toList());
+            long teamTotal = teamList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long teamUnqualifiedNum = teamList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long teamQualifiedNum = teamTotal - teamUnqualifiedNum;
+            List<CheckLargeScreenHomePageCheckRecordSqlDto> personalList = checkRecordListAll.stream().filter(checkRecordSqlDto -> StrUtil.equals(checkRecordSqlDto.getCheckedLevel(), CheckLevelEnum.PERSONNEL_LEVEL.getCode()) && ObjUtil.equals(userInfoSqlDto.getUserId(), checkRecordSqlDto.getCheckedPersonnelId())).collect(Collectors.toList());
+            long personalTotal = personalList.stream().map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long personalUnqualifiedNum = personalList.stream().filter(item -> ObjUtil.equals(userInfoSqlDto.getUserId(), item.getUserId())).map(CheckLargeScreenHomePageCheckRecordSqlDto::getId).distinct().count();
+            long personalQualifiedNum = personalTotal - personalUnqualifiedNum;
+            long total = personalTotal + teamTotal + departmentTotal + brigadeTotal;
+            long qualifiedNum = brigadeQualifiedNum + departmentQualifiedNum + teamQualifiedNum + personalQualifiedNum;
+            itemDto.setPassRate(total == 0 ? BigDecimal.ONE : new BigDecimal(qualifiedNum).divide(new BigDecimal(total), 4, RoundingMode.HALF_UP));
+            result.add(itemDto);
+        });
+//            redisCache.setCacheList(key, result);
+//            redisCache.expire(key, 6, TimeUnit.HOURS);
+//        }
         return result;
     }
 

airport-check/src/main/resources/mapper/check/CheckLargeScreenMapper.xml

@@ -784,29 +784,6 @@
         </if>) temp
     </select>
 
-    <select id="homePageUserInfo" resultType="com.sundot.airport.check.domain.CheckLargeScreenHomePageUserInfoSqlDto">
-        select su.user_id      userId,
-               su.user_name    userName,
-               su.nick_name    nickName,
-               sd_bz.dept_id   teamId,
-               sd_bz.dept_name teamName,
-               sd_ks.dept_id   departmentId,
-               sd_ks.dept_name departmentName,
-               sd_dd.dept_id   brigadeId,
-               sd_dd.dept_name brigadeName,
-               sd_zj.dept_id   stationId,
-               sd_zj.dept_name stationName
-        from sys_user su
-                 inner join sys_user_role sur on sur.user_id = su.user_id
-                 inner join sys_role sr on sr.role_id = sur.role_id
-                 inner join sys_dept sd_bz on sd_bz.dept_id = su.dept_id
-                 inner join sys_dept sd_ks on sd_ks.dept_id = sd_bz.parent_id
-                 inner join sys_dept sd_dd on sd_dd.dept_id = sd_ks.parent_id
-                 inner join sys_dept sd_zj on sd_zj.dept_id = sd_dd.parent_id
-        where 1 = 1
-          and sr.role_key in ('banzuzhang', 'SecurityCheck')
-    </select>
-
     <select id="homePageCheckRecord"
             resultType="com.sundot.airport.check.domain.CheckLargeScreenHomePageCheckRecordSqlDto">
         select cr.id id,