From f9f8f90ac63d6ce3274410d3721b173f40db6e41 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 25 Aug 2023 14:12:48 +0800 Subject: [PATCH] chore:过滤海城小时数据 --- screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java index 41d7a4f..4b237ab 100644 --- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java +++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionQueryVO.java @@ -31,8 +31,16 @@ private long size; + private List<UnitConversionVO> unitConversions; + /** + * @Description: DTO������VO + * @Param: [dto] + * @return: com.moral.api.pojo.vo.unitConversion.UnitConversionQueryVO + * @Author: ��������� + * @Date: 2021/8/26 + */ public static UnitConversionQueryVO convert(UnitConversionQueryDTO dto) { if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode()) return null; @@ -55,6 +63,13 @@ return vo; } + /** + * @Description: ������DTO������VO + * @Param: [dto] + * @return: com.moral.api.pojo.vo.unitConversion.UnitConversionVO + * @Author: ��������� + * @Date: 2021/8/26 + */ private static UnitConversionVO convertToQueryPage(UnitConversionDTO dto) { UnitConversionVO vo = new UnitConversionVO(); UnitConversion unitConversion = dto.getUnitConversion(); @@ -64,19 +79,8 @@ vo.setOriginalUnitName(originalUnit.getDataValue()); vo.setTargetUnitName(targetUnit.getDataValue()); vo.setFormula(unitConversion.getFormula()); + vo.setSensorCode(unitConversion.getSensorCode()); return vo; } - /** - * @Description: ������������������������������������������������������������������������ - * @Param: [formula] - * @return: java.lang.String - * @Author: ��������� - * @Date: 2021/5/12 - */ - public static String formulaConvert(String formula, String originalUnitName, String targetUnitName) { - formula = formula.replace(Constants.FORMULA_PLACEHOLDER, originalUnitName); - formula += "=" + targetUnitName; - return formula; - } } -- Gitblit v1.8.0