From 864d9b31d42d9603a85f86cf4becfaf71c866060 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 28 Apr 2026 16:38:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yfd/platform/config/SecurityConfig.java | 1 + .../data/controller/FishDraftDataController.java | 3 +++ .../yfd/platform/data/domain/FishDraftData.java | 6 ++++++ .../data/service/impl/FishImportServiceImpl.java | 7 ++++--- .../com/yfd/platform/env/domain/SdHycdDic.java | 11 +---------- .../controller/SmsVerifyCodeController.java | 15 ++++++++++++++- .../system/domain/SmsVerifyCodeRequest.java | 6 ++++++ .../yfd/platform/system/service/IUserService.java | 2 +- 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index 2bcef19..e249dc7 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -53,6 +53,7 @@ public class SecurityConfig { .authorizeHttpRequests(auth -> auth .requestMatchers("/user/login").anonymous() .requestMatchers("/user/code").permitAll() + .requestMatchers("/system/user/auditUser").permitAll() .requestMatchers("/eng/**").permitAll() .requestMatchers("/env/**").permitAll() .requestMatchers("/sw/**").permitAll() 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 85a449d..cf2b1d4 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 @@ -401,6 +401,9 @@ public class FishDraftDataController { importResult.getExcelFileName() : ""); map.put("failedRowDetails", importResult.getFailedRows() != null ? importResult.getFailedRows() : new ArrayList<>()); + + map.put("successRowDetails", importResult.getSuccessRows() != null ? + importResult.getSuccessRows() : new ArrayList<>()); return map; } diff --git a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java b/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java index dc6d5a4..530d0b7 100644 --- a/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java +++ b/backend/src/main/java/com/yfd/platform/data/domain/FishDraftData.java @@ -221,6 +221,12 @@ public class FishDraftData implements Serializable { @TableField(exist = false) private String stnm; + /** + * 电站编码名称 + */ + @TableField(exist = false) + private String 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 bd5d998..c9b4fb6 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 @@ -197,6 +197,7 @@ public class FishImportServiceImpl implements IFishImportService { data.setEnnm(cellValue.trim()); } else { data.setEnnm(cellValue.trim()); + data.setRstcd(stcd); } } break; @@ -274,12 +275,12 @@ public class FishImportServiceImpl implements IFishImportService { break; case "wt": if (!StringUtils.hasText(cellValue)) { - importRow.getWarnings().add(fieldName); +// importRow.getWarnings().add(fieldName); data.setWt(parseBigDecimal(cellValue)); } else { BigDecimal wt = parseBigDecimal(cellValue); if (wt == null) { - importRow.getWarnings().add(fieldName); +// importRow.getWarnings().add(fieldName); data.setWt(parseBigDecimal(cellValue)); } data.setWt(wt); @@ -344,7 +345,7 @@ public class FishImportServiceImpl implements IFishImportService { data.setStcd(cellValue.trim()); data.setStnm(cellValue.trim()); } else { - data.setStnm(stcd); + data.setStnm(cellValue.trim()); data.setStcd(stcd); } } 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 edf1562..48ea9e4 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 @@ -49,15 +49,6 @@ public class SdHycdDic implements Serializable { */ private Integer orderIndex; - /** - * 中心经度 - */ - private String lgtd; - - /** - * 中心纬度 - */ - private String lttd; /** * 所属国家，关联SD_COUNTRY_B.COUNTRY_ID @@ -72,7 +63,7 @@ public class SdHycdDic implements Serializable { /** * 简介 */ - private String des; + private String introduce; /** * 介绍图片 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 ff63053..c3a0746 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 @@ -131,10 +131,14 @@ public class SmsVerifyCodeController { user.setRegStatus(0); user.setBelongingUnit(smsVerifyCodeRequest.getBelongingUnit()); user.setRegTime(new Date()); + user.setNickname(smsVerifyCodeRequest.getRealName()); user.setStatus(1); + user.setOrgid("e90063ced25e3d469860e88d920c082f"); user.setUsertype(1); - + user.setUsername(smsVerifyCodeRequest.getUsername()); boolean success = userService.save(user); + // 给注册用户加上默认权限 + this.addDefaultRole(smsVerifyCodeRequest); if (success) { return ResponseResult.success(); } else { @@ -142,6 +146,15 @@ public class SmsVerifyCodeController { } } + private boolean addDefaultRole(SmsVerifyCodeRequest smsVerifyCodeRequest) { + String stationCode = smsVerifyCodeRequest.getStationCode(); + String companyCode = smsVerifyCodeRequest.getCompanyCode(); + String groupCode = smsVerifyCodeRequest.getGroupCode(); + String hbrvcdCode = smsVerifyCodeRequest.getHbrvcdCode(); + + return true; + } + /** * 找回密码 */ 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 5a6e97b..70c3cb9 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 @@ -42,6 +42,12 @@ public class SmsVerifyCodeRequest { * 流域编号 */ private String rvcdCode; + + /** + * 流域编号 + */ + private String hbrvcdCode; + /** * 集团编号 */ diff --git a/backend/src/main/java/com/yfd/platform/system/service/IUserService.java b/backend/src/main/java/com/yfd/platform/system/service/IUserService.java index 266b4e1..2674275 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/IUserService.java +++ b/backend/src/main/java/com/yfd/platform/system/service/IUserService.java @@ -170,6 +170,6 @@ public interface IUserService extends IService { *page 分页参数 * 返回值说明: 待审核用户分页列表 ************************************/ - Page queryPendingAuditUsers(Page page,String name, String regStatus); + Page queryPendingAuditUsers(Page page,String name, Integer regStatus); }