暂时关闭mq

depot-intelligent/pom.xml

@@ -33,7 +33,7 @@
         <skipTests>true</skipTests>
         <java.version>1.8</java.version>
         <spring-cloud.version>Hoxton.SR12</spring-cloud.version>
-        <rocketmq-starter.version>2.2.1</rocketmq-starter.version>
+        <!--<rocketmq-starter.version>2.2.1</rocketmq-starter.version>-->
     </properties>
 
     <dependencies>
@@ -167,11 +167,11 @@
             <artifactId>spring-session-data-redis</artifactId>
         </dependency>
         <!-- rocketmq -->
-        <dependency>
+        <!--<dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>${rocketmq-starter.version}</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 
     <dependencyManagement>

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/pushs/service/impl/GrainPushsServiceImpl.java

@@ -12,8 +12,8 @@ import com.chinaitop.depot.intelligent.grainsituation.model.TWarningThresholdHis
 import com.chinaitop.depot.intelligent.grainsituation.service.TWarningThresholdHistoryService;
 import com.chinaitop.depot.intelligent.grainsituation.service.TemperatureRecordService;
 import com.chinaitop.depot.intelligent.pushs.service.GrainPushsService;
-import com.chinaitop.depot.intelligent.rocketMQ.producerMQ.model.MqMsg;
-import com.chinaitop.depot.intelligent.rocketMQ.producerMQ.service.RocketMqService;
+/*import com.chinaitop.depot.intelligent.rocketMQ.producerMQ.model.MqMsg;
+import com.chinaitop.depot.intelligent.rocketMQ.producerMQ.service.RocketMqService;*/
 import com.chinaitop.depot.intelligent.utils.JsonToObjectUtils;
 import com.chinaitop.depot.intelligent.utils.UuidUtils;
 import com.chinaitop.depot.intelligent.utils.VerificationSourceUtils;
@@ -54,8 +54,8 @@ public class GrainPushsServiceImpl implements GrainPushsService {
     private ResolutionToSendAlarmService resolutionToSendAlarmService;
     @Resource
     private TWarningThresholdHistoryService tWarningThresholdHistoryService;
-    @Resource
-    private RocketMqService rocketMqService;
+    /*@Resource
+    private RocketMqService rocketMqService;*/
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -280,15 +280,15 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                 if (tTestdataList.size() > 0) {
                     temperatureRecordService.insertBatch(tTestdataList);
                     // 消息 CRUD 增加(Create)、* 不需要检索(Retrieve)、更新(Update)和删除(Delete) 小写区分增删改查
-                    rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_testdata_c", null, tTestdataList));
+//                    rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_testdata_c", null, tTestdataList));
                 }
                 if (tTestdataLayerArrayList.size() > 0) {
                     tTestdataLayerMapper.insertBatch(tTestdataLayerArrayList);
-                    rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_testdata_layer_c", null, tTestdataLayerArrayList));
+//                    rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_testdata_layer_c", null, tTestdataLayerArrayList));
                 }
                 if (tWarningThresholdHistorieList.size() > 0) {
                     tWarningThresholdHistoryMapper.insertBatch(tWarningThresholdHistorieList);
-                    rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_warning_threshold_history_c", null, tWarningThresholdHistorieList));
+//                    rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_warning_threshold_history_c", null, tWarningThresholdHistorieList));
                     List<TWarningThresholdHistory> collect = tWarningThresholdHistorieList.stream().filter(TWarningThresholdHistory -> TWarningThresholdHistory.getwWarning().equals("0")).collect(Collectors.toList());
                     boolean alarmDetails = resolutionToSendAlarmService.getAlarmDetails(collect);
                     if (!alarmDetails) {
@@ -296,7 +296,7 @@ public class GrainPushsServiceImpl implements GrainPushsService {
                             obj.setIsSend("2");
                             tWarningThresholdHistoryService.updateById(obj);
                         });
-                        rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_warning_threshold_history_u", null, collect));
+//                        rocketMqService.asyncSend(new MqMsg("smart_grp_yn", "t_warning_threshold_history_u", null, collect));
                     }
                 }
             }

depot-intelligent/src/main/java/com/chinaitop/depot/intelligent/rocketMQ/producerMQ/service/impl/RocketMqServiceImpl.java

@@ -1,6 +1,6 @@
 package com.chinaitop.depot.intelligent.rocketMQ.producerMQ.service.impl;
 
-import com.chinaitop.depot.intelligent.rocketMQ.producerMQ.model.MqMsg;
+/*import com.chinaitop.depot.intelligent.rocketMQ.producerMQ.model.MqMsg;
 import com.chinaitop.depot.intelligent.rocketMQ.producerMQ.service.RocketMqService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.producer.SendCallback;
@@ -9,26 +9,29 @@ import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.Resource;
+import javax.annotation.Resource;*/
 
 /**
  * @author qingsong.han
  * @description:
  * @create 2022-03-23 14:09
  */
+/*
 @Slf4j
 @Service
 public class RocketMqServiceImpl implements RocketMqService {
     @Resource
     private RocketMQTemplate rocketMQTemplate;
 
-    /**
+    */
+/**
      * topic: smart_grp_yn
      * tags:
      *  测温: yn_cw
      *
      * @param mqMsg 发送消息实体类
-     */
+     *//*
+
     @Override
     public void asyncSend(MqMsg mqMsg) {
         log.info("asyncSend发送消息到mqMsg: {}", mqMsg);
@@ -51,3 +54,4 @@ public class RocketMqServiceImpl implements RocketMqService {
         );
     }
 }
+*/

depot-intelligent/src/main/resources/bootstrap.yml

@@ -20,7 +20,7 @@ spring:
   # 数据库配置
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
+    url: jdbc:mysql://localhost:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
     username: root
     password: 123456
   # 缓存配置
@@ -68,14 +68,14 @@ num_version3: :20013
 cxf:
   path: /intelligent
 
-rocketmq:
-  # master
-  name-server: 172.16.4.16:9876;172.16.4.17:9876
-  producer:
-    group: depot_yn_group
-    send-message-timeout: 2000
-    retry-times-when-send-async-failed: 5
-    retry-times-when-send-failed: 5
+#rocketmq:
+#  # master
+#  name-server: 172.16.0.8:9876;172.16.0.10:9876
+#  producer:
+#    group: depot_yn_group
+#    send-message-timeout: 2000
+#    retry-times-when-send-async-failed: 5
+#    retry-times-when-send-failed: 5
 # sql 打印
 #logging:
 #  level: