1、优化推送

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java

@@ -34,7 +34,6 @@ public class Forwarder {
     int totalSendNum = 0;
 
     int fwdCycleMinutes = 30;
-    static boolean isFwdTableInit = true;//false;
 
     @Autowired
     GnssDeviceMapper deviceMapper;
@@ -69,10 +68,6 @@ public class Forwarder {
         this.fwdNameType = fwdNameType;
         this.fwdCycleMinutes = cycle;
 
-        if(!isFwdTableInit){
-            isFwdTableInit = true;
-            fwdMapper.delete(null);
-        }
         QueryWrapper<GnssGroupFwd> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("name",fwdGroupId);
         queryWrapper.last("limit 1");
@@ -166,7 +161,7 @@ public class Forwarder {
         gnssQueryWrapper.eq("enabled",true);
         gnssQueryWrapper.eq("stabled",true);
         gnssQueryWrapper.isNotNull("rpose");
-        if(resendRecord != null && resendRecord.getDeviceid()!=null){
+        if(resendRecord != null && StringUtils.hasText(resendRecord.getDeviceid())){
             gnssQueryWrapper.eq("deviceid", resendRecord.getDeviceid());
         }
 
@@ -188,7 +183,7 @@ public class Forwarder {
             }
             if(projectId == null) continue;
             if(resendRecord != null && !projectId.equals(resendRecord.getProjectid())){
-                continue;
+                continue;//要求重传记录必须填项目号
             }
 
             List<GnssCalcData> recordsToSend = projects.get(projectId);

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJKForwarder.java

@@ -32,18 +32,23 @@ public class GXJKForwarder extends Forwarder {
     @Value("${gxjk.mqtt.server.clientid}")
     private String clientid;
 
+    @Value("${gxjk.mqtt.server.enabled}")
+    private boolean enabled;
+
     MQTTClient mqttClient;
 
     @PostConstruct
     void registerMe() throws MqttException {
-        init(FORWARDER_NAME, "MQTT "+brokerUrl,7,FWD_DEVICE_NAME,10);
+        init(FORWARDER_NAME, "MQTT "+brokerUrl,7,FWD_DEVICE_NAME,30);
         mqttClient = new MQTTClient(brokerUrl, username, password,clientid);
+        if(!enabled) return;
+
         try {
             mqttClient.connect();
-        }
+        } catch (Exception e) {
-        catch (Exception e){
             logger.error("gxjk mqtt connect failed: {}", e.toString());
         }
+
     }
 
     /**
@@ -51,6 +56,7 @@ public class GXJKForwarder extends Forwarder {
      */
     @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
+        if(!enabled) return;
         logger.debug("gxjk forwardGnss");
         if(mqttClient.isConnected()) forwardCurrentGnss();
         else{

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJS10mForwarder.java

@@ -24,12 +24,13 @@ import java.util.List;
 @EnableScheduling
 public class GXJS10mForwarder extends GXXfzForwarder{
     private final String FORWARDER_NAME = "广西新发展10分钟推送";
-    @Value("${xfz.server.host}")
+    @Value("${gxjs.server.host}")
     private String host;
 
-    @Value("${xfz.server.port}")
+    @Value("${gxjs.server.port}")
     private int port;
-    private boolean enabled=true;
+    @Value("${gxjs.server.enabled}")
+    private boolean enabled;
 
     @PostConstruct
     void registerMe(){

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXJSForwarder.java

@@ -27,12 +27,13 @@ public class GXJSForwarder extends GXXfzForwarder{
     private final String FORWARDER_NAME = "广西新发展";
     private final String inclineProjects = "20257071,20251131";
     private HashSet<String> inclineProjectSet = new HashSet<>();
-    @Value("${xfz.server.host}")
+    @Value("${gxjs.server.host}")
     private String host;
 
-    @Value("${xfz.server.port}")
+    @Value("${gxjs.server.port}")
     private int port;
-    private boolean enabled=true;
+    @Value("${gxjs.server.enabled}")
+    private boolean enabled;
 
     @PostConstruct
     void registerMe(){

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GXLJForwarder.java

@@ -19,7 +19,8 @@ public class GXLJForwarder extends GXXfzForwarder{
 
     @Value("${gxlj.server.port}")
     private int port;
-    private boolean enabled=true;
+    @Value("${gxlj.server.enabled}")
+    private boolean enabled;
 
     @PostConstruct
     void registerMe(){

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZB10mForwarder.java

@@ -19,7 +19,8 @@ public class GZB10mForwarder extends GXXfzForwarder{
 
     @Value("${gzb.server.port}")
     private int port;
-    private boolean enabled=true;
+    @Value("${gzb.server.enabled}")
+    private boolean enabled;
 
     @PostConstruct
     void registerMe(){

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZBForwarder.java

@@ -19,7 +19,8 @@ public class GZBForwarder extends GXXfzForwarder{
 
     @Value("${gzb.server.port}")
     private int port;
-    private boolean enabled=true;
+    @Value("${gzb.server.enabled}")
+    private boolean enabled;
 
     @PostConstruct
     void registerMe(){

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYForwarder.java

@@ -25,6 +25,8 @@ public class GZYForwarder extends Forwarder{
 
     @Value("${gzy.server.port}")
     private int port;
+    @Value("${gzy.server.enabled}")
+    private boolean enabled;
 
     UDPClient udpClient;
 
@@ -40,6 +42,7 @@ public class GZYForwarder extends Forwarder{
     @Scheduled(cron = "0 0 0/1 * * ?") // 每小时执行一次
     // @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
+        if(!enabled) return;
         logger.debug("gzy UDP forwardGnss");
         forwardCurrentGnss();
     }

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYMQTTForwarder.java

@@ -38,8 +38,8 @@ public class GZYMQTTForwarder extends Forwarder {
     private String clientid;
     @Value("${gzymqtt.server.topic}")
     private String topic;
-    //@Value("${gzymqtt.server.enabled}")
+    @Value("${gzymqtt.server.enabled}")
-    private boolean enabled=true;
+    private boolean enabled;
     @Autowired
     GnssStatusMsgMapper statusMsgMapper;
     MQTTClient mqttClient;

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/GZYZForwarder.java

@@ -29,7 +29,8 @@ public class GZYZForwarder extends GXXfzForwarder{
 
     @Value("${gzyz.server.port}")
     private int port;
-    private boolean enabled=true;
+    @Value("${gzyz.server.enabled}")
+    private boolean enabled;
 
     @PostConstruct
     void registerMe(){

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/KingMaForwarder.java

@@ -39,6 +39,8 @@ public class KingMaForwarder extends Forwarder{
 
     @Value("${kingma.server.data_host}")
     private String data_host;
+    @Value("${kingma.server.enabled}")
+    private boolean enabled;
     Map<String, String> header;
     LocalDateTime lastTokenTime = LocalDateTime.now();
 
@@ -55,6 +57,7 @@ public class KingMaForwarder extends Forwarder{
     @Scheduled(cron = "0 0 0/1 * * ?") // 每小时执行一次
     //@Scheduled(cron = "0 0/5 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
+        if(!enabled) return;
         logger.debug("kingma forwardGnss");
         forwardCurrentGnss();
     }

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder.java

@@ -24,6 +24,8 @@ public class ZNYForwarder extends Forwarder{
 
     @Value("${zny.server.host}")
     private String data_host;
+    @Value("${zny.server.enabled}")
+    boolean enabled;
 
     @PostConstruct
     void registerMe(){
@@ -41,6 +43,7 @@ public class ZNYForwarder extends Forwarder{
 
     @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
+        if(!enabled) return;
         logger.debug("zny forwardGnss");
         forwardCurrentGnss();
     }

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYForwarder2.java

@@ -24,7 +24,8 @@ public class ZNYForwarder2 extends Forwarder{
 
     @Value("${zny.server.host2}")
     private String data_host;
-
+    @Value("${zny.server.enabled}")
+    boolean enabled;
     @PostConstruct
     void registerMe(){
         init(FORWARDER_NAME, data_host,4,FWD_DEVICE_ALIAS_NAME,30);
@@ -34,6 +35,7 @@ public class ZNYForwarder2 extends Forwarder{
      */
     @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
+        if(!enabled) return;
         logger.debug("zny2 forwardGnss");
         forwardCurrentGnss();
     }

sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/ZNYMQTTForwarder.java

@@ -40,7 +40,8 @@ public class ZNYMQTTForwarder extends Forwarder {
     private String password;
     @Value("${zny.mqtt.clientid}")
     private String clientid;
-
+    @Value("${zny.mqtt.enabled}")
+    boolean enabled;
     @Autowired
     GnssStatusMsgMapper statusMsgMapper;
     MQTTClient mqttClient;
@@ -49,6 +50,7 @@ public class ZNYMQTTForwarder extends Forwarder {
     void registerMe() throws MqttException {
         init(FORWARDER_NAME, "MQTT "+brokerUrl,4,FWD_DEVICE_ALIAS_NAME,30);
         mqttClient = new MQTTClient(brokerUrl, username, password,clientid);
+        if(!enabled) return;
         try{
             mqttClient.connect();
         }
@@ -63,6 +65,7 @@ public class ZNYMQTTForwarder extends Forwarder {
     //@Scheduled(cron = "0 0 0/1 * * ?") // 每小时执行一次
     @Scheduled(cron = "0 0/30 * * * ?") // 每30分钟执行一次
     private void forwardGnss() {
+        if(!enabled) return;
         logger.debug("zny mqtt forwardGnss");
         if(mqttClient.isConnected()) forwardCurrentGnss();
         else{