大坝监测预警接口逻辑修改

guoshilong

2024-01-23 5b1aa6d3fd9c43ae87366148bfd3574e561efebb

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java

@@ -30,8 +30,14 @@
   }

   @Override
   public DamSecurityStatistics getSingleRegionCountOptimize(DamSecurityStatistics damSecurityStatistics) {
      return damSecurityMapper.getSingleRegionCountOptimize(damSecurityStatistics);
   }

   @Override
   public List<DamSecurityStatistics> listRegionCount(DamSecurityStatistics damSecurityStatistics) {
      return damSecurityMapper.listRegionCount(damSecurityStatistics);
//      return damSecurityMapper.listRegionCount(damSecurityStatistics);
      return damSecurityMapper.listRegionCountOptimize(damSecurityStatistics);
   }

   @Override
@@ -41,7 +47,8 @@

   @Override
   public IPage<DamStationStatistics> tableResCountPage(DamStationStatistics damStationStatistics, IPage<DamStationStatistics> page) {
      return page.setRecords(damSecurityMapper.tableResCountPage(damStationStatistics,page));
//      return page.setRecords(damSecurityMapper.tableResCountPage(damStationStatistics,page));
      return page.setRecords(damSecurityMapper.tableResCountPageOptimize(damStationStatistics,page));
   }

   @Override
@@ -142,11 +149,11 @@
      if (damStatisticsRegion.getStatus().equals("total")){
         //点击总数
         if (damStatisticsRegion.getType().equals("sy")){
            list = damSecurityMapper.getDamSyRegion(damStatisticsRegion);
            list = damSecurityMapper.getDamSyRegion(damStatisticsRegion);//已修改逻辑
         }else if (damStatisticsRegion.getType().equals("sl")){
            list = damSecurityMapper.getDamSlRegion(damStatisticsRegion);
            list = damSecurityMapper.getDamSlRegion(damStatisticsRegion);//1
         }else if (damStatisticsRegion.getType().equals("wy")){
            list = damSecurityMapper.getDamWyRegion(damStatisticsRegion);
            list = damSecurityMapper.getDamWyRegion(damStatisticsRegion);//1
         }
      }else if (damStatisticsRegion.getStatus().equals("error")){
         //点异常
@@ -154,14 +161,29 @@
      }else if (damStatisticsRegion.getStatus().equals("normal")){
         //点正常
         if (damStatisticsRegion.getType().equals("sy")){
            list = damSecurityMapper.getDamSyRegionNormal(damStatisticsRegion);
            list = damSecurityMapper.getDamSyRegionNormal(damStatisticsRegion);//1
         }else if (damStatisticsRegion.getType().equals("sl")){
            list = damSecurityMapper.getDamSlRegionNormal(damStatisticsRegion);
            list = damSecurityMapper.getDamSlRegionNormal(damStatisticsRegion);//1
         }else if (damStatisticsRegion.getType().equals("wy")){
            list = damSecurityMapper.getDamWyRegionNormal(damStatisticsRegion);
            list = damSecurityMapper.getDamWyRegionNormal(damStatisticsRegion);//1
         }
      }

      return list;
   }

   @Override
   public List<DamStatisticsRes> damResInfoCountOptimize(String adCode) {

      List<DamStatisticsRes> list = new ArrayList<>();
      DamStatisticsRes sy = damSecurityMapper.damResInfoCountSy(adCode);
      DamStatisticsRes sl = damSecurityMapper.damResInfoCountSl(adCode);
      DamStatisticsRes wy = damSecurityMapper.damResInfoCountWy(adCode);

      list.add(sy);
      list.add(sl);
      list.add(wy);
      return list;
   }

}