feat: 亲鱼培育水温观测记录列表
This commit is contained in:
tangwei
parent
a1d1b2abf4
commit
6585154c25
@ -83,6 +83,12 @@ public class FbStationController {
|
||||
return ResponseResult.successData(fbStationService.getBsctmoBList(dataSourceRequest));
|
||||
}
|
||||
|
||||
@PostMapping("/fbbwtr/GetKendoListCust")
|
||||
@Operation(summary = "亲鱼培育水温观测记录列表")
|
||||
public ResponseResult getFbbwtRKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||
return ResponseResult.successData(fbStationService.getFbbwtRList(dataSourceRequest));
|
||||
}
|
||||
|
||||
@PostMapping("/bsmfr/qgc/GetKendoListCust")
|
||||
@Operation(summary = "(全过程)增殖站二级页面: 亲鱼选配与培育->亲鱼信息")
|
||||
public ResponseResult getBsmfrQgcKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
package com.yfd.platform.qgc_env.fb.entity.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 亲鱼培育水温观测记录 VO
|
||||
*/
|
||||
@Data
|
||||
public class FbFbbwtRVo {
|
||||
|
||||
/** 主键 */
|
||||
private String id;
|
||||
|
||||
/** 设施编码 */
|
||||
private String stcd;
|
||||
|
||||
/** 观测日期 */
|
||||
private Date tm;
|
||||
|
||||
/** 鱼池编号 */
|
||||
private String fpnum;
|
||||
|
||||
/** 鱼池名称 */
|
||||
private String fpName;
|
||||
|
||||
/** 8点水温 */
|
||||
private BigDecimal wte;
|
||||
|
||||
/** 14点水温 */
|
||||
private BigDecimal wtf;
|
||||
|
||||
/** 20点水温 */
|
||||
private BigDecimal wtt;
|
||||
|
||||
/** 记录人 */
|
||||
private String recorder;
|
||||
|
||||
/** 附件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;
|
||||
}
|
||||
@ -6,6 +6,7 @@ import com.yfd.platform.qgc_env.fb.entity.vo.BreedStageVO;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRVo;
|
||||
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.FbBsmfRQgcVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRFishTableVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbEngFishVo;
|
||||
@ -102,4 +103,9 @@ public interface FbStationService {
|
||||
* 亲鱼培育方式列表
|
||||
*/
|
||||
DataSourceResult<FbBsctmoBVo> getBsctmoBList(DataSourceRequest dataSourceRequest);
|
||||
|
||||
/**
|
||||
* 亲鱼培育水温观测记录列表
|
||||
*/
|
||||
DataSourceResult<FbFbbwtRVo> getFbbwtRList(DataSourceRequest dataSourceRequest);
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@ import com.yfd.platform.qgc_env.fb.entity.vo.BreedStageVO;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRVo;
|
||||
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.FbBsmfRQgcVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRFishHeadColumnVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbBsmfRFishSummaryVo;
|
||||
@ -6082,4 +6083,248 @@ public class FbStationServiceImpl implements FbStationService {
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
// ==================== 亲鱼培育水温观测记录列表 ====================
|
||||
|
||||
@Override
|
||||
public DataSourceResult<FbFbbwtRVo> getFbbwtRList(DataSourceRequest dataSourceRequest) {
|
||||
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
|
||||
GroupingInfo[] groups = loadOptions == null ? null : loadOptions.getGroup();
|
||||
if (groups != null && groups.length > 0) {
|
||||
return queryFbbwtRGroupList(dataSourceRequest, loadOptions, groups);
|
||||
}
|
||||
return queryFbbwtRDetailList(dataSourceRequest, loadOptions);
|
||||
}
|
||||
|
||||
private DataSourceResult<FbFbbwtRVo> queryFbbwtRDetailList(DataSourceRequest dataSourceRequest,
|
||||
DataSourceLoadOptionsBase loadOptions) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT ")
|
||||
.append(buildFbbwtRDetailSelectSql(dataSourceRequest == null ? null : dataSourceRequest.getSelect()))
|
||||
.append(" FROM (")
|
||||
.append(buildFbbwtRCoreSql())
|
||||
.append(") t WHERE 1 = 1 ");
|
||||
String filterSql = buildFbbwtRFilterCondition(
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getFilter(),
|
||||
paramMap, new int[]{0});
|
||||
if (StrUtil.isNotBlank(filterSql)) {
|
||||
sql.append(" AND ").append(filterSql).append(" ");
|
||||
}
|
||||
sql.append(buildFbbwtROrderBySql(dataSourceRequest == null ? null : dataSourceRequest.getSort()));
|
||||
Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake());
|
||||
List<FbFbbwtRVo> list = microservicDynamicSQLMapper.pageAllListWithResultType(
|
||||
page, sql.toString(), paramMap, FbFbbwtRVo.class);
|
||||
DataSourceResult<FbFbbwtRVo> 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<FbFbbwtRVo> queryFbbwtRGroupList(DataSourceRequest dataSourceRequest,
|
||||
DataSourceLoadOptionsBase loadOptions,
|
||||
GroupingInfo[] groupInfos) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT * FROM (")
|
||||
.append(buildFbbwtRCoreSql())
|
||||
.append(") t WHERE 1 = 1 ");
|
||||
String filterSql = buildFbbwtRFilterCondition(
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getFilter(),
|
||||
paramMap, new int[]{0});
|
||||
if (StrUtil.isNotBlank(filterSql)) {
|
||||
sql.append(" AND ").append(filterSql).append(" ");
|
||||
}
|
||||
String groupedSql = buildFbbwtRGroupSql(sql.toString(),
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getGroup());
|
||||
List<Map<String, Object>> rows = microservicDynamicSQLMapper.pageAllList(
|
||||
null, groupedSql, paramMap);
|
||||
DataSourceResult<FbFbbwtRVo> result = new DataSourceResult<>();
|
||||
if (Boolean.TRUE.equals(dataSourceRequest == null ? false : dataSourceRequest.getGroupResultFlat())) {
|
||||
result.setData((List<FbFbbwtRVo>) (List<?>) new GroupHelper().faltGroup(
|
||||
rows, groupInfos == null ? Collections.emptyList() : Arrays.asList(groupInfos)));
|
||||
} else {
|
||||
result.setData((List<FbFbbwtRVo>) (List<?>) new GroupHelper().group(
|
||||
rows, groupInfos == null ? Collections.emptyList() : Arrays.asList(groupInfos)));
|
||||
}
|
||||
result.setTotal(rows.size());
|
||||
result.setAggregates(new HashMap<>());
|
||||
return result;
|
||||
}
|
||||
|
||||
private String buildFbbwtRCoreSql() {
|
||||
return "SELECT a.ID AS id, "
|
||||
+ "a.STCD AS stcd, "
|
||||
+ "a.TM AS tm, "
|
||||
+ "a.FPNUM AS fpnum, "
|
||||
+ "b.NAME AS fpName, "
|
||||
+ "a.WTE AS wte, "
|
||||
+ "a.WTF AS wtf, "
|
||||
+ "a.WTT AS wtt, "
|
||||
+ "a.RECORDER AS recorder, "
|
||||
+ "a.FID AS fid, "
|
||||
+ "a.RECORD_USER AS recordUser, "
|
||||
+ "a.RECORD_TIME AS recordTime, "
|
||||
+ "a.MODIFY_USER AS modifyUser, "
|
||||
+ "a.MODIFY_TIME AS modifyTime, "
|
||||
+ "a.IS_DELETED AS isDeleted, "
|
||||
+ "a.DELETE_USER AS deleteUser, "
|
||||
+ "a.DELETE_TIME AS deleteTime "
|
||||
+ "FROM SD_FBBWT_R a "
|
||||
+ "LEFT JOIN SD_FBFISHPOND_B b ON a.FPNUM = b.ID AND NVL(b.IS_DELETED, 0) = 0";
|
||||
}
|
||||
|
||||
private String buildFbbwtRDetailSelectSql(List<String> select) {
|
||||
List<String> fields = CollUtil.isEmpty(select)
|
||||
? List.of("id", "stcd", "tm", "fpnum", "fpName", "wte", "wtf", "wtt",
|
||||
"recorder", "fid", "recordUser", "recordTime", "modifyUser", "modifyTime",
|
||||
"isDeleted", "deleteUser", "deleteTime")
|
||||
: select;
|
||||
List<String> selectParts = new ArrayList<>();
|
||||
for (String field : fields) {
|
||||
String column = mapFbbwtRColumn(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 buildFbbwtRFilterCondition(DataSourceRequest.FilterDescriptor filter,
|
||||
Map<String, Object> paramMap,
|
||||
int[] indexHolder) {
|
||||
if (filter == null) return "";
|
||||
if (StrUtil.isNotBlank(filter.getField())) return buildFbbwtRLeafCondition(filter, paramMap, indexHolder);
|
||||
if (CollUtil.isEmpty(filter.getFilters())) return "";
|
||||
List<String> conditions = new ArrayList<>();
|
||||
for (DataSourceRequest.FilterDescriptor child : filter.getFilters()) {
|
||||
String childSql = buildFbbwtRFilterCondition(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 buildFbbwtRLeafCondition(DataSourceRequest.FilterDescriptor filter,
|
||||
Map<String, Object> paramMap,
|
||||
int[] indexHolder) {
|
||||
String column = mapFbbwtRColumn(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 = normalizeFbbwtRValues(value);
|
||||
if (values.isEmpty()) return "";
|
||||
List<String> placeholders = new ArrayList<>();
|
||||
for (Object item : values) {
|
||||
String key = "bwtP" + indexHolder[0]++;
|
||||
paramMap.put(key, normalizeFbbwtRValue(filter.getField(), item));
|
||||
placeholders.add("#{map." + key + "}");
|
||||
}
|
||||
return column + " IN (" + String.join(", ", placeholders) + ")";
|
||||
}
|
||||
if (value == null) return "";
|
||||
String key = "bwtP" + indexHolder[0]++;
|
||||
Object normalizedValue = normalizeFbbwtRValue(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 buildFbbwtROrderBySql(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 = mapFbbwtRColumn(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 buildFbbwtRGroupSql(String baseSql, List<DataSourceRequest.GroupDescriptor> groups) {
|
||||
if (CollUtil.isEmpty(groups)) return baseSql;
|
||||
List<DataSourceRequest.GroupDescriptor> validGroups = groups.stream()
|
||||
.filter(group -> StrUtil.isNotBlank(mapFbbwtRColumn(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 mapFbbwtRColumn(String field) {
|
||||
return switch (field) {
|
||||
case "id" -> "t.id";
|
||||
case "stcd" -> "t.stcd";
|
||||
case "tm" -> "t.tm";
|
||||
case "fpnum" -> "t.fpnum";
|
||||
case "fpName" -> "t.fpName";
|
||||
case "wte" -> "t.wte";
|
||||
case "wtf" -> "t.wtf";
|
||||
case "wtt" -> "t.wtt";
|
||||
case "recorder" -> "t.recorder";
|
||||
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> normalizeFbbwtRValues(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 normalizeFbbwtRValue(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