diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java b/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java index 070913f..6f8c8c4 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/FishImportResult.java @@ -43,6 +43,8 @@ public class FishImportResult { private FishDraftData data; private List unrecognizedFields; private List warnings; + private List> vdpthList; + private List> picpthList; private List vdpthsWarnings; private List picpthsWarnings; public FishImportRow() { @@ -50,6 +52,8 @@ public class FishImportResult { this.warnings = new ArrayList<>(); this.vdpthsWarnings = new ArrayList<>(); this.picpthsWarnings = new ArrayList<>(); + this.vdpthList = new ArrayList<>(); + this.picpthList = new ArrayList<>(); } public FishImportRow(int rowIndex) { @@ -58,6 +62,8 @@ public class FishImportResult { this.warnings = new ArrayList<>(); this.vdpthsWarnings = new ArrayList<>(); this.picpthsWarnings = new ArrayList<>(); + this.vdpthList = new ArrayList<>(); + this.picpthList = new ArrayList<>(); } } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java b/backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java index 3469a47..df87aa6 100644 --- a/backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java +++ b/backend/src/main/java/com/yfd/platform/data/mapper/FishDraftDataMapper.java @@ -27,7 +27,7 @@ public interface FishDraftDataMapper extends BaseMapper { @Param("status") String status, @Param("ftp") String ftp, @Param("startTime") String startTime, - @Param("endTime") String endTime); + @Param("endTime") String endTime,@Param("userId") String userId); /** * 关联查询过鱼数据(不分页) diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java index 5d07cdb..86961e7 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/FishDraftDataServiceImpl.java @@ -67,13 +67,15 @@ public class FishDraftDataServiceImpl extends ServiceImpl resultPage = fishDraftDataMapper.selectJoinPage( - page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime); + Page resultPage = fishDraftDataMapper.selectJoinPage(page, stcd, rstcd, baseId, direction, status, ftp, startTime, endTime,userId); fillUserNames(resultPage.getRecords()); return resultPage; } diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java index 67ce0a9..bd5d998 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java @@ -821,13 +821,15 @@ public class FishImportServiceImpl implements IFishImportService { if (fileName.isEmpty()) { continue; } - String actualPath = findFilePath(fileName, videoMap); + Map fileMap = new HashMap<>(); + fileMap.put("name", fileName); if (actualPath != null) { try { String attachmentId = attachmentUploadService.uploadFileAndGetId(actualPath); if (attachmentId != null) { attachmentIds.add(attachmentId); + fileMap.put("value", attachmentId); } else { importRow.getVdpthsWarnings().add(fileName); // attachmentIds.add(fileName); @@ -841,6 +843,7 @@ public class FishImportServiceImpl implements IFishImportService { importRow.getVdpthsWarnings().add(fileName); // attachmentIds.add(fileName); } + importRow.getVdpthList().add(fileMap); } return String.join(",", attachmentIds); @@ -853,19 +856,20 @@ public class FishImportServiceImpl implements IFishImportService { String[] fileNames = imageNames.split(";"); List attachmentIds = new ArrayList<>(); - for (String fileName : fileNames) { fileName = fileName.trim(); if (fileName.isEmpty()) { continue; } - + Map fileMap = new HashMap<>(); + fileMap.put("name", fileName); String actualPath = findFilePath(fileName, imageMap); if (actualPath != null) { try { String attachmentId = attachmentUploadService.uploadFileAndGetId(actualPath); if (attachmentId != null) { attachmentIds.add(attachmentId); + fileMap.put("value", attachmentId); } else { importRow.getPicpthsWarnings().add(fileName); // attachmentIds.add(fileName); @@ -879,8 +883,8 @@ public class FishImportServiceImpl implements IFishImportService { importRow.getPicpthsWarnings().add(fileName); // attachmentIds.add(fileName); } + importRow.getPicpthList().add(fileMap); } - return String.join(",", attachmentIds); } diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java index 5721add..a1e8624 100644 --- a/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/data/service/impl/SysUserDataScopeServiceImpl.java @@ -11,10 +11,12 @@ import com.yfd.platform.data.domain.vo.SysUserDataScopeVO; import com.yfd.platform.data.mapper.SysUserDataScopeMapper; import com.yfd.platform.data.service.ISysUserDataScopeService; import com.yfd.platform.env.domain.SdEngInfoBH; +import com.yfd.platform.env.domain.SdHbrvDic; import com.yfd.platform.env.domain.SdHycdDic; import com.yfd.platform.env.domain.SdHydrobase; import com.yfd.platform.env.domain.SdRvcdDic; import com.yfd.platform.env.mapper.SdEngInfoBHMapper; +import com.yfd.platform.env.mapper.SdHbrvDicMapper; import com.yfd.platform.env.mapper.SdHycdDicMapper; import com.yfd.platform.env.mapper.SdHydrobaseMapper; import com.yfd.platform.env.mapper.SdRvcdDicMapper; @@ -46,6 +48,9 @@ public class SysUserDataScopeServiceImpl extends ServiceImpl hbrvcds = groupedByType.get("HBRVCD").stream() + .map(SysUserDataScope::getOrgId) + .filter(StrUtil::isNotBlank) + .collect(Collectors.toSet()); + + if (CollUtil.isNotEmpty(hbrvcds)) { + List hbrvs = hbrvDicMapper.selectBatchIds(hbrvcds); + hbrvs.forEach(hbrv -> orgNameMap.put(hbrv.getHbrvcd(), hbrv.getHbrvnm())); + } + } + + // 3.3 查询基地名称 (BASE) if (groupedByType.containsKey("BASE")) { Set baseIds = groupedByType.get("BASE").stream() .map(SysUserDataScope::getOrgId) @@ -194,7 +212,7 @@ public class SysUserDataScopeServiceImpl extends ServiceImpl hycds = groupedByType.get("COMPANY").stream() .map(SysUserDataScope::getOrgId) @@ -207,7 +225,7 @@ public class SysUserDataScopeServiceImpl extends ServiceImpl stcds = groupedByType.get("STATION").stream() .map(SysUserDataScope::getOrgId) diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java index aac18b6..e810b84 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java @@ -76,6 +76,13 @@ public class SdEngInfoBHController { return ResponseResult.successData(engInfoBHService.selectForDropdown(baseId, ennm)); } + @GetMapping("/regDropdown") + @Operation(summary = "电站下拉列表(根据基地编码筛选 + 支持名称模糊搜索)注册") + public ResponseResult regDropdown(@RequestParam(required = false) String baseId, + @RequestParam(required = false) String ennm) { + return ResponseResult.successData(engInfoBHService.selectRegDropdown(baseId, ennm)); + } + @Log(module = "电站管理", value = "新增电站") @PostMapping("/add") @Operation(summary = "新增电站") diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java index a91acea..1b87633 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java @@ -104,4 +104,12 @@ public class SdHbrvDicController { @RequestParam(required = false) String baseid) { return ResponseResult.successData(hbrvDicService.selectForDropdown(hbrvnm, baseid)); } + + @GetMapping("/regDropdown") + @Operation(summary = "下拉框列表查询") + public ResponseResult regDropdown( + @RequestParam(required = false) String hbrvnm, + @RequestParam(required = false) String baseid) { + return ResponseResult.successData(hbrvDicService.regDropdown(hbrvnm, baseid)); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdHycdDicController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdHycdDicController.java index 568ffde..db5351f 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdHycdDicController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdHycdDicController.java @@ -62,6 +62,23 @@ public class SdHycdDicController { return ResponseResult.successData(hycdDicService.getById(hycd)); } + @GetMapping("/selectForDropdown") + @Operation(summary = "下拉框列表查询") + public ResponseResult selectForDropdown( + @RequestParam(required = false) String hynm, + @RequestParam(required = false) Integer grd) { + return ResponseResult.successData(hycdDicService.selectForDropdown(hynm, grd)); + } + + @GetMapping("/regDropdown") + @Operation(summary = "下拉框列表查询(注册)") + public ResponseResult regDropdown( + @RequestParam(required = false) String hynm, + @RequestParam(required = false) Integer grd) { + return ResponseResult.successData(hycdDicService.regDropdown(hynm, grd)); + } + + @Log(module = "公司管理", value = "新增公司") @PostMapping("/add") @Operation(summary = "新增公司") diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java b/backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java index b236f97..edf1562 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java +++ b/backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java @@ -83,4 +83,10 @@ public class SdHycdDic implements Serializable { * 简称 */ private String shortname; + + /** + * 类型 1:集团 ;2:公司 + */ + private String lx; + } diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java b/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java index 4f6eed1..29de2f2 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java +++ b/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java @@ -55,4 +55,6 @@ public interface ISdEngInfoBHService extends IService { * 删除电站 */ boolean deleteEngInfo(String stcd); + + List selectRegDropdown(String baseId, String ennm); } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java b/backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java index f54a5ce..3f3cf23 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java +++ b/backend/src/main/java/com/yfd/platform/env/service/ISdHbrvDicService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.yfd.platform.env.domain.SdHbrvDic; import java.util.List; +import java.util.Set; /** *

@@ -52,4 +53,9 @@ public interface ISdHbrvDicService extends IService { * 下拉框列表查询(支持名称模糊查询) */ List selectForDropdown(String hbrvnm, String baseid); + + Set getUserAuthorizedStationCodes(); + + List regDropdown(String hbrvnm, String baseid); + } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdHycdDicService.java b/backend/src/main/java/com/yfd/platform/env/service/ISdHycdDicService.java index 02a57be..ea2c24a 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdHycdDicService.java +++ b/backend/src/main/java/com/yfd/platform/env/service/ISdHycdDicService.java @@ -42,4 +42,11 @@ public interface ISdHycdDicService extends IService { * 删除公司 */ boolean deleteHycdDic(String hycd); + + /** + * 下拉框列表查询(支持名称和级别过滤) + */ + List selectForDropdown(String hynm, Integer grd); + + List regDropdown(String hynm, Integer grd); } diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java index dbc6bff..9219ece 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java @@ -75,9 +75,10 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl authorizedStations = getUserAuthorizedStationCodes(); if (authorizedStations != null && !authorizedStations.isEmpty()) { wrapper.in(SdEngInfoBH::getStcd, authorizedStations); - } else { - return new ArrayList<>(); } +// else { +// return new ArrayList<>(); +// } return this.list(wrapper); } @@ -104,7 +105,7 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl engInfos = this.lambdaQuery() .select(SdEngInfoBH::getStcd) - .in(SdEngInfoBH::getRvcd, basinCodes) + .in(SdEngInfoBH::getHbrvcd, basinCodes) .list(); return engInfos.stream() .map(SdEngInfoBH::getStcd) @@ -140,4 +141,15 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl selectRegDropdown(String baseId, String ennm) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId) + .like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm) + .select(SdEngInfoBH::getStcd, SdEngInfoBH::getEnnm, SdEngInfoBH::getBaseId) + .orderByAsc(SdEngInfoBH::getOrderIndex); + + return this.list(wrapper); + } } \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java index d9a00c6..4cea76a 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdFpssBHServiceImpl.java @@ -67,10 +67,6 @@ public class SdFpssBHServiceImpl extends ServiceImpl i public List selectForDropdown(String rstcd, String stnm, String baseId) { Set authorizedStations = getUserAuthorizedStationCodes(); - if (authorizedStations == null || authorizedStations.isEmpty()) { - return new ArrayList<>(); - } - List result; if (StringUtils.hasText(baseId)) { @@ -82,6 +78,9 @@ public class SdFpssBHServiceImpl extends ServiceImpl i .orderByDesc(SdFpssBH::getOrderIndex); result = list(wrapper); } + if (authorizedStations.isEmpty()) { + return result; + } return result.stream() .filter(fpss -> authorizedStations.contains(fpss.getRstcd())) @@ -110,7 +109,7 @@ public class SdFpssBHServiceImpl extends ServiceImpl i if ("STATION".equals(orgType)) { stationCodes.add(orgId); - } else if ("RVCD".equals(orgType)) { + } else if ("HBRVCD".equals(orgType)) { basinCodes.add(orgId); } } @@ -123,7 +122,7 @@ public class SdFpssBHServiceImpl extends ServiceImpl i List engInfos = sdEngInfoBHMapper.selectList( new LambdaQueryWrapper() .select(SdEngInfoBH::getStcd) - .in(SdEngInfoBH::getRvcd, basinCodes) + .in(SdEngInfoBH::getHbrvcd, basinCodes) ); return engInfos.stream() .map(SdEngInfoBH::getStcd) diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java index 0f3a64d..dac49a8 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHbrvDicServiceImpl.java @@ -1,13 +1,25 @@ package com.yfd.platform.env.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yfd.platform.data.domain.SysUserDataScope; +import com.yfd.platform.data.mapper.SysUserDataScopeMapper; +import com.yfd.platform.env.domain.SdEngInfoBH; import com.yfd.platform.env.domain.SdHbrvDic; +import com.yfd.platform.env.domain.SdHydrobase; +import com.yfd.platform.env.mapper.SdEngInfoBHMapper; import com.yfd.platform.env.mapper.SdHbrvDicMapper; import com.yfd.platform.env.service.ISdHbrvDicService; +import com.yfd.platform.utils.SecurityUtils; +import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** *

