CanadaMes.git - Gitblit

			@@ -18,6 +18,7 @@


			MessageHandler customS7Control = new MessageHandler();

			public static class PLCBooleanConverter {

			public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
			@@ -44,8 +45,6 @@
			return binaryShortArray;
			}
			}




			@Override
			@@ -112,12 +111,10 @@
			}



			//A01启动地址
			List<String> A01start = Arrays.asList(config.getProperty("mlp2.A01start"));
			//A02启动地址
			List<String> A02start = Arrays.asList(config.getProperty("mlp2.A02start"));



			List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
			@@ -180,127 +177,23 @@
			JSONArray messageArray = new JSONArray(lastMessage);

			// A01下发
			if (messageArray.getJSONArray(0).size() > 0) {
			JSONArray jsonArray = messageArray.getJSONArray(0);
			List<Short> sValue = new ArrayList<>();
			for (int i = 0; i < jsonArray.size(); i++) {
			Object value = jsonArray.get(i);
			if (value != null && !value.toString().equals("null")) {
			try {
			String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
			short val = Short.parseShort(cleanedValue.trim());
			sValue.add(val);
			System.out.println("messageValue：" + Arrays.asList(val) + " added to the list");
			} catch (NumberFormatException e) {
			// 如果无法解析为 short 类型，则忽略该部分
			System.err.println("Could not parse value: " + value);
			}
			}
			}
			if (!sValue.isEmpty()) {
			S7control.getinstance().WriteWord(waddresses1, sValue);
			customS7Control.WriteWordToPLC(messageArray, waddresses1, 0);

			System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
			}
			}

			// A02下发
			if (messageArray.getJSONArray(1).size() > 0) {
			JSONArray jsonArray = messageArray.getJSONArray(1);
			List<Short> sValue2 = new ArrayList<>();
			for (int i = 0; i < jsonArray.size(); i++) {
			Object value = jsonArray.get(i);
			if (value != null && !value.toString().equals("null")) {
			try {
			String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
			short val = Short.parseShort(cleanedValue.trim());
			sValue2.add(val);
			System.out.println("messageValue：" + Arrays.asList(val) + " added to the list");
			} catch (NumberFormatException e) {
			// 如果无法解析为 short 类型，则忽略该部分
			System.err.println("Could not parse value: " + value);
			}
			}
			}
			if (!sValue2.isEmpty()) {
			S7control.getinstance().WriteWord(waddresses2, sValue2);
			customS7Control.WriteWordToPLC(messageArray, waddresses2, 1);

			System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
			}
			}

			// 写入故障地址
			if (messageArray.getJSONArray(2).size() > 0) {
			JSONArray jsonArray = messageArray.getJSONArray(2);
			List<Short> sValue2 = new ArrayList<>();
			for (int i = 0; i < jsonArray.size(); i++) {
			Object value = jsonArray.get(i);
			if (value != null && !value.toString().equals("null")) {
			try {
			String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
			short val = Short.parseShort(cleanedValue.trim());
			sValue2.add(val);
			System.out.println("messageValue：" + Arrays.asList(val) + " added to the list");
			} catch (NumberFormatException e) {
			// 如果无法解析为 short 类型，则忽略该部分
			System.err.println("Could not parse value: " + value);
			}
			}
			}
			if (!sValue2.isEmpty()) {
			S7control.getinstance().WriteWord(waddresses3, sValue2);
			System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
			}
			}
			customS7Control.WriteWordToPLC(messageArray, waddresses3, 2);


			// 写入复位地址
			if (messageArray.getJSONArray(3).size() > 0) {
			JSONArray jsonArray3 = messageArray.getJSONArray(3);
			List<Boolean> sValue3 = new ArrayList<>();
			for (int i = 0; i < jsonArray3.size(); i++) {
			Object value = jsonArray3.get(i);
			if (value != null && !value.toString().equals("null")) {
			try {
			String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
			boolean val = "1".equals(cleanedValue.trim());
			sValue3.add(val);
			System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
			} catch (NumberFormatException e) {
			// 如果无法解析为 boolean 类型，则忽略该部分
			System.err.println("Could not parse value: " + value);
			}
			}
			}
			if (!sValue3.isEmpty()) {
			S7control.getinstance().WriteBit(waddresses4, sValue3);
			System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses4);
			}
			}
			customS7Control.writeBitToPLC(messageArray, waddresses4, 3);


			// 写入回零地址
			if (messageArray.getJSONArray(4).size() > 0) {
			JSONArray jsonArray3 = messageArray.getJSONArray(4);
			List<Boolean> sValue3 = new ArrayList<>();
			for (int i = 0; i < jsonArray3.size(); i++) {
			Object value = jsonArray3.get(i);
			if (value != null && !value.toString().equals("null")) {
			try {
			String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
			boolean val = "1".equals(cleanedValue.trim());
			sValue3.add(val);
			System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
			} catch (NumberFormatException e) {
			// 如果无法解析为 boolean 类型，则忽略该部分
			System.err.println("Could not parse value: " + value);
			}
			}
			}
			if (!sValue3.isEmpty()) {
			S7control.getinstance().WriteBit(waddresses5, sValue3);
			System.out.println("Values " + sValue3 + " written to PLC at address " + waddresses5);
			}
			}

			customS7Control.writeBitToPLC(messageArray, waddresses5, 4);

			customS7Control.writeBitToPLC( messageArray, A01start,5);
			customS7Control.writeBitToPLC( messageArray, A02start,6);