多余引入删除

zrj

2024-06-19 58715511dc96ed1fbe30c82a705b096f445a87f6

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

@@ -1,19 +1,15 @@
package cn.gistack.sm.damSecurity.service.impl;

import cn.gistack.nky.entity.AlarmGet;
import cn.gistack.nky.vo.AlarmGetVO;
import cn.gistack.sm.damSecurity.mapper.DamSecurityMapper;
import cn.gistack.sm.damSecurity.service.IDamSecurityService;
import cn.gistack.sm.damSecurity.vo.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mysql.cj.protocol.x.ReusableInputStream;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -30,8 +26,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,12 +43,18 @@

   @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
   public List<DamStationStatistics> alarmResCount(DamStationStatistics damStationStatistics,String basCode) {
      return damSecurityMapper.alarmResCount(damStationStatistics,basCode);
   }

   @Override
   public List<DamStationStatistics> alarmResCount(DamMonitor damMonitor) {
      return damSecurityMapper.alarmResCountByZt(damMonitor);
   }

   @Override
@@ -142,11 +150,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 +162,67 @@
      }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;
   }



   @Override
   public DamStatisticsRes damResInfoCountOptimizeType(String adCode, String type) {

      if (type.equals("sy")){
         return  damSecurityMapper.damResInfoCountSy(adCode);
      }else if(type.equals("sl")) {
         return damSecurityMapper.damResInfoCountSl(adCode);
      }else if (type.equals("wy")){
         return damSecurityMapper.damResInfoCountWy(adCode);
      }

      return null;
   }

   @Override
   public List<AlarmGetVO> getLatestResRecord(AlarmGet alarmGet) {

      if (StringUtil.isBlank(alarmGet.getDamId())){
         throw new ServiceException("水库编码为空");
      }

      if (StringUtil.isBlank(alarmGet.getType())){
         throw new ServiceException("监测类型为空");
      }

      if (alarmGet.getType().equals("3")){
         //位移，单独取测站名称
         return damSecurityMapper.getLatestResRecordWy(alarmGet);
      }else{
         return damSecurityMapper.getLatestResRecord(alarmGet);
      }
   }

}