feat: 鱼类孵化过程巡查记录列表
This commit is contained in:
tangwei
parent
c3b88752f7
commit
15d47e3a0d
@ -119,6 +119,12 @@ public class FbStationController {
|
||||
return ResponseResult.successData(fbStationService.getFishhatchrecRList(dataSourceRequest));
|
||||
}
|
||||
|
||||
@PostMapping("/fishhatchpror/GetKendoListCust")
|
||||
@Operation(summary = "鱼类孵化过程巡查记录列表")
|
||||
public ResponseResult getFishhatchproRKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||
return ResponseResult.successData(fbStationService.getFishhatchproRList(dataSourceRequest));
|
||||
}
|
||||
|
||||
@PostMapping("/bsmfr/qgc/GetKendoListCust")
|
||||
@Operation(summary = "(全过程)增殖站二级页面: 亲鱼选配与培育->亲鱼信息")
|
||||
public ResponseResult getBsmfrQgcKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
|
||||
|
||||
@ -0,0 +1,82 @@
|
||||
package com.yfd.platform.qgc_env.fb.entity.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 鱼类孵化过程巡查记录 VO
|
||||
*/
|
||||
@Data
|
||||
public class FbFishhatchproRVo {
|
||||
|
||||
/** 主键 */
|
||||
private String id;
|
||||
|
||||
/** 设施编码 */
|
||||
private String stcd;
|
||||
|
||||
/** 孵化设施编号 */
|
||||
private String devno;
|
||||
|
||||
/** 记录时间 */
|
||||
private Date recordtm;
|
||||
|
||||
/** 水温(℃) */
|
||||
private BigDecimal wartem;
|
||||
|
||||
/** 与上一时段水温差(℃) */
|
||||
private BigDecimal wtdiff;
|
||||
|
||||
/** 溶解氧(mg/L) */
|
||||
private BigDecimal dox;
|
||||
|
||||
/** pH */
|
||||
private BigDecimal ph;
|
||||
|
||||
/** 胚胎发育时期 */
|
||||
private String empsta;
|
||||
|
||||
/** 水交换频次(次/d) */
|
||||
private Long warfre;
|
||||
|
||||
/** 孵化密度是否均匀：0=否 1=是 */
|
||||
private Integer iseven;
|
||||
|
||||
/** 记录人 */
|
||||
private String recorder;
|
||||
|
||||
/** 备注 */
|
||||
private String remarks;
|
||||
|
||||
/** 产卵时间 */
|
||||
private Date spawntm;
|
||||
|
||||
/** 巡查时间 */
|
||||
private Date tm;
|
||||
|
||||
/** 附件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;
|
||||
}
|
||||
@ -12,6 +12,7 @@ import com.yfd.platform.qgc_env.fb.entity.vo.FbBsrfiRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbOutfishRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFishartinlRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFishhatchrecRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFishhatchproRVo;
|
||||
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;
|
||||
@ -138,4 +139,9 @@ public interface FbStationService {
|
||||
* 鱼类受精卵孵化过程记录列表
|
||||
*/
|
||||
DataSourceResult<FbFishhatchrecRVo> getFishhatchrecRList(DataSourceRequest dataSourceRequest);
|
||||
|
||||
/**
|
||||
* 鱼类孵化过程巡查记录列表
|
||||
*/
|
||||
DataSourceResult<FbFishhatchproRVo> getFishhatchproRList(DataSourceRequest dataSourceRequest);
|
||||
}
|
||||
|
||||
@ -21,6 +21,7 @@ import com.yfd.platform.qgc_env.fb.entity.vo.FbBsrfiRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbOutfishRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFishartinlRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFishhatchrecRVo;
|
||||
import com.yfd.platform.qgc_env.fb.entity.vo.FbFishhatchproRVo;
|
||||
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;
|
||||
@ -7598,4 +7599,260 @@ public class FbStationServiceImpl implements FbStationService {
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
// ==================== 鱼类孵化过程巡查记录 (SD_FBFISHHATCHPRO_R) ====================
|
||||
|
||||
@Override
|
||||
public DataSourceResult<FbFishhatchproRVo> getFishhatchproRList(DataSourceRequest dataSourceRequest) {
|
||||
DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest();
|
||||
GroupingInfo[] groups = loadOptions == null ? null : loadOptions.getGroup();
|
||||
if (groups != null && groups.length > 0) {
|
||||
return queryFishhatchproRGroupList(dataSourceRequest, loadOptions, groups);
|
||||
}
|
||||
return queryFishhatchproRDetailList(dataSourceRequest, loadOptions);
|
||||
}
|
||||
|
||||
private DataSourceResult<FbFishhatchproRVo> queryFishhatchproRDetailList(DataSourceRequest dataSourceRequest,
|
||||
DataSourceLoadOptionsBase loadOptions) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT ")
|
||||
.append(buildFishhatchproRDetailSelectSql(dataSourceRequest == null ? null : dataSourceRequest.getSelect()))
|
||||
.append(" FROM (")
|
||||
.append(buildFishhatchproRCoreSql())
|
||||
.append(") t WHERE 1 = 1 ");
|
||||
String filterSql = buildFishhatchproRFilterCondition(
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getFilter(),
|
||||
paramMap, new int[]{0});
|
||||
if (StrUtil.isNotBlank(filterSql)) {
|
||||
sql.append(" AND ").append(filterSql).append(" ");
|
||||
}
|
||||
sql.append(buildFishhatchproROrderBySql(dataSourceRequest == null ? null : dataSourceRequest.getSort()));
|
||||
Page<?> page = loadOptions == null ? null : QgcQueryWrapperUtil.buildPage(loadOptions, loadOptions.getSkip(), loadOptions.getTake());
|
||||
List<FbFishhatchproRVo> list = microservicDynamicSQLMapper.pageAllListWithResultType(
|
||||
page, sql.toString(), paramMap, FbFishhatchproRVo.class);
|
||||
DataSourceResult<FbFishhatchproRVo> 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<FbFishhatchproRVo> queryFishhatchproRGroupList(DataSourceRequest dataSourceRequest,
|
||||
DataSourceLoadOptionsBase loadOptions,
|
||||
GroupingInfo[] groupInfos) {
|
||||
Map<String, Object> paramMap = new HashMap<>();
|
||||
StringBuilder sql = new StringBuilder();
|
||||
sql.append("SELECT * FROM (")
|
||||
.append(buildFishhatchproRCoreSql())
|
||||
.append(") t WHERE 1 = 1 ");
|
||||
String filterSql = buildFishhatchproRFilterCondition(
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getFilter(),
|
||||
paramMap, new int[]{0});
|
||||
if (StrUtil.isNotBlank(filterSql)) {
|
||||
sql.append(" AND ").append(filterSql).append(" ");
|
||||
}
|
||||
String groupedSql = buildFishhatchproRGroupSql(sql.toString(),
|
||||
dataSourceRequest == null ? null : dataSourceRequest.getGroup());
|
||||
List<Map<String, Object>> rows = microservicDynamicSQLMapper.pageAllList(
|
||||
null, groupedSql, paramMap);
|
||||
DataSourceResult<FbFishhatchproRVo> result = new DataSourceResult<>();
|
||||
if (Boolean.TRUE.equals(dataSourceRequest == null ? false : dataSourceRequest.getGroupResultFlat())) {
|
||||
result.setData((List<FbFishhatchproRVo>) (List<?>) new GroupHelper().faltGroup(
|
||||
rows, groupInfos == null ? Collections.emptyList() : Arrays.asList(groupInfos)));
|
||||
} else {
|
||||
result.setData((List<FbFishhatchproRVo>) (List<?>) new GroupHelper().group(
|
||||
rows, groupInfos == null ? Collections.emptyList() : Arrays.asList(groupInfos)));
|
||||
}
|
||||
result.setTotal(rows.size());
|
||||
result.setAggregates(new HashMap<>());
|
||||
return result;
|
||||
}
|
||||
|
||||
private String buildFishhatchproRCoreSql() {
|
||||
return "SELECT ID AS id, "
|
||||
+ "STCD AS stcd, "
|
||||
+ "DEVNO AS devno, "
|
||||
+ "RECORDTM AS recordtm, "
|
||||
+ "WARTEM AS wartem, "
|
||||
+ "WTDIFF AS wtdiff, "
|
||||
+ "DOX AS dox, "
|
||||
+ "PH AS ph, "
|
||||
+ "EMPSTA AS empsta, "
|
||||
+ "WARFRE AS warfre, "
|
||||
+ "ISEVEN AS iseven, "
|
||||
+ "RECORDER AS recorder, "
|
||||
+ "REMARKS AS remarks, "
|
||||
+ "SPAWNTM AS spawntm, "
|
||||
+ "TM AS tm, "
|
||||
+ "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_FBFISHHATCHPRO_R "
|
||||
+ "WHERE NVL(IS_DELETED, 0) = 0";
|
||||
}
|
||||
|
||||
private String buildFishhatchproRDetailSelectSql(List<String> select) {
|
||||
List<String> fields = CollUtil.isEmpty(select)
|
||||
? List.of("id", "stcd", "devno", "recordtm", "wartem", "wtdiff",
|
||||
"dox", "ph", "empsta", "warfre", "iseven", "recorder", "remarks", "spawntm", "tm", "fid",
|
||||
"recordUser", "recordTime", "modifyUser", "modifyTime", "isDeleted", "deleteUser", "deleteTime")
|
||||
: select;
|
||||
List<String> selectParts = new ArrayList<>();
|
||||
for (String field : fields) {
|
||||
String column = mapFishhatchproRColumn(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 buildFishhatchproRFilterCondition(DataSourceRequest.FilterDescriptor filter,
|
||||
Map<String, Object> paramMap,
|
||||
int[] indexHolder) {
|
||||
if (filter == null) return "";
|
||||
if (StrUtil.isNotBlank(filter.getField())) return buildFishhatchproRLeafCondition(filter, paramMap, indexHolder);
|
||||
if (CollUtil.isEmpty(filter.getFilters())) return "";
|
||||
List<String> conditions = new ArrayList<>();
|
||||
for (DataSourceRequest.FilterDescriptor child : filter.getFilters()) {
|
||||
String childSql = buildFishhatchproRFilterCondition(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 buildFishhatchproRLeafCondition(DataSourceRequest.FilterDescriptor filter,
|
||||
Map<String, Object> paramMap,
|
||||
int[] indexHolder) {
|
||||
String column = mapFishhatchproRColumn(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 = normalizeFishhatchproRValues(value);
|
||||
if (values.isEmpty()) return "";
|
||||
List<String> placeholders = new ArrayList<>();
|
||||
for (Object item : values) {
|
||||
String key = "fhpP" + indexHolder[0]++;
|
||||
paramMap.put(key, normalizeFishhatchproRValue(filter.getField(), item));
|
||||
placeholders.add("#{map." + key + "}");
|
||||
}
|
||||
return column + " IN (" + String.join(", ", placeholders) + ")";
|
||||
}
|
||||
if (value == null) return "";
|
||||
String key = "fhpP" + indexHolder[0]++;
|
||||
Object normalizedValue = normalizeFishhatchproRValue(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 buildFishhatchproROrderBySql(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 = mapFishhatchproRColumn(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 buildFishhatchproRGroupSql(String baseSql, List<DataSourceRequest.GroupDescriptor> groups) {
|
||||
if (CollUtil.isEmpty(groups)) return baseSql;
|
||||
List<DataSourceRequest.GroupDescriptor> validGroups = groups.stream()
|
||||
.filter(group -> StrUtil.isNotBlank(mapFishhatchproRColumn(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 mapFishhatchproRColumn(String field) {
|
||||
return switch (field) {
|
||||
case "id" -> "t.id";
|
||||
case "stcd" -> "t.stcd";
|
||||
case "devno" -> "t.devno";
|
||||
case "recordtm" -> "t.recordtm";
|
||||
case "wartem" -> "t.wartem";
|
||||
case "wtdiff" -> "t.wtdiff";
|
||||
case "dox" -> "t.dox";
|
||||
case "ph" -> "t.ph";
|
||||
case "empsta" -> "t.empsta";
|
||||
case "warfre" -> "t.warfre";
|
||||
case "iseven" -> "t.iseven";
|
||||
case "recorder" -> "t.recorder";
|
||||
case "remarks" -> "t.remarks";
|
||||
case "spawntm" -> "t.spawntm";
|
||||
case "tm" -> "t.tm";
|
||||
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> normalizeFishhatchproRValues(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 normalizeFishhatchproRValue(String field, Object value) {
|
||||
if (value == null) return null;
|
||||
if (Set.of("recordtm", "spawntm", "tm", "recordTime", "modifyTime", "deleteTime").contains(field) && value instanceof String text) {
|
||||
return parseDateTimeSafely(text);
|
||||
}
|
||||
return value;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user