修复自定义报表问题

sms_water/src/main/java/com/huaxu/quartz/job/MonitorDataReportByDayJob.java

@@ -34,7 +34,7 @@ public  class MonitorDataReportByDayJob implements Job, Serializable {
     public void execute(JobExecutionContext context)  {
         try {
             log.info("日报报任务开始执行");
-             monitorDataService.getMonitorDataReportByHour();
+            monitorDataService.getMonitorDataReportByHour();
             dataAlarmHourJobService.execute();
             log.info("日报任务执行结束");
         } catch (Exception e) {
@@ -43,5 +43,4 @@ public  class MonitorDataReportByDayJob implements Job, Serializable {
         }
     }
 
-
 }

sms_water/src/main/java/com/huaxu/quartz/service/AbstractDataAlarmJobService.java

@@ -72,9 +72,10 @@ public abstract class AbstractDataAlarmJobService {
             log.info("获取数据报警管理参数数据为空");
             return;
         }
+        DataAlarmManageEntity manageEntity = null;
         Map<Long, DataAlarmDetailEntity> alarmDetailsDtoMap = getMapDataAlarmDetail(manageVoList);
         for (DataAlarmManageVo manageVo : manageVoList) {
-            DataAlarmManageEntity manageEntity = new DataAlarmManageEntity();
+            manageEntity = new DataAlarmManageEntity();
             BeanUtils.copyProperties(manageVo, manageEntity);
             DataAlarmDetailEntity nowDetailEntity = this.getAlarmValue(manageEntity);
             if (nowDetailEntity == null) {
@@ -145,7 +146,7 @@ public abstract class AbstractDataAlarmJobService {
     * @author lihui
     * @date 11:06 2021/6/2
     * @param alarmDetailsDtoMap : 现有报警数据
-    * @param manageVo :      报警设置数据
+    * @param manageVo :          报警设置数据
     * @param nowDetailEntity :  当前报警数据
     * @return void
     **/

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

@@ -251,7 +251,7 @@
         FROM sms_device_parm a
         INNER JOIN sms_device d on d.ID = a.DEVICE_ID
         INNER JOIN sms_device_attribute b on a.ATTRIBUTE_ID=b.ID
-        LEFT JOIN sms_report_dimension_setting s on s.device_parm_id=a.ID
+        LEFT JOIN sms_report_dimension_setting s on s.device_parm_id=a.ID and s.type is null
         <if test ="report.userId != null">
             and s.user_id =#{report.userId}
         </if>