钢坯自动化备份服务

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

@@ -242,20 +242,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 		saveBilletRodLineCommom(billetHotsendDetailsVo);
 		log.info("C端自动化操作结果，{}新增成功:{}", operationMsg, billetNos);
 	}
-	public static void main(String[] args) {
-		String billetNos = "255061616805,255061615705,255061615606,255061575804";
-
-		String ninthCharStr = Optional.ofNullable(billetNos)
-				.filter(s -> !s.isEmpty())
-				.map(s -> s.split(","))
-				.filter(arr -> arr.length > 0)
-				.map(arr -> arr[0])
-				.filter(num -> num.length() >= 9)
-				.map(num -> String.valueOf(num.charAt(8)))
-				.orElse(""); // 默认返回空字符串或其他默认值
-
-		System.out.println("第一个坯号的第9位字符是：" + ninthCharStr);
-	}
 	/**
 	 * 5、6号机  轧钢外运
 	 * 去上若  车牌为陕E开头
@@ -471,8 +457,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 	@Override
 	public void autoDepartTrucking(JSONObject jsonObject) {
 
-		log.info("{}{}", "C端自动化离站发车接收mqtt参数:", jsonObject);
-
+		log.info("{}{}", ">>>>>>主服务停止，C端钢坯自动化处理<离站发车>消息: ", jsonObject);
 		String ccmNo = jsonObject.getString("ccmNo");
 		String licensePlate = jsonObject.getString("licensePlate");
 		String positionNum = jsonObject.getString("positionNum");

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

@@ -21,6 +21,7 @@ import org.jeecg.modules.storageBill.service.IStorageBillService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -38,7 +39,6 @@ public class MqttClientCallback implements MqttCallback, MqttCallbackExtended{
     private String topics;
     long reconnectTimes = 1;
 
-
     public MqttClientCallback(String mqttClientId, MqttClient myMQTTClient, String topics) {
         this.mqttClientId = mqttClientId;
         this.myMQTTClient = myMQTTClient;
@@ -127,7 +127,7 @@ public class MqttClientCallback implements MqttCallback, MqttCallbackExtended{
      */
     @Override
     public void messageArrived(String topic, MqttMessage message){
-        log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>mqtt收到主题{}的消息:{}", topic, new String(message.getPayload()));
+        log.info("^^^^^^^^^^^^^^^^^^^^^^^^^^备份服务收到mqtt主题{}的消息:{}", topic, new String(message.getPayload()));
         // 通过原子类的自增方法来统计消息次数
         messageCount.incrementAndGet();
         try {
@@ -148,120 +148,123 @@ public class MqttClientCallback implements MqttCallback, MqttCallbackExtended{
                 }
             }
             switch (topicType) {
-                case TRACE_PERFORMANCE_CONVERTER_ADD:
-                    try {
-                        HeatsActuals heatsActuals = JSON.parseObject(payload, HeatsActuals.class);
-                        heatsActualsService.addC(heatsActuals);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理炉次实绩消息出错: ", e.getMessage());
-                    }
-                    return;
                 case TRACE_PERFORMANCE_BILLET_ADD:
                     try {
                         BilletBasicInfo billetBasicInfo = JSON.parseObject(payload, BilletBasicInfo.class);
+                        log.info("{}{}", ">>>>>>主服务停止，C端钢坯自动化处理<钢坯实绩>消息: ", billetBasicInfo.getBilletNo());
                         billetBasicInfoService.addC(billetBasicInfo);
                     } catch (Exception e) {
                         log.info("{}{}", "mqtt处理钢坯基础消息出错: ", e.getMessage());
                     }
                     return;
-                case SYN_STORAGE_BILL_ADD:
-                    try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        storageBillService.autoAddStorageBill(jsonObject);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理钢坯装运单新增消息出错: ", e.getMessage());
-                    }
-                    return;
-                case SYN_BILLET_HOTSEND_BASE_SAVE:
-                    try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        billetHotsendBaseService.autoAddRodLineCommon(jsonObject);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理自动化新增5号机直轧棒1和6号机高线保存出错: ", e.getMessage());
-                    }
-                    return;
-                case SYN_BILLET_HOTSEND_BASE_SHIPP_SAVE:
-                    try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        billetHotsendBaseService.autoAddRodLine(jsonObject);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理5、6号机-自动化热装保存消息出错: ", e.getMessage());
-                    }
-                    return;
-                case SYN_BILLET_HOTSEND_BASE_SHIPP_DEPART:
-                    try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        billetHotsendBaseService.autoDepartTrucking(jsonObject);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理5、6号机-自动化离站发车消息出错: ", e.getMessage());
-                    }
-                    return;
-                case SYN_BILLET_ADD_STACKING:
-                    try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        stackingAndLoadingVehiclesService.autoAddStack(jsonObject);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理新增堆垛消息出错: ", e.getMessage());
-                    }
-                    return;
-                case SYN_BILLET_STACKING_AND_LOADING_VEHICLES_LOADING:
-                    try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        stackingAndLoadingVehiclesService.autoSaveStackLoading(jsonObject);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理堆垛保存消息出错: ", e.getMessage());
-                    }
-                    return;
                 case TRACE_BILLETASSEMBLYNUMBER_BILLET_ADD:
                     try {
                         BilletAssemblyNumber billetAssemblyNumber = JSON.parseObject(payload, BilletAssemblyNumber.class);
+                        log.info("{}{}", ">>>>>>主服务停止，C端钢坯自动化处理<组坯实绩>消息: ", billetAssemblyNumber.getAssemblyNumber());
                         billetAssemblyNumberService.addBilletAssemblyNumber(billetAssemblyNumber);
                     } catch (Exception e) {
                         log.info("{}{}", "mqtt处理组坯实绩消息出错: ", e.getMessage());
                     }
                     return;
