Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-04-18 f2d0713c2b20a6c751399e2468996eafb8812988

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

@@ -1,5 +1,6 @@
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;
@@ -7,7 +8,9 @@
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.log.exception.ServiceException;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -205,4 +208,23 @@
      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);
      }
   }

}