@@ -16,7 +28,11 @@ import java.util.List; */ @Service public class SdHbrvDicServiceImpl extends ServiceImpl implements ISdHbrvDicService { + @Resource + private SysUserDataScopeMapper sysUserDataScopeMapper; + @Resource + private SdEngInfoBHMapper engInfoBHMapper; @Override public Page queryPageList(Page page, String hbrvnm, String baseid) { return this.page(page, this.lambdaQuery() @@ -74,6 +90,80 @@ public class SdHbrvDicServiceImpl extends ServiceImpl selectForDropdown(String hbrvnm, String baseid) { + Set authorizedStations = getUserAuthorizedStationCodes(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (authorizedStations != null && !authorizedStations.isEmpty()) { + List engInfos = engInfoBHMapper.selectList( + new LambdaQueryWrapper() + .select(SdEngInfoBH::getHbrvcd) + .in(SdEngInfoBH::getStcd, authorizedStations) + ); + List hbrvcds = engInfos.stream() + .map(SdEngInfoBH::getHbrvcd) + .filter(id -> id != null && !id.isEmpty()) + .distinct() + .collect(Collectors.toList()); + + if (!hbrvcds.isEmpty()) { + wrapper.in(SdHbrvDic::getHbrvcd, hbrvcds); + } else { + return new ArrayList<>(); + } + } + wrapper.like(hbrvnm != null && !hbrvnm.isEmpty(), SdHbrvDic::getHbrvnm, hbrvnm) + .eq(baseid != null && !baseid.isEmpty(), SdHbrvDic::getBaseid, baseid) + .eq(SdHbrvDic::getEnabled, 1) + .orderByAsc(SdHbrvDic::getOrderIndex); + return this.list(wrapper); + } + + @Override + public Set getUserAuthorizedStationCodes() { + String userId = SecurityUtils.getUserId(); + List sysUserDataScopes = sysUserDataScopeMapper.selectList( + new LambdaQueryWrapper() + .eq(SysUserDataScope::getUserId, userId) + .select(SysUserDataScope::getOrgId, SysUserDataScope::getOrgType) + ); + + if (sysUserDataScopes == null || sysUserDataScopes.isEmpty()) { + return new HashSet<>(); + } + + Set stationCodes = new HashSet<>(); + List basinCodes = new ArrayList<>(); + + for (SysUserDataScope scope : sysUserDataScopes) { + String orgType = scope.getOrgType(); + String orgId = scope.getOrgId(); + + if ("STATION".equals(orgType)) { + stationCodes.add(orgId); + } else if ("HBRVCD".equals(orgType)) { + basinCodes.add(orgId); + } + } + + if (!stationCodes.isEmpty()) { + return stationCodes; + } + + if (!basinCodes.isEmpty()) { + List engInfos = engInfoBHMapper.selectList( + new LambdaQueryWrapper() + .select(SdEngInfoBH::getStcd) + .in(SdEngInfoBH::getHbrvcd, basinCodes) + ); + return engInfos.stream() + .map(SdEngInfoBH::getStcd) + .collect(Collectors.toSet()); + } + + return stationCodes; + } + + @Override + public List regDropdown(String hbrvnm, String baseid) { return this.lambdaQuery() .like(hbrvnm != null && !hbrvnm.isEmpty(), SdHbrvDic::getHbrvnm, hbrvnm) .eq(baseid != null && !baseid.isEmpty(), SdHbrvDic::getBaseid, baseid) diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHycdDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHycdDicServiceImpl.java index f2294fe..2c0e4f7 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHycdDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHycdDicServiceImpl.java @@ -56,4 +56,22 @@ public class SdHycdDicServiceImpl extends ServiceImpl selectForDropdown(String hynm, Integer grd) { + return this.lambdaQuery() + .like(hynm != null && !hynm.isEmpty(), SdHycdDic::getHynm, hynm) + .eq(grd != null, SdHycdDic::getGrd, grd) + .orderByAsc(SdHycdDic::getOrderIndex) + .list(); + } + + @Override + public List regDropdown(String hynm, Integer grd) { + return this.lambdaQuery() + .like(hynm != null && !hynm.isEmpty(), SdHycdDic::getHynm, hynm) + .eq(grd != null, SdHycdDic::getGrd, grd) + .orderByAsc(SdHycdDic::getOrderIndex) + .list(); + } } diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java index 22f8d85..3523a05 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java @@ -87,9 +87,10 @@ public class SdHydrobaseServiceImpl extends ServiceImpl(); } - } else { - return new ArrayList<>(); } +// else { +// return new ArrayList<>(); +// } wrapper.orderByAsc(SdHydrobase::getOrderIndex); return this.list(wrapper); } @@ -116,7 +117,7 @@ public class SdHydrobaseServiceImpl extends ServiceImpl engInfos = sdEngInfoBHMapper.selectList( new LambdaQueryWrapper() .select(SdEngInfoBH::getStcd) - .in(SdEngInfoBH::getRvcd, basinCodes) + .in(SdEngInfoBH::getHbrvcd, basinCodes) ); return engInfos.stream() .map(SdEngInfoBH::getStcd) diff --git a/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java b/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java index d11c12f..b7f59eb 100644 --- a/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java +++ b/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java @@ -28,4 +28,23 @@ public class SmsVerifyCodeRequest { * 用户 */ private SysUser user; + + /** + * 流域编号 + */ + private String rvcdCode; + /** + * 集团编号 + */ + private String groupCode; + /** + * 公司编号 + */ + private String companyCode; + /** + * 站点编号 + */ + private String stationCode; + + } diff --git a/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml b/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml index 8fba01e..e07207d 100644 --- a/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml +++ b/backend/src/main/resources/mapper/data/FishDraftDataMapper.xml @@ -134,6 +134,9 @@ AND D.STCD = #{stcd} + + AND D.CREATED_BY = #{userId} + AND D.FTP = #{ftp}