feat: 亲鱼培育投喂记录列表
This commit is contained in:
tangwei
parent
66495f02d7
commit
b173f414d1
@ -95,6 +95,12 @@ public class FbStationController {
|
||||
return ResponseResult.successData(fbStationService.getFbcwqRList(dataSourceRequest));
|
||||
}
|
||||
|
||||
@PostMapping("/bsrfir/GetKendoListCust")
|
||||
@Operation(summary = "亲鱼培育投喂记录列表")
|
||||
public ResponseResult getBsrfiRKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||
return ResponseResult.successData(fbStationService.getBsrfiRList(dataSourceRequest));
|
||||
}
|
||||
|
||||
@PostMapping("/bsmfr/qgc/GetKendoListCust")
|
||||
@Operation(summary = "(全过程)增殖站二级页面: 亲鱼选配与培育->亲鱼信息")
|
||||
public ResponseResult getBsmfrQgcKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||
|
||||
@ -0,0 +1,73 @@
|
||||
package com.yfd.platform.qgc_env.fb.entity.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 亲鱼培育投喂记录 VO
|
||||
*/
|
||||
@Data
|
||||
public class FbBsrfiRVo {
|
||||
|
||||
/** 主键 */
|
||||
private String id;
|
||||
|
||||
/** 设施编码 */
|
||||
private String stcd;
|
||||
|
||||
/** 鱼池编号 */
|
||||
private String fpnum;
|
||||
|
||||
/** 鱼种类 */
|
||||
private String ftp;
|
||||
|
||||
/** 投喂日期 */
|
||||
private Date tm;
|
||||
|
||||
/** 饲料种类 */
|
||||
private String ftype;
|
||||
|
||||
/** 投食量(g) */
|
||||
private BigDecimal cfe;
|
||||
|
||||
/** 水交换频次(次/d) */
|
||||
private Long warfre;
|
||||
|
||||
/** 记录人 */
|
||||
private String recorder;
|
||||
|
||||
/** 总体量(g) */
|
||||
private BigDecimal tbw;
|
||||
|
||||
/** 日投喂率(%) */
|
||||
private BigDecimal dfr;
|
||||
|
||||
/** 摄食情况 */
|
||||
private String fdi;
|
||||
|
||||
/** 附件ID */
|
||||
private String fid;
|
||||
|
||||
/** 创建人 */
|
||||
private String recordUser;
|
||||
|
||||
/** 创建时间 */
|
||||
private Date recordTime;
|
||||
|
||||
/** 更新人 */
|
||||
private String modifyUser;
|
||||
|
||||
/** 更新时间 */
|
||||
private Date modifyTime;
|
||||
|
||||
/** 是否已删除 */
|
||||
private Integer isDeleted;
|
||||
|
||||
/** 删除人 */
|
||||
private String deleteUser;
|
||||
|
||||
/** 删除时间 */
|
||||
private Date deleteTime;
|
||||
}
|
||||
@ -8,6 +8,7 @@ import com.yfd.platform.qgc_env.fb.entity.vo.FbBsdeathRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsctmoBVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFbbwtRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFbcwqRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsrfiRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRQgcVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRFishTableVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbEngFishVo;
|
||||
@ -114,4 +115,9 @@ public interface FbStationService {
|
||||
* 亲鱼培育水质监测记录列表
|
||||
*/
|
||||
DataSourceResult<FbFbcwqRVo> getFbcwqRList(DataSourceRequest dataSourceRequest);
|
||||
|
||||
/**
|
||||
* 亲鱼培育投喂记录列表
|
||||
*/
|
||||
DataSourceResult<FbBsrfiRVo> getBsrfiRList(DataSourceRequest dataSourceRequest);
|
||||
}
|
||||
|
||||
@ -17,6 +17,7 @@ import com.yfd.platform.qgc_env.fb.entity.vo.FbBsdeathRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsctmoBVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFbbwtRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFbcwqRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsrfiRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRQgcVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRFishHeadColumnVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRFishSummaryVo;
|
||||
@ -6576,4 +6577,254 @@ public class FbStationServiceImpl implements FbStationService {
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
// ==================== 亲鱼培育投喂记录列表 ====================
|
||||
|
||||
@Override
|
||||
public DataSourceResult<FbBsrfiRVo> getBsrfiRList(DataSourceRequest dataSourceRequest) {
|
||||
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
|
||||
GroupingInfo[] groups = loadOptions == null ? null : loadOptions.getGroup();
|
||||
if (groups != null && groups.length > 0) {
|
||||
return queryBsrfiRGroupList(dataSourceRequest, loadOptions, groups);
|
||||
}
|
||||
return queryBsrfiRDetailList(dataSourceRequest, loadOptions);
|
||||
}
|
||||
|
||||
private DataSourceResult<FbBsrfiRVo> queryBsrfiRDetailList(DataSourceRequest dataSourceRequest,
|
||||
DataSourceLoadOptionsBase loadOptions) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT ")
|
||||
.append(buildBsrfiRDetailSelectSql(dataSourceRequest == null ? null : dataSourceRequest.getSelect()))
|
||||
.append(" FROM (")
|
||||
.append(buildBsrfiRCoreSql())
|
||||
.append(") t WHERE 1 = 1 ");
|
||||
String filterSql = buildBsrfiRFilterCondition(
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getFilter(),
|
||||
paramMap, new int[]{0});
|
||||
if (StrUtil.isNotBlank(filterSql)) {
|
||||
sql.append(" AND ").append(filterSql).append(" ");
|
||||
}
|
||||
sql.append(buildBsrfiROrderBySql(dataSourceRequest == null ? null : dataSourceRequest.getSort()));
|
||||
Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake());
|
||||
List<FbBsrfiRVo> list = microservicDynamicSQLMapper.pageAllListWithResultType(
|
||||
page, sql.toString(), paramMap, FbBsrfiRVo.class);
|
||||
DataSourceResult<FbBsrfiRVo> result = new DataSourceResult<>();
|
||||
result.setData(list);
|
||||
result.setTotal(page != null ? page.getTotal() : list.size());
|
||||
result.setAggregates(new HashMap<>());
|
||||
return result;
|
||||
}
|
||||
|
||||
@SuppressWarnings({"rawtypes", "unchecked"})
|
||||
private DataSourceResult<FbBsrfiRVo> queryBsrfiRGroupList(DataSourceRequest dataSourceRequest,
|
||||
DataSourceLoadOptionsBase loadOptions,
|
||||
GroupingInfo[] groupInfos) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT * FROM (")
|
||||
.append(buildBsrfiRCoreSql())
|
||||
.append(") t WHERE 1 = 1 ");
|
||||
String filterSql = buildBsrfiRFilterCondition(
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getFilter(),
|
||||
paramMap, new int[]{0});
|
||||
if (StrUtil.isNotBlank(filterSql)) {
|
||||
sql.append(" AND ").append(filterSql).append(" ");
|
||||
}
|
||||
String groupedSql = buildBsrfiRGroupSql(sql.toString(),
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getGroup());
|
||||
List<Map<String, Object>> rows = microservicDynamicSQLMapper.pageAllList(
|
||||
null, groupedSql, paramMap);
|
||||
DataSourceResult<FbBsrfiRVo> result = new DataSourceResult<>();
|
||||
if (Boolean.TRUE.equals(dataSourceRequest == null ? false : dataSourceRequest.getGroupResultFlat())) {
|
||||
result.setData((List<FbBsrfiRVo>) (List<?>) new GroupHelper().faltGroup(
|
||||
rows, groupInfos == null ? Collections.emptyList() : Arrays.asList(groupInfos)));
|
||||
} else {
|
||||
result.setData((List<FbBsrfiRVo>) (List<?>) new GroupHelper().group(
|
||||
rows, groupInfos == null ? Collections.emptyList() : Arrays.asList(groupInfos)));
|
||||
}
|
||||
result.setTotal(rows.size());
|
||||
result.setAggregates(new HashMap<>());
|
||||
return result;
|
||||
}
|
||||
|
||||
private String buildBsrfiRCoreSql() {
|
||||
return "SELECT ID AS id, "
|
||||
+ "STCD AS stcd, "
|
||||
+ "FPNUM AS fpnum, "
|
||||
+ "FTP AS ftp, "
|
||||
+ "TM AS tm, "
|
||||
+ "FTYPE AS ftype, "
|
||||
+ "CFE AS cfe, "
|
||||
+ "WARFRE AS warfre, "
|
||||
+ "RECORDER AS recorder, "
|
||||
+ "TBW AS tbw, "
|
||||
+ "DFR AS dfr, "
|
||||
+ "FDI AS fdi, "
|
||||
+ "FID AS fid, "
|
||||
+ "RECORD_USER AS recordUser, "
|
||||
+ "RECORD_TIME AS recordTime, "
|
||||
+ "MODIFY_USER AS modifyUser, "
|
||||
+ "MODIFY_TIME AS modifyTime, "
|
||||
+ "IS_DELETED AS isDeleted, "
|
||||
+ "DELETE_USER AS deleteUser, "
|
||||
+ "DELETE_TIME AS deleteTime "
|
||||
+ "FROM SD_FBBSRFI_R "
|
||||
+ "WHERE NVL(IS_DELETED, 0) = 0";
|
||||
}
|
||||
|
||||
private String buildBsrfiRDetailSelectSql(List<String> select) {
|
||||
List<String> fields = CollUtil.isEmpty(select)
|
||||
? List.of("id", "stcd", "fpnum", "ftp", "tm", "ftype", "cfe", "warfre",
|
||||
"recorder", "tbw", "dfr", "fdi", "fid", "recordUser", "recordTime", "modifyUser", "modifyTime",
|
||||
"isDeleted", "deleteUser", "deleteTime")
|
||||
: select;
|
||||
List<String> selectParts = new ArrayList<>();
|
||||
for (String field : fields) {
|
||||
String column = mapBsrfiRColumn(field);
|
||||
if (StrUtil.isNotBlank(column)) {
|
||||
selectParts.add(column + " AS " + field);
|
||||
}
|
||||
}
|
||||
if (selectParts.isEmpty()) {
|
||||
selectParts.add("t.id AS id");
|
||||
}
|
||||
return String.join(", ", selectParts);
|
||||
}
|
||||
|
||||
private String buildBsrfiRFilterCondition(DataSourceRequest.FilterDescriptor filter,
|
||||
Map<String, Object> paramMap,
|
||||
int[] indexHolder) {
|
||||
if (filter == null) return "";
|
||||
if (StrUtil.isNotBlank(filter.getField())) return buildBsrfiRLeafCondition(filter, paramMap, indexHolder);
|
||||
if (CollUtil.isEmpty(filter.getFilters())) return "";
|
||||
List<String> conditions = new ArrayList<>();
|
||||
for (DataSourceRequest.FilterDescriptor child : filter.getFilters()) {
|
||||
String childSql = buildBsrfiRFilterCondition(child, paramMap, indexHolder);
|
||||
if (StrUtil.isNotBlank(childSql)) conditions.add("(" + childSql + ")");
|
||||
}
|
||||
if (conditions.isEmpty()) return "";
|
||||
return String.join("or".equalsIgnoreCase(filter.getLogic()) ? " OR " : " AND ", conditions);
|
||||
}
|
||||
|
||||
private String buildBsrfiRLeafCondition(DataSourceRequest.FilterDescriptor filter,
|
||||
Map<String, Object> paramMap,
|
||||
int[] indexHolder) {
|
||||
String column = mapBsrfiRColumn(filter.getField());
|
||||
if (StrUtil.isBlank(column)) return "";
|
||||
String operator = StrUtil.blankToDefault(filter.getOperator(), "eq").toLowerCase();
|
||||
Object value = filter.getValue();
|
||||
if ("isnull".equals(operator)) return column + " IS NULL";
|
||||
if ("isnotnull".equals(operator)) return column + " IS NOT NULL";
|
||||
if ("in".equals(operator)) {
|
||||
List<Object> values = normalizeBsrfiRValues(value);
|
||||
if (values.isEmpty()) return "";
|
||||
List<String> placeholders = new ArrayList<>();
|
||||
for (Object item : values) {
|
||||
String key = "srfP" + indexHolder[0]++;
|
||||
paramMap.put(key, normalizeBsrfiRValue(filter.getField(), item));
|
||||
placeholders.add("#{map." + key + "}");
|
||||
}
|
||||
return column + " IN (" + String.join(", ", placeholders) + ")";
|
||||
}
|
||||
if (value == null) return "";
|
||||
String key = "srfP" + indexHolder[0]++;
|
||||
Object normalizedValue = normalizeBsrfiRValue(filter.getField(), value);
|
||||
return switch (operator) {
|
||||
case "eq" -> { paramMap.put(key, normalizedValue); yield column + " = #{map." + key + "}"; }
|
||||
case "neq" -> { paramMap.put(key, normalizedValue); yield column + " <> #{map." + key + "}"; }
|
||||
case "gt" -> { paramMap.put(key, normalizedValue); yield column + " > #{map." + key + "}"; }
|
||||
case "gte" -> { paramMap.put(key, normalizedValue); yield column + " >= #{map." + key + "}"; }
|
||||
case "lt" -> { paramMap.put(key, normalizedValue); yield column + " < #{map." + key + "}"; }
|
||||
case "lte" -> { paramMap.put(key, normalizedValue); yield column + " <= #{map." + key + "}"; }
|
||||
case "contains" -> { paramMap.put(key, "%" + normalizedValue + "%"); yield column + " LIKE #{map." + key + "}"; }
|
||||
case "doesnotcontain" -> { paramMap.put(key, "%" + normalizedValue + "%"); yield column + " NOT LIKE #{map." + key + "}"; }
|
||||
case "startswith" -> { paramMap.put(key, normalizedValue + "%"); yield column + " LIKE #{map." + key + "}"; }
|
||||
case "endswith" -> { paramMap.put(key, "%" + normalizedValue); yield column + " LIKE #{map." + key + "}"; }
|
||||
default -> "";
|
||||
};
|
||||
}
|
||||
|
||||
private String buildBsrfiROrderBySql(List<DataSourceRequest.SortDescriptor> sortDescriptors) {
|
||||
if (CollUtil.isEmpty(sortDescriptors)) return " ORDER BY t.tm DESC";
|
||||
List<String> parts = new ArrayList<>();
|
||||
for (DataSourceRequest.SortDescriptor descriptor : sortDescriptors) {
|
||||
String column = mapBsrfiRColumn(descriptor.getField());
|
||||
if (StrUtil.isBlank(column)) continue;
|
||||
parts.add(column + ("desc".equalsIgnoreCase(descriptor.getDir()) ? " DESC" : " ASC"));
|
||||
}
|
||||
if (parts.isEmpty()) return " ORDER BY t.tm DESC";
|
||||
return " ORDER BY " + String.join(", ", parts);
|
||||
}
|
||||
|
||||
private String buildBsrfiRGroupSql(String baseSql, List<DataSourceRequest.GroupDescriptor> groups) {
|
||||
if (CollUtil.isEmpty(groups)) return baseSql;
|
||||
List<DataSourceRequest.GroupDescriptor> validGroups = groups.stream()
|
||||
.filter(group -> StrUtil.isNotBlank(mapBsrfiRColumn(group.getField()))).toList();
|
||||
if (validGroups.isEmpty()) return baseSql;
|
||||
List<String> groupFields = validGroups.stream().map(DataSourceRequest.GroupDescriptor::getField).toList();
|
||||
StringBuilder sql = new StringBuilder("SELECT ");
|
||||
for (int i = 0; i < groupFields.size(); i++) {
|
||||
if (i > 0) sql.append(", ");
|
||||
sql.append("t.").append(groupFields.get(i)).append(" AS ").append(groupFields.get(i));
|
||||
}
|
||||
sql.append(", COUNT(1) AS \"aggregates.count\" FROM (").append(baseSql).append(") t GROUP BY ");
|
||||
for (int i = 0; i < groupFields.size(); i++) {
|
||||
if (i > 0) sql.append(", ");
|
||||
sql.append("t.").append(groupFields.get(i));
|
||||
}
|
||||
return sql.toString();
|
||||
}
|
||||
|
||||
private String mapBsrfiRColumn(String field) {
|
||||
return switch (field) {
|
||||
case "id" -> "t.id";
|
||||
case "stcd" -> "t.stcd";
|
||||
case "fpnum" -> "t.fpnum";
|
||||
case "ftp" -> "t.ftp";
|
||||
case "tm" -> "t.tm";
|
||||
case "ftype" -> "t.ftype";
|
||||
case "cfe" -> "t.cfe";
|
||||
case "warfre" -> "t.warfre";
|
||||
case "recorder" -> "t.recorder";
|
||||
case "tbw" -> "t.tbw";
|
||||
case "dfr" -> "t.dfr";
|
||||
case "fdi" -> "t.fdi";
|
||||
case "fid" -> "t.fid";
|
||||
case "recordUser" -> "t.recordUser";
|
||||
case "recordTime" -> "t.recordTime";
|
||||
case "modifyUser" -> "t.modifyUser";
|
||||
case "modifyTime" -> "t.modifyTime";
|
||||
case "isDeleted" -> "t.isDeleted";
|
||||
case "deleteUser" -> "t.deleteUser";
|
||||
case "deleteTime" -> "t.deleteTime";
|
||||
default -> "";
|
||||
};
|
||||
}
|
||||
|
||||
private List<Object> normalizeBsrfiRValues(Object value) {
|
||||
List<Object> values = new ArrayList<>();
|
||||
if (value == null) return values;
|
||||
if (value instanceof Collection<?> collection) { values.addAll(collection); return values; }
|
||||
if (value instanceof Object[] array) { values.addAll(Arrays.asList(array)); return values; }
|
||||
String text = String.valueOf(value).trim();
|
||||
if (text.startsWith("[") && text.endsWith("]")) text = text.substring(1, text.length() - 1);
|
||||
if (text.contains(",")) {
|
||||
for (String item : text.split(",")) {
|
||||
String trimmed = StrUtil.trim(item);
|
||||
if (StrUtil.isNotBlank(trimmed)) values.add(trimmed);
|
||||
}
|
||||
return values;
|
||||
}
|
||||
values.add(value);
|
||||
return values;
|
||||
}
|
||||
|
||||
private Object normalizeBsrfiRValue(String field, Object value) {
|
||||
if (value == null) return null;
|
||||
if (Set.of("tm", "recordTime", "modifyTime", "deleteTime").contains(field) && value instanceof String text) {
|
||||
return parseDateTimeSafely(text);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user