添加if结束标签

fiveep-persistence/src/main/resources/mapper/mysql/RtAnalogDataMapper.xml

@@ -108,6 +108,7 @@
             </if>
             <if test="startTime != null and endTime != null">
                 and rad.dataTime BETWEEN #{startTime},#{endTime}
+            </if>
             <if test="endTime != null and startTime != null">
                 and rad.dataTime BETWEEN   #{startTime} and #{endTime}
             </if>

fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -189,4 +189,16 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         list.add(CommonIcoVO.builder().name("runStates").list(runStatus).listDate(runDates).build());
         return list;
     }
+
+//    /**
+//     * 组装数据
+//     */
+//    public void assembleData(){
+//        List<AlarmPower> list = baseMapper.list(userId, siteId, null, dayStartTime, dayEndTime, null, null);
+//        for (:) {
+//
+//        }
+//        list.stream().filter(alarmPower -> alarmPower.getSendingTime())
+//
+//    }
 }