pipIrr-SV.git - Gitblit

			@@ -28,9 +28,7 @@
			import org.springframework.stereotype.Service;

			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;

			/**
			* @author ZhuBaoMin
			@@ -50,7 +48,8 @@
			private final PrIntakeVcMapper prIntakeVcMapper;
			private final SeClientCardMapper seClientCardMapper;
			private final RmIrrigateProfileMapper rmIrrigateProfileMapper;
			private RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper;
			private final RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper;
			//private final PrCommonIntakesMapper prCommonIntakesMapper;

			/**
			* pro_mw：属性
			@@ -64,6 +63,7 @@
			public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper,RmOpenCloseValveLastMapper rmOpenCloseValveLastMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, RmIrrigateProfileMapper rmIrrigateProfileMapper, Environment env) {
			this.rmCommandHistoryMapper = rmCommandHistoryMapper;
			this.rmOpenCloseValveLastMapper = rmOpenCloseValveLastMapper;
			//this.prCommonIntakesMapper = prCommonIntakesMapper;
			this.seVirtualCardMapper = seVirtualCardMapper;
			this.prIntakeMapper = prIntakeMapper;
			this.prWaterPriceMapper = prWaterPriceMapper;
			@@ -103,17 +103,17 @@

			JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));
			if(response != null && response.getString("code").equals("0001")) {
			JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
			JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment");

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

			});
			}

			System.out.println(jsonArray.toJSONString());
			@@ -195,5 +195,4 @@
			rsVo.obj = rmIrrigateProfileMapper.getIrrPro(type);
			return rsVo ;
			}

			}