From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
index f59b604..b9211bf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java
@@ -56,9 +56,14 @@
BigDecimal lat = new BigDecimal(baSettingsMapper.getItemValue("lat"));
BigDecimal lng = new BigDecimal(baSettingsMapper.getItemValue("lng"));
+ Integer zoomMp = Integer.parseInt(Optional.ofNullable(baSettingsMapper.getItemValue("zoomMp")).orElse("0"));
+ Integer zoomPc = Integer.parseInt(Optional.ofNullable(baSettingsMapper.getItemValue("zoomPc")).orElse("0"));
+
VoMapCenter po = new VoMapCenter();
po.setLat(lat);
po.setLng(lng);
+ po.setZoomMp(zoomMp);
+ po.setZoomPc(zoomPc);
return po;
}
}
--
Gitblit v1.8.0