-                case SYN_STORAGE_BILL_UPDATE:
-                    try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        storageBillService.autoUpdateLicensePlate(jsonObject);
-                    } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理钢坯装运单车牌更新消息出错: ", e.getMessage());
-                    }
-                    return;
-                case SYN_BILLET_CHANGESHIFT:
+                case TRACE_PERFORMANCE_CONVERTER_ADD:
                     try {
-                        JSONObject jsonObject = JSON.parseObject(payload);
-                        log.info("{}{}", "5号机自动化交班接收消息：", jsonObject);
-                        billetHotsendChangeShiftService.autoChangeShift(jsonObject);
+                        HeatsActuals heatsActuals = JSON.parseObject(payload, HeatsActuals.class);
+                        log.info("{}{}", ">>>>>>主服务停止，C端钢坯自动化处理<炉次实绩>消息: ", heatsActuals.getHeatsCode());
+                        heatsActualsService.addC(heatsActuals);
                     } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理5号机自动化交班消息出错: ", e.getMessage());
+                        log.info("{}{}", "mqtt处理炉次实绩消息出错: ", e.getMessage());
                     }
                     return;
-                case SYN_BILLET_SIX_CHANGESHIFT:
+                case SYN_STORAGE_BILL_ADD:
                     try {
                         JSONObject jsonObject = JSON.parseObject(payload);
-                        log.info("{}{}", "6号机自动化交班接收消息：", jsonObject);
-                        billetHotsendChangeShiftService.autoChangeShiftSix(jsonObject);
+                        storageBillService.autoAddStorageBill(jsonObject);
                     } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理6号机自动化交班消息出错: ", e.getMessage());
+                        log.info("{}{}", "mqtt处理钢坯装运单新增消息出错: ", e.getMessage());
                     }
                     return;
-                case SYN_STACKING_CLEARLOCATION:
+                case SYN_STORAGE_BILL_UPDATE:
                     try {
                         JSONObject jsonObject = JSON.parseObject(payload);
-                        stackingAndLoadingVehiclesService.stackingClearLocation(jsonObject);
+                        storageBillService.autoUpdateLicensePlate(jsonObject);
                     } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理堆垛位置清空异常: ", e.getMessage());
