生产调度接口修改

sms_water/src/main/java/com/huaxu/dto/generalView/DeviceWaterDetail.java

@@ -25,7 +25,7 @@ public class DeviceWaterDetail implements Serializable {
     @ApiModelProperty("设备id")
     private Integer deviceId;
     @ApiModelProperty("属性id")
-    private Integer attributeId ;
+    private Long attributeId ;
     @ApiModelProperty("标记")
     private Integer parmType;
     @ApiModelProperty("值")

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

@@ -633,7 +633,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                 for (MonitorDataValueEntity monitorDataValueEntity : monitorDataEntity.getDataValues()) {
                     if (monitorDataValueEntity.getAttributeId().equals(deviceWaterDetail.getAttributeId())) {
                         //累计当天流量
-                        deviceWaterAmount.addWaterSupplyAmountForDay(new BigDecimal(monitorDataValueEntity.getDataValue()).subtract(deviceWaterDetail.getLatestValue()).add(deviceWaterDetail.getAmount()));
+                        deviceWaterAmount.addWaterSupplyAmountForDay(new BigDecimal(monitorDataValueEntity.getDataValue()).subtract(deviceWaterDetail.getLatestValue()));
                     }
                 }
             }
@@ -646,7 +646,7 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                 for (MonitorDataValueEntity monitorDataValueEntity : monitorDataEntity.getDataValues()) {
                     if (monitorDataValueEntity.getAttributeId().equals(deviceWaterDetail.getAttributeId())) {
                         //累计当天流量
-                        deviceWaterAmount.addWaterIntakeAmountForDay(new BigDecimal(monitorDataValueEntity.getDataValue()).subtract(deviceWaterDetail.getLatestValue()).add(deviceWaterDetail.getAmount()));
+                        deviceWaterAmount.addWaterIntakeAmountForDay(new BigDecimal(monitorDataValueEntity.getDataValue()).subtract(deviceWaterDetail.getLatestValue()));
                     }
                 }
             }
@@ -850,12 +850,12 @@ public class MonitorDataReportServiceImpl implements MonitorDataReportService {
                         if (monitorDataEntity != null && monitorDataEntity.getDataValues() != null && monitorDataEntity.getDataValues().size() > 0) {
                             monitorDataEntity.getDataValues().stream()
                                     .filter(monitorDataValueEntity ->
-                                            monitorDataValueEntity.getAttributeId().equals(deviceWaterDetail.getAttributeId().longValue())
+                                            monitorDataValueEntity.getAttributeId().equals(deviceWaterDetail.getAttributeId())
                                     )
                                     .forEach(monitorDataValueEntity ->
                                             //累计当天流量
                                             sceneWaterAmount.setWaterAmount(sceneWaterAmount.getWaterAmount().add(
-                                                    new BigDecimal(monitorDataValueEntity.getDataValue()).subtract(deviceWaterDetail.getLatestValue()).add(deviceWaterDetail.getAmount())))
+                                                    new BigDecimal(monitorDataValueEntity.getDataValue()).subtract(deviceWaterDetail.getLatestValue())))
                                     );
                         }
                     });

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

@@ -1001,12 +1001,11 @@
             ,dp.DEVICE_ID as "deviceId"
             ,dp.ATTRIBUTE_ID as "attributeId"
             ,dp.PARM_TYPE as "parmType"
-            ,max(ifnull(r.LATEST_VALUE,0))  as "latestValue"
-            ,sum(ifnull(r.SUM_VALUE,0)) as "amount"
+            ,ifnull(r.LATEST_VALUE,0)  as "latestValue"
         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.PARENT_SCENE_ID
-        left join sms_day_report r on r.DEVICE_ID= dp.DEVICE_ID and r.ATTRIBUTE_ID = dp.ATTRIBUTE_ID and r.year = #{year} and r.month= #{month} and r.day = #{day}
+        left join sms_month_report r on r.DEVICE_ID= dp.DEVICE_ID and r.ATTRIBUTE_ID = dp.ATTRIBUTE_ID and r.year = #{year} and r.month= #{month} and r.day = #{day}
         where  dp.`STATUS`=1 and st.SCENE_TYPE_NAME = #{sceneTypeName}
         and dp.PARM_TYPE =#{parmType}   and dp.TENANT_ID=#{tenantId}
         <if test="userType!=null and userType!=-999 and userType!=-9999 and  programItems != null and programItems.size() > 0">
@@ -1037,7 +1036,6 @@
             </if>
         </if>
 
-        group by s.SCENE_NAME,dp.DEVICE_ID ,dp.ATTRIBUTE_ID,dp.PARM_TYPE
     </select>
     <select id="getDeviceWaterDetailForMonth" resultType="java.math.BigDecimal">
         select