生产调度bug修改

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

@@ -561,7 +561,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
 
         for (int i = 0; i < 30; i++) {
             LocalDate newLocalDate = localDate.plusDays(-i - 1);
-            if (i <= deviceWaterSupplies.size()
+            if (i == deviceWaterSupplies.size()
                     || !newLocalDate.isEqual(LocalDate.of(deviceWaterSupplies.get(i).getYear(),
                     deviceWaterSupplies.get(i).getMonth(),
                     deviceWaterSupplies.get(i).getDay()))) {

sms_water/src/main/resources/mapper/MonitorDataReportMapper.xml

@@ -896,7 +896,7 @@
         from sms_scene_type st
         left join sms_scene s on s.SCENE_TYPE_ID =st.id
         left join sms_device_parm dp on s.id=dp.SCENE_ID
-        left join sms_day_report r on r.DEVICE_ID= dp.DEVICE_ID and r.ATTRIBUTE_ID = dp.ATTRIBUTE_ID
+        left join sms_month_report r on r.DEVICE_ID= dp.DEVICE_ID and r.ATTRIBUTE_ID = dp.ATTRIBUTE_ID
 
         where  dp.`STATUS`=1 and st.SCENE_TYPE_NAME = '水厂'
         and dp.PARM_TYPE = 3   and dp.TENANT_ID=#{tenantId}

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

@@ -82,5 +82,6 @@ receive.exchange.name=messageExchange
 dispath.routing.key=dipathKey
 
 
-
+receive.exchange.name=messageExchange
+dispath.routing.key=dipathKey