From 294e34dbbf21ff8b6063c133fd1f019e406f784c Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 30 Apr 2026 18:06:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FishDraftDataController.java | 37 +++++++++------- .../service/impl/FishImportServiceImpl.java | 14 +++--- .../controller/SmsVerifyCodeController.java | 43 ++++++++++--------- .../resources/mapper/system/SysUserMapper.xml | 2 +- 4 files changed, 53 insertions(+), 43 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java index cea9e37..cc48f44 100644 --- a/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java +++ b/backend/src/main/java/com/yfd/platform/data/controller/FishDraftDataController.java @@ -865,10 +865,17 @@ public class FishDraftDataController { warnings.add("rstcd"); } - if (data.getBaseId() != null && !data.getBaseId().isEmpty()) { - String baseId = fishImportService.resolveBaseCode(data.getBaseId(), data.getBaseName()); +// if (data.getBaseId() != null && !data.getBaseId().isEmpty()) { +// String baseId = fishImportService.resolveBaseCode(data.getBaseId(), data.getBaseName()); +// if (baseId == null) { +// warnings.add("baseId"); +// } +// } + + if (data.getHbrvcd() != null && !data.getHbrvcd().isEmpty()) { + String baseId = fishImportService.resolveHbrvcdCode(data.getHbrvcd(), data.getHbrvnm()); if (baseId == null) { - warnings.add("baseId"); + warnings.add("hbrvcd"); } } @@ -879,16 +886,16 @@ 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.getHbrvcd() != null && !data.getHbrvcd().isEmpty()) { +// String hbrvcd = fishImportService.resolveHbrvcdCode(data.getHbrvcd(), data.getRvcd()); +// if (hbrvcd == null) { +// warnings.add("hbrvcd"); +// } +// } - if (data.getTm() == null) { - warnings.add("tm"); - } +// if (data.getTm() == null) { +// warnings.add("tm"); +// } if (data.getFtp() == null || data.getFtp().isEmpty()) { warnings.add("ftp"); @@ -929,9 +936,9 @@ public class FishDraftDataController { } } - if (StringUtils.hasText(data.getBaseId()) && StringUtils.hasText(data.getRstcd())) { - if (!fishImportService.validateStationBelongsToBase(data.getRstcd(), data.getBaseId())) { - warnings.add("baseId"); + if (StringUtils.hasText(data.getHbrvcd()) && StringUtils.hasText(data.getRstcd())) { + if (!fishImportService.validateStationBelongsToBase(data.getRstcd(), data.getHbrvcd())) { + warnings.add("hbrvcd"); warnings.add("rstcd"); } } 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 86473d9..32c0d3d 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 @@ -439,10 +439,10 @@ public class FishImportServiceImpl implements IFishImportService { private void validateStationFpssRelation(FishDraftData data, FishImportResult.FishImportRow importRow) { loadStationAndBaseCache(); - if (StringUtils.hasText(data.getBaseId()) && StringUtils.hasText(data.getRstcd())) { - if (!validateStationBelongsToBase(data.getRstcd(), data.getBaseId())) { - if (!importRow.getWarnings().contains("baseId")) { - importRow.getWarnings().add("baseId"); + if (StringUtils.hasText(data.getHbrvcd()) && StringUtils.hasText(data.getRstcd())) { + if (!validateStationBelongsToBase(data.getRstcd(), data.getHbrvcd())) { + if (!importRow.getWarnings().contains("hbrvcd")) { + importRow.getWarnings().add("hbrvcd"); } if (!importRow.getWarnings().contains("rstcd")) { importRow.getWarnings().add("rstcd"); @@ -454,8 +454,8 @@ public class FishImportServiceImpl implements IFishImportService { } if (StringUtils.hasText(data.getRstcd()) && StringUtils.hasText(data.getStcd())) { if (!validateFpssBelongsToStation(data.getStcd(), data.getRstcd())) { - if (!importRow.getWarnings().contains("baseId")) { - importRow.getWarnings().add("baseId"); + if (!importRow.getWarnings().contains("hbrvcd")) { + importRow.getWarnings().add("hbrvcd"); } if (!importRow.getWarnings().contains("stcd")) { importRow.getWarnings().add("stcd"); @@ -479,7 +479,7 @@ public class FishImportServiceImpl implements IFishImportService { STATION_CODE_TO_NAME_CACHE.put(station.getStcd().trim().toLowerCase(), station.getEnnm().trim().toLowerCase()); } if (StringUtils.hasText(station.getBaseId())) { - STATION_TO_BASE_CACHE.put(station.getStcd().trim().toLowerCase(), station.getBaseId()); + STATION_TO_BASE_CACHE.put(station.getStcd().trim().toLowerCase(), station.getHbrvcd()); } } } diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java index edb0c44..3dd784a 100644 --- a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java +++ b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java @@ -204,7 +204,7 @@ public class SmsVerifyCodeController { selectedBasinCodes.addAll(Arrays.asList(hbrvcdCode.split(","))); } - Set addedStationCodes = new HashSet<>(); +// Set addedStationCodes = new HashSet<>(); for (String basinCode : selectedBasinCodes) { if (StringUtils.isEmpty(basinCode)) { @@ -241,7 +241,7 @@ public class SmsVerifyCodeController { scope.setStatus(1); scope.setPermissionType("READ"); sysUserDataScopeService.addDataScope(scope); - addedStationCodes.add(basinCode); +// addedStationCodes.add(basinCode); } else { Set stationsInBasinAndSelected = allStationCodesInBasin.stream() .filter(selectedStationCodes::contains) @@ -255,27 +255,27 @@ public class SmsVerifyCodeController { scope.setStatus(1); scope.setPermissionType("READ"); sysUserDataScopeService.addDataScope(scope); - addedStationCodes.add(stationCd); +// addedStationCodes.add(stationCd); } } } - Set standaloneStations = selectedStationCodes.stream() - .filter(code -> !addedStationCodes.contains(code)) - .collect(Collectors.toSet()); - - for (String stationCd : standaloneStations) { - if (StringUtils.isEmpty(stationCd)) { - continue; - } - SysUserDataScope scope = new SysUserDataScope(); - scope.setUserId(userId); - scope.setOrgType("STATION"); - scope.setOrgId(stationCd); - scope.setStatus(1); - scope.setPermissionType("READ"); - sysUserDataScopeService.addDataScope(scope); - } +// Set standaloneStations = selectedStationCodes.stream() +// .filter(code -> !addedStationCodes.contains(code)) +// .collect(Collectors.toSet()); +// +// for (String stationCd : standaloneStations) { +// if (StringUtils.isEmpty(stationCd)) { +// continue; +// } +// SysUserDataScope scope = new SysUserDataScope(); +// scope.setUserId(userId); +// scope.setOrgType("STATION"); +// scope.setOrgId(stationCd); +// scope.setStatus(1); +// scope.setPermissionType("READ"); +// sysUserDataScopeService.addDataScope(scope); +// } SysUser user = new SysUser(); user.setId(userId); userService.updateUserRoles( user,"c13481a486c9ee559cf305284df4d207"); @@ -316,9 +316,12 @@ public class SmsVerifyCodeController { } catch (Exception e) { return ResponseResult.error("密码解密失败"); } + String encodePassword = existUser.getPassword(); BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); String encryptedPassword = passwordEncoder.encode(password); - + if (passwordEncoder.matches(password, encodePassword)) { + return ResponseResult.error("新密码不能与旧密码相同"); + } boolean success = userService.updatePasswordByPhone(phone, encryptedPassword); if (success) { return ResponseResult.success(); diff --git a/backend/src/main/resources/mapper/system/SysUserMapper.xml b/backend/src/main/resources/mapper/system/SysUserMapper.xml index 1ee549f..4d381b2 100644 --- a/backend/src/main/resources/mapper/system/SysUserMapper.xml +++ b/backend/src/main/resources/mapper/system/SysUserMapper.xml @@ -74,7 +74,7 @@ sys_user u WHERE 1 = 1 - AND ( ( u.REG_STATUS != 0 AND u.REG_STATUS != 2 ) OR u.REG_STATUS IS NULL ) + AND ( ( u.REG_STATUS != 'PENDING' AND u.REG_STATUS != 'REJECTED' ) OR u.REG_STATUS IS NULL ) AND u.usertype != 0 and u.orgid = #{orgid}