feat: 根据过鱼设施站点查询鱼类列表
This commit is contained in:
parent
16f60e6b18
commit
b171d91e54
@ -64,8 +64,8 @@ public class SecurityConfig {
|
|||||||
// .requestMatchers("/eng/**").permitAll()
|
// .requestMatchers("/eng/**").permitAll()
|
||||||
// .requestMatchers("/eq/**").permitAll()
|
// .requestMatchers("/eq/**").permitAll()
|
||||||
// .requestMatchers("/env/**").permitAll()
|
// .requestMatchers("/env/**").permitAll()
|
||||||
.requestMatchers("/wt/**").permitAll()
|
// .requestMatchers("/wt/**").permitAll()
|
||||||
.requestMatchers("/fb/**").permitAll()
|
// .requestMatchers("/fb/**").permitAll()
|
||||||
// .requestMatchers("/zq/**").permitAll()
|
// .requestMatchers("/zq/**").permitAll()
|
||||||
// .requestMatchers("/wq/**").permitAll()
|
// .requestMatchers("/wq/**").permitAll()
|
||||||
// .requestMatchers("/vd/**").permitAll()
|
// .requestMatchers("/vd/**").permitAll()
|
||||||
|
|||||||
@ -76,6 +76,12 @@ public class FishPassageController {
|
|||||||
return ResponseResult.successData(fpBuildService.getFishDicList(dataSourceRequest));
|
return ResponseResult.successData(fpBuildService.getFishDicList(dataSourceRequest));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/fishDic/stcd/GetKendoList")
|
||||||
|
@Operation(summary = "根据过鱼设施站点查询鱼类列表")
|
||||||
|
public ResponseResult getFishDicListByStcd(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||||
|
return ResponseResult.successData(fpBuildService.getFishDicListByStcd(dataSourceRequest));
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/vmsstbprpt/GetKendoList")
|
@PostMapping("/vmsstbprpt/GetKendoList")
|
||||||
@Operation(summary = "根据条件查询过鱼设施基础列表")
|
@Operation(summary = "根据条件查询过鱼设施基础列表")
|
||||||
public ResponseResult getVmsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) {
|
public ResponseResult getVmsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||||
|
|||||||
@ -14,6 +14,8 @@ public interface FpBuildService {
|
|||||||
|
|
||||||
DataSourceResult<FpFishDicVo> getFishDicList(DataSourceRequest dataSourceRequest);
|
DataSourceResult<FpFishDicVo> getFishDicList(DataSourceRequest dataSourceRequest);
|
||||||
|
|
||||||
|
DataSourceResult<FpFishDicVo> getFishDicListByStcd(DataSourceRequest dataSourceRequest);
|
||||||
|
|
||||||
DataSourceResult<FpVmsstbprptVo> getFpqMsstbprptList(DataSourceRequest dataSourceRequest);
|
DataSourceResult<FpVmsstbprptVo> getFpqMsstbprptList(DataSourceRequest dataSourceRequest);
|
||||||
|
|
||||||
FpVmsstbprptVo getStInfoByStcd(String stcd);
|
FpVmsstbprptVo getStInfoByStcd(String stcd);
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import com.yfd.platform.common.GroupHelper;
|
|||||||
import com.yfd.platform.common.GroupingInfo;
|
import com.yfd.platform.common.GroupingInfo;
|
||||||
import com.yfd.platform.common.MicroservicDynamicSQLMapper;
|
import com.yfd.platform.common.MicroservicDynamicSQLMapper;
|
||||||
import com.yfd.platform.common.PageInfo;
|
import com.yfd.platform.common.PageInfo;
|
||||||
|
import com.yfd.platform.common.exception.BizException;
|
||||||
import com.yfd.platform.qgc_env.fp.entity.vo.FpConstructionSituationVo;
|
import com.yfd.platform.qgc_env.fp.entity.vo.FpConstructionSituationVo;
|
||||||
import com.yfd.platform.qgc_env.fp.entity.vo.FpFishDicVo;
|
import com.yfd.platform.qgc_env.fp.entity.vo.FpFishDicVo;
|
||||||
import com.yfd.platform.qgc_env.fp.entity.vo.FpVmsstbprptVo;
|
import com.yfd.platform.qgc_env.fp.entity.vo.FpVmsstbprptVo;
|
||||||
@ -122,6 +123,44 @@ public class FpBuildServiceImpl implements FpBuildService {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DataSourceResult<FpFishDicVo> getFishDicListByStcd(DataSourceRequest dataSourceRequest) {
|
||||||
|
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
|
||||||
|
String stcd = loadOptions == null ? null : QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "stcd");
|
||||||
|
if (StrUtil.isBlank(stcd)) {
|
||||||
|
throw new BizException("过鱼设施站点编码(stcd)不能为空.");
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, Object> paramMap = new HashMap<>();
|
||||||
|
paramMap.put("stcd", StrUtil.trim(stcd));
|
||||||
|
|
||||||
|
String sql = "SELECT DISTINCT " +
|
||||||
|
" fish.ID AS id, " +
|
||||||
|
" fish.NAME AS name " +
|
||||||
|
"FROM SD_FPSS_B_H fp " +
|
||||||
|
"INNER JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD " +
|
||||||
|
" AND NVL(eng.IS_DELETED, 0) = 0 " +
|
||||||
|
"INNER JOIN SD_FISHDICTORY_RLTN_B rel ON rel.RVCD = eng.HBRVCD " +
|
||||||
|
" AND NVL(rel.IS_DELETED, 0) = 0 " +
|
||||||
|
"INNER JOIN SD_FISHDICTORY_B fish ON fish.ID = NVL(rel.ZY_FISH_ID, rel.FISH_ID) " +
|
||||||
|
" AND NVL(fish.IS_DELETED, 0) = 0 " +
|
||||||
|
" AND NVL(fish.ENABLE, 1) = 1 " +
|
||||||
|
"WHERE fp.STCD = #{map.stcd} " +
|
||||||
|
"ORDER BY fish.NAME";
|
||||||
|
|
||||||
|
List<FpFishDicVo> list = microservicDynamicSQLMapper.getAllListWithResultType(
|
||||||
|
sql,
|
||||||
|
paramMap,
|
||||||
|
FpFishDicVo.class
|
||||||
|
);
|
||||||
|
|
||||||
|
DataSourceResult<FpFishDicVo> result = new DataSourceResult<>();
|
||||||
|
result.setData(list);
|
||||||
|
result.setTotal(list == null ? 0L : list.size());
|
||||||
|
result.setAggregates(new HashMap<>());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public DataSourceResult<FpVmsstbprptVo> getFpqMsstbprptList(DataSourceRequest dataSourceRequest) {
|
public DataSourceResult<FpVmsstbprptVo> getFpqMsstbprptList(DataSourceRequest dataSourceRequest) {
|
||||||
return queryVmsstbprptList(dataSourceRequest, "FPQ");
|
return queryVmsstbprptList(dataSourceRequest, "FPQ");
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user