pipIrr-SV.git - Gitblit

			@@ -56,8 +56,8 @@
			BigDecimal lat = new BigDecimal(baSettingsMapper.getItemValue("lat"));
			BigDecimal lng = new BigDecimal(baSettingsMapper.getItemValue("lng"));

			Integer zoomMp = Integer.parseInt(baSettingsMapper.getItemValue("zoomMp"));
			Integer zoomPc = Integer.parseInt(baSettingsMapper.getItemValue("zoomPc"));
			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);

			@@ -144,14 +144,17 @@

			if (response != null && response.getString("code").equals("0001")) {
			JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
			HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);

			JSONArray jsonArray = new JSONArray();
			for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("rtuAddr", entry.getKey());
			jsonObject.put("isOnLine", entry.getValue());
			jsonArray.add(jsonObject);

			if(attachment != null) {
			HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
			for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("rtuAddr", entry.getKey());
			jsonObject.put("isOnLine", entry.getValue());
			jsonArray.add(jsonObject);
			}
			}

			queryVo.setOnLineMap(jsonArray.toJSONString());

	pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/dict/DictSv.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史