zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化业务逻辑

Browse Source
This commit is contained in:
tangwei 2026-04-28 16:38:01 +08:00
parent 8f42025064
commit 864d9b31d4
8 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/com/yfd/platform/config/SecurityConfig.java
View File

@ -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()

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

@ -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;
}

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

@ -221,6 +221,12 @@ public class FishDraftData implements Serializable {
@TableField(exist = false)
private String stnm;
/**
* 电站编码名称
*/
@TableField(exist = false)
private String rstcd;
/**
* 鱼类名称
*/

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

@ -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);
}
}

11
backend/src/main/java/com/yfd/platform/env/domain/SdHycdDic.java vendored
View File

@ -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;
/**
* 介绍图片

15
backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java
View File

@ -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;
}
/**
* 找回密码
*/

6
backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java
View File

@ -42,6 +42,12 @@ public class SmsVerifyCodeRequest {
* 流域编号
*/
private String rvcdCode;
/**
* 流域编号
*/
private String hbrvcdCode;
/**
* 集团编号
*/

2
backend/src/main/java/com/yfd/platform/system/service/IUserService.java
View File

@ -170,6 +170,6 @@ public interface IUserService extends IService<SysUser> {
*page 分页参数
* 返回值说明: 待审核用户分页列表
************************************/
Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name, String regStatus);
Page<SysUser> queryPendingAuditUsers(Page<SysUser> page,String name, Integer regStatus);
}