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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java

@@ -3,13 +3,12 @@
import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.vo.AttAdBaseVO;
import cn.gistack.sm.sjztmd.vo.AttResAdVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO;
import cn.gistack.sm.sjztmd.vo.AttResBaseVO;
import cn.gistack.sm.sjztmd.excel.AttResBaseUserExcel;
import cn.gistack.sm.sjztmd.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -24,9 +23,9 @@

    IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase);

   IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);
   Object selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase);

   IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj);
   IPage<AttResBaseVO> getListByRegion(IPage<AttResBaseVO> page,Map<String, Object> obj);

   AttResBase getDetailByCode(String code);

@@ -65,4 +64,19 @@
    * @return
    */
   Integer getWaterCountByResNameAndCountyName(String resName, String countyName);

   /**
    * 获取水库的行政区划以及行政区划等级
    * @param resId
    * @return
    */
   AttResAdVO getResAd(String resId);

    AttAdBase getYwxtResInfo(String cityName, String countyName);

   List<AttResBaseUserExcel> exportAttResBaseUser(Map<String, Object> params);

   List<AttResWithRainfall> getAttResByRainfall(String minRainfall, String maxRainfall, String dayIndex) ;

   int[] getAttResNumByRainfall(String dayIndex);
}