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 e810b84..aa0f625 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; import com.yfd.platform.env.domain.SdEngInfoBH; +import com.yfd.platform.env.domain.SdEngInfoBHRequest; import com.yfd.platform.env.service.ISdEngInfoBHService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -69,18 +70,16 @@ public class SdEngInfoBHController { return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd)); } - @GetMapping("/dropdown") + @PostMapping("/dropdown") @Operation(summary = "电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索）") - public ResponseResult dropdown(@RequestParam(required = false) String baseId, - @RequestParam(required = false) String ennm) { - return ResponseResult.successData(engInfoBHService.selectForDropdown(baseId, ennm)); + public ResponseResult dropdown(@RequestBody SdEngInfoBHRequest sdEngInfoBHRequest) { + return ResponseResult.successData(engInfoBHService.selectForDropdown(sdEngInfoBHRequest)); } - @GetMapping("/regDropdown") + @PostMapping("/regDropdown") @Operation(summary = "电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索）注册") - public ResponseResult regDropdown(@RequestParam(required = false) String baseId, - @RequestParam(required = false) String ennm) { - return ResponseResult.successData(engInfoBHService.selectRegDropdown(baseId, ennm)); + public ResponseResult regDropdown(@RequestBody SdEngInfoBHRequest sdEngInfoBHRequest) { + return ResponseResult.successData(engInfoBHService.selectRegDropdown(sdEngInfoBHRequest)); } @Log(module = "电站管理", value = "新增电站") diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBHRequest.java b/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBHRequest.java new file mode 100644 index 0000000..58691ab --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/env/domain/SdEngInfoBHRequest.java @@ -0,0 +1,18 @@ +package com.yfd.platform.env.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SdEngInfoBHRequest { + private String baseId; + private List basIds; + private List hbrvcds; + private List rvcds; + private String ennm; +} diff --git a/backend/src/main/java/com/yfd/platform/env/domain/SdFpssBH.java b/backend/src/main/java/com/yfd/platform/env/domain/SdFpssBH.java index 993b6c5..1e0c733 100644 --- a/backend/src/main/java/com/yfd/platform/env/domain/SdFpssBH.java +++ b/backend/src/main/java/com/yfd/platform/env/domain/SdFpssBH.java @@ -228,7 +228,7 @@ public class SdFpssBH implements Serializable { /** * 鱼道或仿自然通道-流速，单位：m/s */ - private BigDecimal v; + private String v; /** * 仿自然通道断面形状 @@ -293,7 +293,7 @@ public class SdFpssBH implements Serializable { /** * 升鱼机集鱼槽流量，单位：m3/s */ - private BigDecimal syjq; + private String syjq; /** * 升鱼机断面尺寸（长*宽*高），单位：m @@ -303,7 +303,7 @@ public class SdFpssBH implements Serializable { /** * 升鱼机集鱼槽水深，单位：m */ - private BigDecimal syjwdp; + private String syjwdp; /** * 设计过鱼规模，单位：尾 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 29de2f2..c99d88a 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 @@ -3,6 +3,7 @@ package com.yfd.platform.env.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.yfd.platform.env.domain.SdEngInfoBH; +import com.yfd.platform.env.domain.SdEngInfoBHRequest; import java.util.List; import java.util.Set; @@ -37,7 +38,7 @@ public interface ISdEngInfoBHService extends IService { /** * 电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索） */ - List selectForDropdown(String baseId, String ennm); + List selectForDropdown(SdEngInfoBHRequest sdEngInfoBHRequest); Set getUserAuthorizedStationCodes(); @@ -56,5 +57,5 @@ public interface ISdEngInfoBHService extends IService { */ boolean deleteEngInfo(String stcd); - List selectRegDropdown(String baseId, String ennm); + List selectRegDropdown(SdEngInfoBHRequest sdEngInfoBHRequest); } \ No newline at end of file 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 9219ece..60e4b2f 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 @@ -6,6 +6,7 @@ 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.SdEngInfoBHRequest; import com.yfd.platform.env.mapper.SdEngInfoBHMapper; import com.yfd.platform.env.service.ISdEngInfoBHService; import com.yfd.platform.utils.SecurityUtils; @@ -65,9 +66,15 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl selectForDropdown(String baseId, String ennm) { + public List selectForDropdown(SdEngInfoBHRequest sdEngInfoBHRequest) { + String baseId = sdEngInfoBHRequest.getBaseId(); + String ennm = sdEngInfoBHRequest.getEnnm(); + List rvcds = sdEngInfoBHRequest.getRvcds(); + List hbrvcds = sdEngInfoBHRequest.getHbrvcds(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId) + .in(rvcds != null && !rvcds.isEmpty(), SdEngInfoBH::getRvcd, rvcds) + .in(hbrvcds != null && !hbrvcds.isEmpty(), SdEngInfoBH::getHbrvcd, hbrvcds) .like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm) .select(SdEngInfoBH::getStcd, SdEngInfoBH::getEnnm, SdEngInfoBH::getBaseId) .orderByAsc(SdEngInfoBH::getOrderIndex); @@ -143,9 +150,15 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl selectRegDropdown(String baseId, String ennm) { + public List selectRegDropdown(SdEngInfoBHRequest sdEngInfoBHRequest) { + String baseId = sdEngInfoBHRequest.getBaseId(); + String ennm = sdEngInfoBHRequest.getEnnm(); + List rvcds = sdEngInfoBHRequest.getRvcds(); + List hbrvcds = sdEngInfoBHRequest.getHbrvcds(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId) + .in(rvcds != null && !rvcds.isEmpty(), SdEngInfoBH::getRvcd, rvcds) + .in(hbrvcds != null && !hbrvcds.isEmpty(), SdEngInfoBH::getHbrvcd, hbrvcds) .like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm) .select(SdEngInfoBH::getStcd, SdEngInfoBH::getEnnm, SdEngInfoBH::getBaseId) .orderByAsc(SdEngInfoBH::getOrderIndex); 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 5c9801d..ff63053 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 @@ -129,6 +129,7 @@ public class SmsVerifyCodeController { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); user.setPassword(passwordEncoder.encode(user.getPassword())); user.setRegStatus(0); + user.setBelongingUnit(smsVerifyCodeRequest.getBelongingUnit()); user.setRegTime(new Date()); user.setStatus(1); user.setUsertype(1); @@ -184,7 +185,7 @@ public class SmsVerifyCodeController { /** * 验证验证码是否有效 */ - @GetMapping("/verifyCode") + @PostMapping("/verifyCode") @Operation(summary = "验证验证码") public ResponseResult verifyCode(@RequestBody SmsVerifyCodeRequest smsVerifyCodeRequest) { String phone = smsVerifyCodeRequest.getPhone(); 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 b754e5d..5a6e97b 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 @@ -24,6 +24,10 @@ public class SmsVerifyCodeRequest { */ private String username; + private String realName; + + private String belongingUnit; + /** * 密码 */ diff --git a/backend/src/main/java/com/yfd/platform/system/domain/SysUser.java b/backend/src/main/java/com/yfd/platform/system/domain/SysUser.java index ed9b24f..bdf5fb3 100644 --- a/backend/src/main/java/com/yfd/platform/system/domain/SysUser.java +++ b/backend/src/main/java/com/yfd/platform/system/domain/SysUser.java @@ -131,6 +131,11 @@ public class SysUser implements Serializable { */ private String auditUser; + /** + * 所属单位 + */ + private String belongingUnit; + /** * 审核时间 */ diff --git a/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java b/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java index 8e0c91f..2b939eb 100644 --- a/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/system/service/impl/SmsVerifyCodeServiceImpl.java @@ -21,7 +21,7 @@ import java.util.Random; @Service public class SmsVerifyCodeServiceImpl extends ServiceImpl implements ISmsVerifyCodeService { - private static final int CODE_VALID_MINUTES = 1; + private static final int CODE_VALID_MINUTES = 5; private static final Random RANDOM = new Random(); @Resource