综合展示修改

sms_water/src/main/java/com/huaxu/service/impl/MonitorDataReportServiceImpl.java

@@ -937,9 +937,9 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
 
         waterSupplyCharts.sort(Comparator.comparing(WaterSupplyChart::getSort));
         for(int i=0;i<6;i++){
-            if(i == waterSupplyCharts.size() || !waterSupplyCharts.get(i).getSort().equals(i+1)){
-                waterSupplyCharts.add(i,new WaterSupplyChart(i+1));
-            }
+//            if(i == waterSupplyCharts.size() || !waterSupplyCharts.get(i).getSort().equals(i+1)){
+//               waterSupplyCharts.add(i,new WaterSupplyChart(i+1));
+//            }
         }
         waterSupplyCharts.sort(Comparator.comparing(WaterSupplyChart::getSort).reversed());
         return waterSupplyCharts;

sms_water/src/main/resources/application-dev.properties

@@ -118,10 +118,10 @@ ribbon.ReadTimeout=5000
 ribbon.ConnectionTimeout=5000
 
 ##rabbitmq
-message.spring.rabbitmq.host=127.0.0.1
-message.spring.rabbitmq.port=5672
-message.spring.rabbitmq.username=guest
-message.spring.rabbitmq.password=guest
+message.spring.rabbitmq.host=114.135.61.188
+message.spring.rabbitmq.port=55672
+message.spring.rabbitmq.username=zoniot
+message.spring.rabbitmq.password=zcxk100
 message.spring.rabbitmq.virtual-host= /
 message.spring.rabbitmq.requested-heartbeat = 10
 message.spring.rabbitmq.listener.simple.acknowledge-mode = NONE
@@ -138,12 +138,12 @@ dispath.routing.key=dipathKey
 
 
 
-receiveData.spring.rabbitmq.host=127.0.0.1
+receiveData.spring.rabbitmq.host=47.112.217.10
 receiveData.spring.rabbitmq.port=5672
-receiveData.spring.rabbitmq.username=guest
-receiveData.spring.rabbitmq.password=guest
+receiveData.spring.rabbitmq.username=huaxu
+receiveData.spring.rabbitmq.password=huaxu123
 receiveData.spring.rabbitmq.virtual-host=/
-receiveData.spring.rabbitmq.listener.queue=new_test_queues
+receiveData.spring.rabbitmq.listener.queue=new_hx_queue
 receiveData.spring.rabbitmq.listener.simple.acknowledge-mode = NONE
 receiveData.spring.rabbitmq.listener.simple.prefetch = 20