fix: 优化逻辑

backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java

@@ -879,6 +879,13 @@ public class FishDraftDataController {
             }
         }
 
+        if (data.getHbrvcd() != null && !data.getHbrvcd().isEmpty()) {
+            String hbrvcd = fishImportService.resolveHbrvcdCode(data.getRvcd(), data.getRvcd());
+            if (hbrvcd == null) {
+                warnings.add("hbrvcd");
+            }
+        }
+
         if (data.getTm() == null) {
             warnings.add("tm");
         }

backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java

@@ -215,6 +215,19 @@ public class FishDraftData implements Serializable {
     @TableField(exist = false)
     private String rvcd;
 
+    /**
+     * 基地流域编码
+     */
+    @TableField(exist = false)
+    private String hbrvcd;
+
+    /**
+     * 基地流域编码
+     */
+    @TableField(exist = false)
+    private String hbrvnm;
+
+
     /**
      * 设施名称
      */

backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java

@@ -16,6 +16,8 @@ public class FishImportResult {
     public static final String STATUS_FAILED = "FAILED";
 
     private List<FishImportRow> rows;
+    private List<FishImportRow> successRows;
+    private List<FishImportRow> failedRows;
     private List<String> unrecognizedFields;
     private Map<String, String> imageFiles;
     private Map<String, String> videoFiles;

backend/src/main/java/com/yfd/platform/data/domain/vo/FishDraftDataVO.java

@@ -1,5 +1,6 @@
 package com.yfd.platform.data.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -231,4 +232,14 @@ public class FishDraftDataVO implements Serializable {
      * 删除人名称
      */
     private String deletedByName;
+
+    /**
+     * 基地流域编码
+     */
+    private String hbrvcd;
+
+    /**
+     * 基地流域编码
+     */
+    private String hbrvnm;
 }

backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java

@@ -27,7 +27,7 @@ public interface FishDraftDataMapper extends BaseMapper<FishDraftData> {
                                          @Param("status") String status,
                                          @Param("ftp") String ftp,
                                          @Param("startTime") String startTime,
-                                         @Param("endTime") String endTime,@Param("userId") String userId);
+                                         @Param("endTime") String endTime,@Param("userId") String userId,@Param("hbrvcd") String hbrvcd);
 
     /**
      * 关联查询过鱼数据（不分页）

backend/src/main/java/com/yfd/platform/data/service/IFishImportService.java

@@ -36,7 +36,7 @@ public interface IFishImportService {
     String resolveFishDictCode(String code,String name);
     String resolveBaseCode(String code,String baseName);
     String resolveRiverCode(String code,String riverName);
-
+    String resolveHbrvcdCode(String code,String riverName);
     String resolveDirection(String direction, FishImportResult.FishImportRow importRow);
 
     String resolveIsfs(String value, FishImportResult.FishImportRow importRow);

backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java

@@ -61,6 +61,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
         DataSourceLoadOptionsBase loadOptions = dataSourceRequest.toDevRequest();
         String stcd = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "stcd");
         String rstcd = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "rstcd");
+        String hbrvcd = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "hbrvcd");
         String baseId = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "baseId");
         String ftp = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "ftp");
         String direction = QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "direction");
@@ -74,7 +75,7 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
             startTime=TM.split(",")[0];
             endTime=TM.split(",")[1];
         }
-        Page<FishDraftDataVO> resultPage = fishDraftDataMapper.selectJoinPage(page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime,userId);
+        Page<FishDraftDataVO> resultPage = fishDraftDataMapper.selectJoinPage(page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime,userId,hbrvcd);
         fillUserNames(resultPage.getRecords());
         return resultPage;
     }

backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java

@@ -40,6 +40,9 @@ public class FishImportServiceImpl implements IFishImportService {
     @Resource
     private SdRvcdDicMapper rvcdDicMapper;
 
+    @Resource
+    private SdHbrvDicMapper sdHbrvDicMapper;
+
     @Resource
     private SdFpssBHMapper fpssBHMapper;
 
@@ -64,7 +67,9 @@ public class FishImportServiceImpl implements IFishImportService {
     private static final Map<String, String> BASE_NAME_CACHE = new LinkedHashMap<>();
     private static final Map<String, String> BASE_CODE_TO_NAME_CACHE = new LinkedHashMap<>();
     private static final Map<String, String> RIVER_NAME_CACHE = new LinkedHashMap<>();
+    private static final Map<String, String> HBRVCD_NAME_CACHE = new LinkedHashMap<>();
     private static final Map<String, String> RIVER_CODE_TO_NAME_CACHE = new LinkedHashMap<>();
+    private static final Map<String, String> HBRVCD_CODE_TO_NAME_CACHE = new LinkedHashMap<>();
 
     private static final Map<String, String> FISH_DICT_CACHE = new LinkedHashMap<>();
     private static final Map<String, String> FISH_CODE_TO_NAME_CACHE = new LinkedHashMap<>();
@@ -102,7 +107,7 @@ public class FishImportServiceImpl implements IFishImportService {
         EXCEL_COLUMN_MAPPING.put("过鱼设施名称", "fpname");
 
 
-        EXCEL_COLUMN_INDEX_MAPPING.put(0, "baseName");
+        EXCEL_COLUMN_INDEX_MAPPING.put(0, "hbrvcd");
         EXCEL_COLUMN_INDEX_MAPPING.put(1, "stationName");
         EXCEL_COLUMN_INDEX_MAPPING.put(2, "stnm");
         EXCEL_COLUMN_INDEX_MAPPING.put(3, "strdt");
@@ -233,6 +238,33 @@ public class FishImportServiceImpl implements IFishImportService {
                             }
                         }
                         break;
+                    case "hbrvcd":
+                        if(!StringUtils.hasText(cellValue)){
+                            importRow.getWarnings().add("hbrvcd");
+                            data.setHbrvcd(cellValue);
+                            data.setHbrvnm(cellValue);
+                        }else{
+                            String hbrvcdCode = resolveHbrvcdCode(cellValue.trim());
+                            if (hbrvcdCode == null) {
+                                importRow.getWarnings().add("hbrvcd");
+                                data.setHbrvcd(cellValue.trim());
+                                data.setHbrvnm(cellValue.trim());
+                            }else{
+                                data.setHbrvcd(hbrvcdCode);
+                                data.setHbrvnm(cellValue.trim());
+                            }
+                        }
+//                        if (StringUtils.hasText(cellValue)) {
+//                            String rvcd = resolveHbrvcdCode(cellValue.trim());
+//                            if (rvcd == null) {
+//                                importRow.getWarnings().add(fieldName);
+//                                data.setRvcd(cellValue);
+//                            } else {
+//                                data.setHbrvcd(rvcd);
+//                                data.setHbrvcd(rvcd);
+//                            }
+//                        }
+                        break;
                     case "tm":
                         if (!StringUtils.hasText(cellValue)) {
                             importRow.getWarnings().add(fieldName);
@@ -481,6 +513,20 @@ public class FishImportServiceImpl implements IFishImportService {
             }
         }
 
+        if (HBRVCD_NAME_CACHE.isEmpty()) {
+            List<SdHbrvDic> riverList = sdHbrvDicMapper.selectList(null);
+            for (SdHbrvDic river : riverList) {
+                if (StringUtils.hasText(river.getHbrvnm())) {
+                    HBRVCD_NAME_CACHE.put(river.getHbrvnm().trim().toLowerCase(), river.getHbrvcd());
+                }
+                if (StringUtils.hasText(river.getHbrvcd())) {
+                    if (StringUtils.hasText(river.getHbrvnm())) {
+                        HBRVCD_CODE_TO_NAME_CACHE.put(river.getHbrvcd().trim().toLowerCase(), river.getHbrvnm().trim().toLowerCase());
+                    }
+                }
+            }
+        }
+
         if (FISH_DICT_CACHE.isEmpty()) {
             List<SdFishDictoryB> sdFishDictoryBS = fishDictoryBMapper.selectList(null);
             for (SdFishDictoryB fishDictoryB : sdFishDictoryBS) {
@@ -678,6 +724,23 @@ public class FishImportServiceImpl implements IFishImportService {
         return null;
     }
 
+    public String resolveHbrvcdCode(String riverName) {
+        if (riverName == null) {
+            return null;
+        }
+        String lowerName = riverName.toLowerCase().trim();
+        if (HBRVCD_NAME_CACHE.containsKey(lowerName)) {
+            return HBRVCD_NAME_CACHE.get(lowerName);
+        }
+        for (Map.Entry<String, String> entry : HBRVCD_NAME_CACHE.entrySet()) {
+            if (entry.getKey().contains(lowerName)) {
+                return entry.getValue();
+            }
+        }
+        return null;
+    }
+
+
     @Override
     public String resolveRiverCode(String code, String riverName) {
         if (code == null && riverName == null) {
@@ -699,6 +762,27 @@ public class FishImportServiceImpl implements IFishImportService {
         return null;
     }
 
+    @Override
+    public String resolveHbrvcdCode(String code, String riverName) {
+        if (code == null && riverName == null) {
+            return null;
+        }
+        loadStationAndBaseCache();
+        String lowerCode = code != null ? code.trim().toLowerCase() : null;
+        String lowerName = riverName != null ? riverName.trim().toLowerCase() : null;
+        if (lowerCode != null && lowerName != null) {
+            String cachedName = HBRVCD_CODE_TO_NAME_CACHE.get(lowerCode);
+            if (cachedName != null && cachedName.equals(lowerName)) {
+                return code.trim();
+            }
+        }
+        String resultByName = resolveHbrvcdCode(riverName);
+        if (resultByName != null && resultByName.equalsIgnoreCase(code)) {
+            return resultByName;
+        }
+        return null;
+    }
+
     @Override
     public boolean validateStationBelongsToBase(String stationCode, String baseId) {
         if (stationCode == null || baseId == null) {

backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java

@@ -61,8 +61,9 @@ public class SdFpssBHController {
     @Operation(summary = "设施下拉列表（根据电站编码筛选 + 支持名称模糊搜索 + 支持基地编码筛选）")
     public ResponseResult dropdown(@RequestParam(required = false) String rstcd,
                                   @RequestParam(required = false) String stnm,
-                                  @RequestParam(required = false) String baseId) {
+                                  @RequestParam(required = false) String baseId,
-        return ResponseResult.successData(sdFpssBHService.selectForDropdown(rstcd, stnm, baseId));
+                                   @RequestParam(required = false) String hbrvcd) {
+        return ResponseResult.successData(sdFpssBHService.selectForDropdown(rstcd, stnm, baseId,hbrvcd));
     }
 
     @Log(module = "过鱼设施管理", value = "新增过鱼设施")

backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBHRequest.java

@@ -11,6 +11,7 @@ import java.util.List;
 @AllArgsConstructor
 public class SdEngInfoBHRequest {
     private String baseId;
+    private String hbrvcd;
     private List<String> basIds;
     private List<String> hbrvcds;
     private List<String> rvcds;

backend/src/main/java/com/yfd/platform/env/mapper/SdFpssBHMapper.java

@@ -16,11 +16,13 @@ public interface SdFpssBHMapper extends BaseMapper<SdFpssBH> {
             "LEFT JOIN SD_ENGINFO_B_H E ON F.RSTCD = E.STCD " +
             "WHERE 1=1 " +
             "<if test='baseId != null and baseId != \"\"'> AND E.BASE_ID = #{baseId} </if>" +
+            "<if test='hbrvcd != null and hbrvcd != \"\"'> AND E.HBRVCD = #{hbrvcd} </if>" +
             "<if test='rstcd != null and rstcd != \"\"'> AND F.RSTCD = #{rstcd} </if>" +
             "<if test='stnm != null and stnm != \"\"'> AND F.STNM LIKE '%' || #{stnm} || '%' </if>" +
             "ORDER BY F.ORDER_INDEX DESC" +
             "</script>")
     List<SdFpssBH> selectForDropdownWithBaseId(@Param("rstcd") String rstcd,
                                                 @Param("stnm") String stnm,
-                                                @Param("baseId") String baseId);
+                                                @Param("baseId") String baseId,
+                                               @Param("hbrvcd") String hbrvcd);
 }

backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java

@@ -16,7 +16,7 @@ public interface ISdFpssBHService extends IService<SdFpssBH> {
     /**
      * 设施下拉列表（根据电站编码筛选 + 支持名称模糊搜索 + 支持基地编码筛选）
      */
-    List<SdFpssBH> selectForDropdown(String rstcd, String stnm, String baseId);
+    List<SdFpssBH> selectForDropdown(String rstcd, String stnm, String baseId,String hbrvcd);
 
     Set<String> getUserAuthorizedStationCodes();
 

backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java

@@ -71,8 +71,10 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         String ennm = sdEngInfoBHRequest.getEnnm();
         List<String> rvcds = sdEngInfoBHRequest.getRvcds();
         List<String> hbrvcds = sdEngInfoBHRequest.getHbrvcds();
+        String hbrvcd = sdEngInfoBHRequest.getHbrvcd();
         LambdaQueryWrapper<SdEngInfoBH> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId)
+                .eq(StringUtils.hasText(hbrvcd), SdEngInfoBH::getHbrvcd, hbrvcd)
                 .in(rvcds != null && !rvcds.isEmpty(), SdEngInfoBH::getRvcd, rvcds)
                 .in(hbrvcds != null && !hbrvcds.isEmpty(), SdEngInfoBH::getHbrvcd, hbrvcds)
                 .like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm)

backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java

@@ -64,13 +64,13 @@ public class SdFpssBHServiceImpl extends ServiceImpl<SdFpssBHMapper, SdFpssBH> i
     }
 
     @Override
-    public List<SdFpssBH> selectForDropdown(String rstcd, String stnm, String baseId) {
+    public List<SdFpssBH> selectForDropdown(String rstcd, String stnm,String baseId, String hbrvcd) {
         Set<String> authorizedStations = getUserAuthorizedStationCodes();
 
         List<SdFpssBH> result;
 
-        if (StringUtils.hasText(baseId)) {
+        if (StringUtils.hasText(hbrvcd)|| StringUtils.hasText(baseId)) {
-            result = baseMapper.selectForDropdownWithBaseId(rstcd, stnm, baseId);
+            result = baseMapper.selectForDropdownWithBaseId(rstcd, stnm, baseId,hbrvcd);
         } else {
             LambdaQueryWrapper<SdFpssBH> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(StringUtils.hasText(rstcd), SdFpssBH::getRstcd, rstcd)

backend/src/main/resources/mapper/data/FishDraftDataMapper.xml

@@ -73,6 +73,8 @@
         <result column="ENNM" property="ennm"/>
         <result column="BASE_ID" property="baseId"/>
         <result column="BASENAME" property="baseName"/>
+        <result column="HBRVCD" property="hbrvcd"/>
+        <result column="HBRVNM" property="hbrvnm"/>
         <result column="RVCD" property="rvcd"/>
         <result column="LGTD" property="lgtd"/>
         <result column="LTTD" property="lttd"/>
@@ -82,6 +84,8 @@
     <sql id="joinColumns">
         D.ID,
         D.STCD,
+        E.HBRVCD,
+        G.HBRVNM,
         D.TM,
         D.FTP,
         FB.NAME FTPNAME,
@@ -130,6 +134,7 @@
         LEFT JOIN SD_FISHDICTORY_B FB ON FB.ID = D.FTP
         LEFT JOIN SD_ENGINFO_B_H E ON F.RSTCD = E.STCD
         LEFT JOIN SD_HYDROBASE H ON E.BASE_ID = H.BASEID
+        LEFT JOIN SD_HBRV_DIC G ON G.HBRVCD = E.HBRVCD
         WHERE D.DELETED_FLAG = 0
         <if test="stcd != null and stcd != ''">
             AND D.STCD = #{stcd}
@@ -146,6 +151,9 @@
         <if test="baseId != null and baseId != ''">
             AND E.BASE_ID = #{baseId}
         </if>
+        <if test="hbrvcd != null and hbrvcd != ''">
+            AND E.HBRVCD = #{hbrvcd}
+        </if>
         <if test="direction != null and direction != ''">
             AND D.DIRECTION = #{direction}
         </if>