+                        log.info("{}{}", "mqtt处理钢坯装运单车牌更新消息出错: ", e.getMessage());
                     }
                     return;
-                case SYN_STACK_PLACEHOLDERS:
+                case SYN_BILLET_HOTSEND_BASE_SHIPP_DEPART:
                     try {
                         JSONObject jsonObject = JSON.parseObject(payload);
-                        stackingAndLoadingVehiclesService.stackQueryLocation(jsonObject);
+                        billetHotsendBaseService.autoDepartTrucking(jsonObject);
                     } catch (Exception e) {
-                        log.info("{}{}", "mqtt处理堆垛层数占位总数异常: ", e.getMessage());
+                        log.info("{}{}", "mqtt处理5、6号机-自动化离站发车消息出错: ", e.getMessage());
                     }
                     return;
+//                case SYN_BILLET_HOTSEND_BASE_SAVE:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        billetHotsendBaseService.autoAddRodLineCommon(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理自动化新增5号机直轧棒1和6号机高线保存出错: ", e.getMessage());
+//                    }
+//                    return;
+//                case SYN_BILLET_HOTSEND_BASE_SHIPP_SAVE:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        billetHotsendBaseService.autoAddRodLine(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理5、6号机-自动化热装保存消息出错: ", e.getMessage());
+//                    }
+//                    return;
+//                case SYN_BILLET_ADD_STACKING:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        stackingAndLoadingVehiclesService.autoAddStack(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理新增堆垛消息出错: ", e.getMessage());
+//                    }
+//                    return;
+//                case SYN_BILLET_STACKING_AND_LOADING_VEHICLES_LOADING:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        stackingAndLoadingVehiclesService.autoSaveStackLoading(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理堆垛保存消息出错: ", e.getMessage());
+//                    }
+//                    return;
+//                case SYN_BILLET_CHANGESHIFT:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        log.info("{}{}", "5号机自动化交班接收消息：", jsonObject);
+//                        billetHotsendChangeShiftService.autoChangeShift(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理5号机自动化交班消息出错: ", e.getMessage());
+//                    }
+//                    return;
+//                case SYN_BILLET_SIX_CHANGESHIFT:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        log.info("{}{}", "6号机自动化交班接收消息：", jsonObject);
+//                        billetHotsendChangeShiftService.autoChangeShiftSix(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理6号机自动化交班消息出错: ", e.getMessage());
+//                    }
+//                    return;
+//                case SYN_STACKING_CLEARLOCATION:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        stackingAndLoadingVehiclesService.stackingClearLocation(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理堆垛位置清空异常: ", e.getMessage());
+//                    }
+//                    return;
+//                case SYN_STACK_PLACEHOLDERS:
+//                    try {
+//                        JSONObject jsonObject = JSON.parseObject(payload);
+//                        stackingAndLoadingVehiclesService.stackQueryLocation(jsonObject);
+//                    } catch (Exception e) {
+//                        log.info("{}{}", "mqtt处理堆垛层数占位总数异常: ", e.getMessage());
+//                    }
+//                    return;
                 default:
                     break;
             }

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/storageBill/service/impl/StorageBillServiceImpl.java

@@ -12,7 +12,6 @@ import org.jeecg.modules.billetActual.entity.*;
 import org.jeecg.modules.billetActual.service.IBilletHotsendChangeShiftService;
 import org.jeecg.modules.billetAutoException.service.IBilletAutoExceptionService;
 import org.jeecg.modules.billetHotsendConfig.entity.BilletHotsendTypeConfig;
-import org.jeecg.modules.billetHotsendConfig.service.IBilletHotsendTypeConfigService;
 import org.jeecg.modules.operateLog.entity.OperateLog;
 import org.jeecg.modules.operateLog.service.IOperateLogService;
 import org.jeecg.modules.shiftConfiguration.entity.ShiftConfiguration;
