查询时间格式处理

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/controller/AlarmController.java

@@ -135,7 +135,7 @@ public class AlarmController {
     @RequestMapping(name = "数据告警-图", value = "/dataAlarm", method = RequestMethod.POST)
     public HttpResult dataAlarm(@Valid @RequestBody AlarmStatisticsQuery query, HttpServletRequest request) {
         log.info("数据告警-图 dataAlarm param {}", query);
-        return kwsAlarmService.dataAlarm(query, request);
+            return kwsAlarmService.dataAlarm(query, request);
     }
 
     @Log(description = "设备告警-图")

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsAlarmMapper.java

@@ -35,14 +35,14 @@ public interface KwsAlarmMapper extends BaseMapper<KwsAlarm> {
      * @param projectId  项目
      * @param mountainId 矿山
      * @param level      等级
-     * @param type      告警类型
+     * @param type       告警类型
      * @return
      */
     List<Map<String, Object>> getDataAlarmToDay(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("level") String level,
                                                 @Param("projectId") String projectId, @Param("mountainId") String mountainId, @Param("type") Integer type);
 
     List<Map<String, Object>> getDataAlarmToWeek(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("level") String level,
-                                                 @Param("projectId") String projectId, @Param("mountainId") String mountainId, @Param("type") Integer type);
+                                                 @Param("projectId") String projectId, @Param("mountainId") String mountainId, @Param("dateTimeFormat") String dateTimeFormat, @Param("type") Integer type);
 
     List<Map<String, Object>> getDataAlarmToYear(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("level") String level,
                                                  @Param("projectId") String projectId, @Param("mountainId") String mountainId, @Param("type") Integer type);
@@ -53,8 +53,9 @@ public interface KwsAlarmMapper extends BaseMapper<KwsAlarm> {
 
     List<AlarmLogThresholdVO> selectDetailList(@Param("page") Integer page, @Param("pageSize") Integer pageSize);
 
-    int  selectDetailCount();
+    int selectDetailCount();
 
     List<KwsAlarm> selectListByQuery(@Param("query") AlarmLogThresholdQuery query, @Param("mountainId") String mountainId);
-    List<KwsAlarm> selectExportListByQuery(@Param("query") AlarmLogThresholdExport query, @Param("mountainId") String mountainId,@Param("idsList") List<Long> idsList);
+
+    List<KwsAlarm> selectExportListByQuery(@Param("query") AlarmLogThresholdExport query, @Param("mountainId") String mountainId, @Param("idsList") List<Long> idsList);
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/KwsAlarmService.java

@@ -557,16 +557,19 @@ public class KwsAlarmService {
         if (StringUtils.isBlank(startTime) && StringUtils.isBlank(endTime) && StringUtils.isBlank(latitude)) {
             List<String> weekMondayAndSunday = com.sckw.excel.utils.DateUtil.getWeekMondayAndSunday();
             startTime = weekMondayAndSunday.get(0);
+            String dateTimeFormat = startTime;
             endTime = weekMondayAndSunday.get(1);
             //按照天纬度统计
-            returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(), type);
+            returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(),dateTimeFormat, type);
         } else if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
+            String dateTimeFormat = startTime;
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
             //统计小时的纬度统计
-            returnList = getDataAlarmToDay(startTime, endTime, level, projectId, headerData.getMountainId(), type);
+            returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(),dateTimeFormat, type);
         } else {
             if (latitude != null) {
+
                 if ("1".equals(latitude)) {
                     startTime = DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd") + " 00:00:00";
                     endTime = DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd") + " 23:59:59";
@@ -574,14 +577,16 @@ public class KwsAlarmService {
                 } else if ("2".equals(latitude)) {
                     List<String> weekMondayAndSunday = com.sckw.excel.utils.DateUtil.getWeekMondayAndSunday();
                     startTime = weekMondayAndSunday.get(0);
+                    String dateTimeFormat = startTime;
                     endTime = weekMondayAndSunday.get(1);
-                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(), type);
+                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(),dateTimeFormat, type);
                 } else if ("3".equals(latitude)) {
                     LocalDate firstDayOfMonth = com.sckw.excel.utils.DateUtil.getFirstDayOfMonth();
                     startTime = com.sckw.excel.utils.DateUtil.dateToStr(firstDayOfMonth, "yyyy-MM-dd") /*+ " 00:00:00"*/;
+                    String dateTimeFormat = startTime;
                     LocalDate lastDayOfMonth = com.sckw.excel.utils.DateUtil.getLastDayOfMonth();
                     endTime = com.sckw.excel.utils.DateUtil.dateToStr(lastDayOfMonth, "yyyy-MM-dd")/* + " 23:59:59"*/;
-                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(), type);
+                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(),dateTimeFormat, type);
                 } else if ("4".equals(latitude)) {
                     //查询全年每个月份
                     startTime = com.sckw.excel.utils.DateUtil.getYearFirstMonth() + "-01";
@@ -652,8 +657,8 @@ public class KwsAlarmService {
         return list;
     }
 
-    private List<Map<String, Object>> getDataAlarmToWeek(String startTime, String endTime, String level, String projectId, String mountainId, Integer type) {
-        List<Map<String, Object>> list = alarmMapper.getDataAlarmToWeek(startTime, endTime, level, projectId, mountainId, type);
+    private List<Map<String, Object>> getDataAlarmToWeek(String startTime, String endTime, String level, String projectId, String mountainId,String dateTimeFormat, Integer type) {
+        List<Map<String, Object>> list = alarmMapper.getDataAlarmToWeek(startTime, endTime, level, projectId, mountainId,dateTimeFormat, type);
         return list;
     }
 
@@ -675,9 +680,10 @@ public class KwsAlarmService {
         if (StringUtils.isBlank(startTime) && StringUtils.isBlank(endTime) && StringUtils.isBlank(latitude)) {
             List<String> weekMondayAndSunday = com.sckw.excel.utils.DateUtil.getWeekMondayAndSunday();
             startTime = weekMondayAndSunday.get(0);
+            String dateTimeFormat = startTime;
             endTime = weekMondayAndSunday.get(1);
             //按照天纬度统计
-            returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(), type);
+            returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(),dateTimeFormat, type);
         } else if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {
             startTime = startTime + " 00:00:00";
             endTime = endTime + " 23:59:59";
@@ -692,14 +698,16 @@ public class KwsAlarmService {
                 } else if ("2".equals(latitude)) {
                     List<String> weekMondayAndSunday = com.sckw.excel.utils.DateUtil.getWeekMondayAndSunday();
                     startTime = weekMondayAndSunday.get(0);
+                    String dateTimeFormat = startTime;
                     endTime = weekMondayAndSunday.get(1);
-                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(), type);
+                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(),dateTimeFormat, type);
                 } else if ("3".equals(latitude)) {
                     LocalDate firstDayOfMonth = com.sckw.excel.utils.DateUtil.getFirstDayOfMonth();
                     startTime = com.sckw.excel.utils.DateUtil.dateToStr(firstDayOfMonth, "yyyy-MM-dd") /*+ " 00:00:00"*/;
                     LocalDate lastDayOfMonth = com.sckw.excel.utils.DateUtil.getLastDayOfMonth();
                     endTime = com.sckw.excel.utils.DateUtil.dateToStr(lastDayOfMonth, "yyyy-MM-dd")/* + " 23:59:59"*/;
-                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(), type);
+                    String dateTimeFormat = startTime;
+                    returnList = getDataAlarmToWeek(startTime, endTime, level, projectId, headerData.getMountainId(),dateTimeFormat, type);
                 } else if ("4".equals(latitude)) {
                     //查询全年每个月份
                     startTime = com.sckw.excel.utils.DateUtil.getYearFirstMonth() + "-01";

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsAlarmMapper.xml

@@ -252,7 +252,7 @@
 
     <select id="getDataAlarmToWeek" resultType="java.util.Map">
         SELECT a.date as dateTime, COALESCE(b.number, 0) as number
-        from (select date_add(#{startTime}, interval row1 DAY) date
+        from (select date_add(#{dateTimeFormat}, interval row1 DAY) date
               from
                   (
                   SELECT @row := @row + 1 as row1 FROM