Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 drone-service/drone-fw/src/main/java/org/sxkj/fw/cockpit/service/impl/CockpitServiceImpl.java

@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.area.param.FwAreaDivideListParam;
import org.sxkj.fw.area.service.IFwAreaDivideService;
import org.sxkj.fw.area.service.IFwDefenseSceneManageService;
import org.sxkj.fw.area.vo.FwAreaDivideVO;
@@ -12,6 +14,7 @@
import org.sxkj.fw.cockpit.service.ICockpitService;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
import org.sxkj.fw.cockpit.vo.DeviceStatisticsVO;
import org.sxkj.fw.common.FwBaseInfo;
import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
import org.sxkj.fw.detection.param.FwEffectEvalParam;
import org.sxkj.fw.detection.service.IFwEffectEvalService;
@@ -70,7 +73,6 @@

   @Override
   public List<DeviceStatisticsVO> statisticalDeviceType() {
      // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
      Region byCode = RegionCache.getByCode(dept.getAreaCode());
      return fwDeviceService.statisticalDeviceType(HeaderUtils.formatAreaCode(byCode.getCode()), AuthUtil.getDeptId());
@@ -117,7 +119,6 @@

   @Override
   public AlarmStatisticsVO statisticsAlarmsAndDeviceRecords() {
      // List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
      Region byCode = RegionCache.getByCode(dept.getAreaCode());
      String regionCode = HeaderUtils.formatAreaCode(byCode.getCode());
@@ -151,7 +152,12 @@
    */
   @Override
   public List<FwDefenseSceneManageVO> selectFwDefenseSceneManageList(Date filterTime) {
      return iFwDefenseSceneManageService.selectFwDefenseSceneManageList(filterTime);
      FwBaseInfo fwBaseInfo = new FwBaseInfo();
      Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
      Region byCode = RegionCache.getByCode(dept.getAreaCode());
      fwBaseInfo.setCurrentDeptId(AuthUtil.getDeptId());
      fwBaseInfo.setRegionCode(HeaderUtils.formatAreaCode(byCode.getCode()));
      return iFwDefenseSceneManageService.selectFwDefenseSceneManageCockpitList(fwBaseInfo);
   }

   /**
@@ -165,6 +171,18 @@
    */
   @Override
   public List<FwAreaDivideVO> selectFwAreaDivideList(Integer filterSelected, Long sceneId, String areaTypeKeys, Integer isSetSceneManage, LocalDateTime flyTime) {
      return iFwAreaDivideService.selectFwAreaDivideList(filterSelected, sceneId, areaTypeKeys, isSetSceneManage, flyTime);
      FwAreaDivideListParam fwAreaDivideListParam = new FwAreaDivideListParam();
      fwAreaDivideListParam.setFilterSelected(filterSelected);
      fwAreaDivideListParam.setSceneId(sceneId);
      fwAreaDivideListParam.setAreaTypeKeys(areaTypeKeys);
      fwAreaDivideListParam.setIsSetSceneManage(isSetSceneManage);
      fwAreaDivideListParam.setFlyTime(flyTime);
      // 解析区域类型键值列表
      fwAreaDivideListParam.setAreaTypeKeyList(Func.toStrList(areaTypeKeys));
      Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
      Region byCode = RegionCache.getByCode(dept.getAreaCode());
      fwAreaDivideListParam.setCurrentDeptId(AuthUtil.getDeptId());
      fwAreaDivideListParam.setRegionCode(HeaderUtils.formatAreaCode(byCode.getCode()));
      return iFwAreaDivideService.selectFwAreaDivideList(fwAreaDivideListParam);
   }
}