@@ -63,14 +62,12 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
     @Autowired
     private IShiftConfigurationService shiftConfigurationService;
 
-    @Autowired
-    private IBilletHotsendTypeConfigService billetHotsendTypeConfigService;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void autoAddStorageBill(JSONObject jsonObject) {
         try {
-            log.info("{}{}", "C端自动化创建钢坯装运单参数:", jsonObject);
+            log.info("{}{}", ">>>>>>主服务停止，C端钢坯自动化处理<新增装运单>消息: ", jsonObject);
+
             String ccmNo = jsonObject.getString("ccmNo");
             String licensePlate = jsonObject.getString("licensePlate");
             String positionNum = jsonObject.getString("positionNum");
@@ -210,7 +207,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void autoUpdateLicensePlate(JSONObject jsonObject) {
-        log.info("{}{}", "C端自动化钢坯装运单更新车牌号参数:", jsonObject);
+        log.info("{}{}", ">>>>>>主服务停止，C端钢坯自动化处理<装运单车牌更新>消息: ", jsonObject);
         try {
             String ccmNo = jsonObject.getString("ccmNo");
             String licensePlate = jsonObject.getString("licensePlate");

zgzt-sys-java/jeecg-module-gather/src/main/java/org/jeecg/modules/watch/s7gatherWatch.java

@@ -27,8 +27,7 @@ import java.util.List;
 @EnableAsync
 @Component
 @Slf4j
-@EnableScheduling
-
+//@EnableScheduling
 public class s7gatherWatch {
 
     @Autowired

zgzt-sys-java/jeecg-module-system/jeecg-system-start/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>jeecg-system-start</artifactId>
+    <artifactId>jeecg-system-start-bak</artifactId>
     
     <dependencies>
         <!-- SYSTEM 系统管理模块 -->

zgzt-sys-java/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8181
+  port: 8182
   tomcat:
     max-swallow-size: -1
     connection-timeout: 60000
@@ -21,6 +21,9 @@ management:
     web:
       exposure:
         include: metrics,httptrace-new
+  health:
+    rabbit:
+      enabled: false
 
 spring:
   influx:

zgzt-sys-java/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt

@@ -1,17 +1,23 @@
 ${AnsiColor.BRIGHT_BLUE}
-   (_)                          | |               | |
-    _  ___  ___  ___ __ _ ______| |__   ___   ___ | |_ 
-   | |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __|
-   | |  __/  __/ (_| (_| |      | |_) | (_) | (_) | |_ 
-   | |\___|\___|\___\__, |      |_.__/ \___/ \___/ \__|
-  _/ |               __/ |                             
- |__/               |___/
-
+                                         ___
+                                       ,--.'|_
+       ,----,                  ,----,  |  | :,'
+     .'   .`|  ,----._,.     .'   .`|  :  : ' :
+  .'   .'  .' /   /  ' /  .'   .'  .'.;__,'  /
+,---, '   ./ |   :     |,---, '   ./ |  |   |
+;   | .'  /  |   | .\  .;   | .'  /  :__,'| :
+`---' /  ;--,.   ; ';  |`---' /  ;--,  '  : |__
+  /  /  / .`|'   .   . |  /  /  / .`|  |  | '.'|
+./__;     .'  `---`-'| |./__;     .'   ;  :    ;
+;   |  .'     .'__/\_: |;   |  .'      |  ,   /
+`---'         |   :    :`---'           ---`-'
+               \   \  /
+                `--`-'
 
 ${AnsiColor.BRIGHT_GREEN}
 Jeecg  Boot Version: 3.7.1
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
-产品官网： www.jeecg.com
-版权所属： 北京国炬信息技术有限公司
-公司官网： www.guojusoft.com
+系统名称： 钢坯自动化
+版权所属： 陕西中工智通
+公司官网： www.zgzt.com
 ${AnsiColor.BLACK}