fix: 新增基地、电站、设施,鱼种类下拉
This commit is contained in:
parent
98a7ea956c
commit
a3e08f0db7
@ -69,6 +69,13 @@ public class SdEngInfoBHController {
|
|||||||
return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd));
|
return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/dropdown")
|
||||||
|
@Operation(summary = "电站下拉列表(根据基地编码筛选 + 支持名称模糊搜索)")
|
||||||
|
public ResponseResult dropdown(@RequestParam(required = false) String baseId,
|
||||||
|
@RequestParam(required = false) String ennm) {
|
||||||
|
return ResponseResult.successData(engInfoBHService.selectForDropdown(baseId, ennm));
|
||||||
|
}
|
||||||
|
|
||||||
@Log(module = "电站管理", value = "新增电站")
|
@Log(module = "电站管理", value = "新增电站")
|
||||||
@PostMapping("/add")
|
@PostMapping("/add")
|
||||||
@Operation(summary = "新增电站")
|
@Operation(summary = "新增电站")
|
||||||
@ -92,4 +99,4 @@ public class SdEngInfoBHController {
|
|||||||
boolean result = engInfoBHService.deleteEngInfo(stcd);
|
boolean result = engInfoBHService.deleteEngInfo(stcd);
|
||||||
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
|
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1,5 +1,7 @@
|
|||||||
package com.yfd.platform.env.controller;
|
package com.yfd.platform.env.controller;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.yfd.platform.annotation.Log;
|
import com.yfd.platform.annotation.Log;
|
||||||
import com.yfd.platform.config.ResponseResult;
|
import com.yfd.platform.config.ResponseResult;
|
||||||
@ -45,6 +47,12 @@ public class SdFishDictoryBController {
|
|||||||
return ResponseResult.successData(sdFishDictoryBService.list());
|
return ResponseResult.successData(sdFishDictoryBService.list());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/listByName")
|
||||||
|
@Operation(summary = "根据名称查询所有鱼类字典")
|
||||||
|
public ResponseResult listByName( @RequestParam(required = false) String name) {
|
||||||
|
return ResponseResult.successData(sdFishDictoryBService.list(new LambdaQueryWrapper<SdFishDictoryB>().eq(StrUtil.isNotBlank( name),SdFishDictoryB::getName, name)));
|
||||||
|
}
|
||||||
|
|
||||||
@GetMapping("/getById")
|
@GetMapping("/getById")
|
||||||
@Operation(summary = "根据ID查询鱼类字典")
|
@Operation(summary = "根据ID查询鱼类字典")
|
||||||
public ResponseResult getById(@RequestParam String id) {
|
public ResponseResult getById(@RequestParam String id) {
|
||||||
|
|||||||
@ -57,6 +57,13 @@ public class SdFpssBHController {
|
|||||||
return ResponseResult.successData(sdFpssBHService.getByRstcd(rstcd));
|
return ResponseResult.successData(sdFpssBHService.getByRstcd(rstcd));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/dropdown")
|
||||||
|
@Operation(summary = "设施下拉列表(根据电站编码筛选 + 支持编码模糊搜索)")
|
||||||
|
public ResponseResult dropdown(@RequestParam(required = false) String rstcd,
|
||||||
|
@RequestParam(required = false) String stnm) {
|
||||||
|
return ResponseResult.successData(sdFpssBHService.selectForDropdown(rstcd, stnm));
|
||||||
|
}
|
||||||
|
|
||||||
@Log(module = "过鱼设施管理", value = "新增过鱼设施")
|
@Log(module = "过鱼设施管理", value = "新增过鱼设施")
|
||||||
@PostMapping("/add")
|
@PostMapping("/add")
|
||||||
@Operation(summary = "新增过鱼设施")
|
@Operation(summary = "新增过鱼设施")
|
||||||
|
|||||||
@ -7,9 +7,9 @@ import com.yfd.platform.env.domain.SdHydrobase;
|
|||||||
import com.yfd.platform.env.service.ISdHydrobaseService;
|
import com.yfd.platform.env.service.ISdHydrobaseService;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import jakarta.annotation.Resource;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import jakarta.annotation.Resource;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -62,6 +62,12 @@ public class SdHydrobaseController {
|
|||||||
return ResponseResult.successData(hydrobaseService.getById(baseid));
|
return ResponseResult.successData(hydrobaseService.getById(baseid));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/dropdown")
|
||||||
|
@Operation(summary = "基地下拉列表(支持名称模糊搜索)")
|
||||||
|
public ResponseResult dropdown(@RequestParam(required = false) String basename) {
|
||||||
|
return ResponseResult.successData(hydrobaseService.selectForDropdown(basename));
|
||||||
|
}
|
||||||
|
|
||||||
// @Log(module = "基地管理", value = "新增基地")
|
// @Log(module = "基地管理", value = "新增基地")
|
||||||
@PostMapping("/add")
|
@PostMapping("/add")
|
||||||
@Operation(summary = "新增基地")
|
@Operation(summary = "新增基地")
|
||||||
@ -85,4 +91,4 @@ public class SdHydrobaseController {
|
|||||||
boolean result = hydrobaseService.deleteHydrobase(baseid);
|
boolean result = hydrobaseService.deleteHydrobase(baseid);
|
||||||
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
|
return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -33,6 +33,11 @@ public interface ISdEngInfoBHService extends IService<SdEngInfoBH> {
|
|||||||
*/
|
*/
|
||||||
List<SdEngInfoBH> getByRvcd(String rvcd);
|
List<SdEngInfoBH> getByRvcd(String rvcd);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 电站下拉列表(根据基地编码筛选 + 支持名称模糊搜索)
|
||||||
|
*/
|
||||||
|
List<SdEngInfoBH> selectForDropdown(String baseId, String ennm);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增电站
|
* 新增电站
|
||||||
*/
|
*/
|
||||||
@ -47,4 +52,4 @@ public interface ISdEngInfoBHService extends IService<SdEngInfoBH> {
|
|||||||
* 删除电站
|
* 删除电站
|
||||||
*/
|
*/
|
||||||
boolean deleteEngInfo(String stcd);
|
boolean deleteEngInfo(String stcd);
|
||||||
}
|
}
|
||||||
@ -12,6 +12,11 @@ public interface ISdFpssBHService extends IService<SdFpssBH> {
|
|||||||
|
|
||||||
List<SdFpssBH> getByRstcd(String rstcd);
|
List<SdFpssBH> getByRstcd(String rstcd);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设施下拉列表(根据电站编码筛选 + 支持名称模糊搜索)
|
||||||
|
*/
|
||||||
|
List<SdFpssBH> selectForDropdown(String rstcd, String stnm);
|
||||||
|
|
||||||
boolean add(SdFpssBH sdFpssBH);
|
boolean add(SdFpssBH sdFpssBH);
|
||||||
|
|
||||||
boolean updateById(SdFpssBH sdFpssBH);
|
boolean updateById(SdFpssBH sdFpssBH);
|
||||||
|
|||||||
@ -28,6 +28,11 @@ public interface ISdHydrobaseService extends IService<SdHydrobase> {
|
|||||||
*/
|
*/
|
||||||
List<SdHydrobase> getRootList();
|
List<SdHydrobase> getRootList();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 基地下拉列表(支持名称模糊搜索)
|
||||||
|
*/
|
||||||
|
List<SdHydrobase> selectForDropdown(String basename);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 新增基地
|
* 新增基地
|
||||||
*/
|
*/
|
||||||
@ -42,4 +47,4 @@ public interface ISdHydrobaseService extends IService<SdHydrobase> {
|
|||||||
* 删除基地
|
* 删除基地
|
||||||
*/
|
*/
|
||||||
boolean deleteHydrobase(String baseid);
|
boolean deleteHydrobase(String baseid);
|
||||||
}
|
}
|
||||||
@ -7,6 +7,7 @@ import com.yfd.platform.env.mapper.SdEngInfoBHMapper;
|
|||||||
import com.yfd.platform.env.service.ISdEngInfoBHService;
|
import com.yfd.platform.env.service.ISdEngInfoBHService;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -48,6 +49,16 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
|
|||||||
return engInfoBHMapper.selectByRvcd(rvcd);
|
return engInfoBHMapper.selectByRvcd(rvcd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<SdEngInfoBH> selectForDropdown(String baseId, String ennm) {
|
||||||
|
return this.lambdaQuery()
|
||||||
|
.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId)
|
||||||
|
.like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm)
|
||||||
|
.select(SdEngInfoBH::getStcd, SdEngInfoBH::getEnnm, SdEngInfoBH::getBaseId)
|
||||||
|
.orderByAsc(SdEngInfoBH::getOrderIndex)
|
||||||
|
.list();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean addEngInfo(SdEngInfoBH engInfo) {
|
public boolean addEngInfo(SdEngInfoBH engInfo) {
|
||||||
return this.save(engInfo);
|
return this.save(engInfo);
|
||||||
@ -62,4 +73,4 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
|
|||||||
public boolean deleteEngInfo(String stcd) {
|
public boolean deleteEngInfo(String stcd) {
|
||||||
return this.removeById(stcd);
|
return this.removeById(stcd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -42,6 +42,16 @@ public class SdFpssBHServiceImpl extends ServiceImpl<SdFpssBHMapper, SdFpssBH> i
|
|||||||
return list(wrapper);
|
return list(wrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<SdFpssBH> selectForDropdown(String rstcd, String stnm) {
|
||||||
|
LambdaQueryWrapper<SdFpssBH> wrapper = new LambdaQueryWrapper<>();
|
||||||
|
wrapper.eq(StringUtils.hasText(rstcd), SdFpssBH::getRstcd, rstcd)
|
||||||
|
.like(StringUtils.hasText(stnm), SdFpssBH::getStnm, stnm)
|
||||||
|
.select(SdFpssBH::getStcd, SdFpssBH::getStnm, SdFpssBH::getSttp,SdFpssBH::getRstcd)
|
||||||
|
.orderByDesc(SdFpssBH::getOrderIndex);
|
||||||
|
return list(wrapper);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean add(SdFpssBH sdFpssBH) {
|
public boolean add(SdFpssBH sdFpssBH) {
|
||||||
return save(sdFpssBH);
|
return save(sdFpssBH);
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import com.yfd.platform.env.domain.SdHydrobase;
|
|||||||
import com.yfd.platform.env.mapper.SdHydrobaseMapper;
|
import com.yfd.platform.env.mapper.SdHydrobaseMapper;
|
||||||
import com.yfd.platform.env.service.ISdHydrobaseService;
|
import com.yfd.platform.env.service.ISdHydrobaseService;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@ -42,6 +43,14 @@ public class SdHydrobaseServiceImpl extends ServiceImpl<SdHydrobaseMapper, SdHyd
|
|||||||
.list();
|
.list();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<SdHydrobase> selectForDropdown(String basename) {
|
||||||
|
return this.lambdaQuery()
|
||||||
|
.like(StringUtils.hasText(basename), SdHydrobase::getBasename, basename)
|
||||||
|
.orderByAsc(SdHydrobase::getOrderIndex)
|
||||||
|
.list();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean addHydrobase(SdHydrobase hydrobase) {
|
public boolean addHydrobase(SdHydrobase hydrobase) {
|
||||||
return this.save(hydrobase);
|
return this.save(hydrobase);
|
||||||
@ -56,4 +65,4 @@ public class SdHydrobaseServiceImpl extends ServiceImpl<SdHydrobaseMapper, SdHyd
|
|||||||
public boolean deleteHydrobase(String baseid) {
|
public boolean deleteHydrobase(String baseid) {
|
||||||
return this.removeById(baseid);
|
return this.removeById(baseid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user