Merge remote-tracking branch 'origin/master'
| | |
| | | |
| | | private String dataTime; |
| | | |
| | | private double dataValue; |
| | | private Object dataValue; |
| | | } |
| | |
| | | if (item != null) { |
| | | ApiIndItemValueDTO indItemValueDTO = new ApiIndItemValueDTO(); |
| | | indItemValueDTO.setDataTime(item.getDataTime()); |
| | | indItemValueDTO.setDataValue(item.getDataValue().doubleValue()); |
| | | indItemValueDTO.setDataValue(item.getDataValue()); |
| | | result.add(indItemValueDTO); |
| | | } |
| | | }); |
| | |
| | | if (item != null) { |
| | | ApiIndItemValueDTO indItemValueDTO = new ApiIndItemValueDTO(); |
| | | indItemValueDTO.setDataTime(item.getDataTime()); |
| | | indItemValueDTO.setDataValue(item.getDataValue().doubleValue()); |
| | | indItemValueDTO.setDataValue(item.getDataValue()); |
| | | result.add(indItemValueDTO); |
| | | } |
| | | }); |
文件名从 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/common/utils/AsCIIUtil.java 修改 |
| | |
| | | /** |
| | | * @author Jay |
| | | */ |
| | | public class AsCIIUtil { |
| | | public class ASCIIUtil { |
| | | |
| | | /* |
| | | * 将字符串转换为ASCII码数组,并填充剩余部分为-2。 |
| | | */ |
| | | public static int[] stringToAsciiArray(String input, int length) { |
| | | int[] asciiArray = new int[length]; |
| | | public static double[] stringToAsciiArray(String input, int length) { |
| | | double[] asciiArray = new double[length]; |
| | | Arrays.fill(asciiArray, -2); // 初始填充-2 |
| | | |
| | | int index = 0; |
| | |
| | | |
| | | private String dataTime; |
| | | |
| | | private BigDecimal dataValue; |
| | | private Object dataValue; |
| | | } |
| | |
| | | } else { |
| | | dataView.setRealData(new ArrayList<>()); |
| | | } |
| | | dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat)); |
| | | dataView.setCurData(mmItemResultJsonService.getData(outPut.getId(), predictTime, timeFormat, 3)); |
| | | dataView.setLineType(lineType.getCode()); |
| | | switch (lineType) { |
| | | case TN: |
| | |
| | | dataList = indItemValueList.stream().map(t -> { |
| | | DataValueVO vo = new DataValueVO(); |
| | | vo.setDataTime(DateUtil.parse(t.getDataTime())); |
| | | vo.setDataValue(t.getDataValue()); |
| | | vo.setDataValue(Double.valueOf(t.getDataValue().toString())); |
| | | return vo; |
| | | }).collect(Collectors.toList()); |
| | | default: |