还原流号定尺的消息推送

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetHotsend/service/impl/BilletHotsendBaseServiceImpl.java

@@ -785,6 +785,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		}
 
 		String ccmNo = dto.getCcmNo();
+
+		if (oConvertUtils.isEmpty(ccmNo)) {
+			throw new JeecgBootException("铸机号不能为空！");
+		}
 		// 构造 Redis key
 		String redisKey = String.format("ccmno:length:stream:%s", ccmNo);
 
@@ -795,27 +799,27 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		redisTemplate.opsForValue().set(redisKey, jsonValue);
 
 
-			// 变更的定尺集合
-//			for (StrandNoSizeDTO.StrandNoSize strandNoSize : dto.getStrandNoSizeList()) {
-//				sendStrandNoSizeToMqtt(strandNoSize);
-//			}
+		// 变更的定尺集合
+		for (StrandNoSizeDTO.StrandNoSize strandNoSize : dto.getStrandNoSizeList()) {
+				sendStrandNoSizeToMqtt(strandNoSize);
+		}
 	}
 
-//	public void sendStrandNoSizeToMqtt(StrandNoSizeDTO.StrandNoSize strandNoSize) {
-//
-//		try {
-//			Map<String, Object> mapSendInfo = new HashMap<>();
-//			mapSendInfo.put("strandNo", strandNoSize.getStrandNo());
-//			mapSendInfo.put("length", strandNoSize.getLength());
-//
-//			// 执行MQTT推送，设置合理的超时时间
-//			MqttClientUtil mqttClientUtilBe = new MqttClientUtil();
-//			mqttClientUtilBe.pushCData(configMqttMapper, mapSendInfo, TopicType.SYN_BILLET_PUSHSTRANDNOLENGTH.getTopicValue());
-//			log.info("B端传递流号定尺参数，发送MQTT成功: {}", mapSendInfo);
-//		} catch (Exception e) {
-//			log.error("B端传递流号定尺参数，发送MQTT异常!", e);
-//		}
-//	}
+	public void sendStrandNoSizeToMqtt(StrandNoSizeDTO.StrandNoSize strandNoSize) {
+
+		try {
+			Map<String, Object> mapSendInfo = new HashMap<>();
+			mapSendInfo.put("strandNo", strandNoSize.getStrandNo());
+			mapSendInfo.put("length", strandNoSize.getLength());
+
+			// 执行MQTT推送，设置合理的超时时间
+			MqttClientUtil mqttClientUtilBe = new MqttClientUtil();
+			mqttClientUtilBe.pushCData(configMqttMapper, mapSendInfo, TopicType.SYN_BILLET_PUSHSTRANDNOLENGTH.getTopicValue());
+			log.info("B端传递流号定尺参数，发送MQTT成功: {}", mapSendInfo);
+		} catch (Exception e) {
+			log.error("B端传递流号定尺参数，发送MQTT异常!", e);
+		}
+	}
 
 	public void sendFurnaceChangeToMqtt(FurnaceChangeData data) {
 		try {