5号机自动化交班

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendChangeShiftServiceImpl.java

@@ -50,8 +50,8 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
         String changeShiftTime = jsonObj.getString("changeShiftTime");
         log.info("{}{}", "C端自动化交班请求时间：", changeShiftTime);
 
-        String keyShiftGroupsix = String.format("class:shift:group:%s", "6");
-        String keyShiftsix = String.format("class:shift:%s", "6");
+        String keyShiftGroupsix = String.format("class:shift:group:%s", "5");
+        String keyShiftsix = String.format("class:shift:%s", "5");
 
         String sixShiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroupsix));
         String sixShift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftsix));
@@ -126,7 +126,7 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
         JSONObject result = new JSONObject();
         // 缓存交班索引ID
         String nextshiftIdKey = String.format("class:nextshift:Id:%s", "5-6");
-        List<String> ccmNoList = Arrays.asList("5", "6");
+        List<String> ccmNoList = Arrays.asList("5");
         for (String ccmNo : ccmNoList){
             String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
             String keyShift = String.format("class:shift:%s", ccmNo);

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/push/utils/MqttClientCallback.java

@@ -239,8 +239,8 @@ public class MqttClientCallback implements MqttCallback, MqttCallbackExtended{
                 case SYN_BILLET_CHANGESHIFT:
                     try {
                         JSONObject jsonObject = JSON.parseObject(payload);
-                        log.info("{}{}", "自动化交班接收消息：", jsonObject);
-//                        billetHotsendChangeShiftService.autoChangeShift(jsonObject);
+                        log.info("{}{}", "5号机自动化交班接收消息：", jsonObject);
+                        billetHotsendChangeShiftService.autoChangeShift(jsonObject);
                     } catch (Exception e) {
                         log.info("{}{}", "mqtt处理自动化交班消息出错: ", e.getMessage());
                     }