Browse Source

设备运行查询传送的日期问题

sl 2 months ago
parent
commit
d68a5b7739

+ 9 - 3
module_tpm/src/main/java/org/jeecg/modules/equipmentOnoff/service/impl/EquipmentOnoffServiceImpl.java

@@ -117,13 +117,19 @@ public class EquipmentOnoffServiceImpl extends ServiceImpl<EquipmentOnoffMapper,
             return Result.error("id为" + historyParamDayDto.getEquipmentid() + "的设备找不到设备编号,无法进行数据查询!");
         }
         //根据时间确定要查询哪一天的数据
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC")); // 设置时区为UTC
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        sdf1.setTimeZone(TimeZone.getTimeZone("UTC")); // 设置时区为UTC
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
 //        String dateStr = historyParamDayDto.getDate();
         Date date;
         String dateStr = historyParamDayDto.getDate().replace("\"", "");
         try {
-            date = sdf.parse(dateStr);
+            if(dateStr.contains("T")){
+                date = sdf1.parse(dateStr);
+            }else{
+                date = sdf2.parse(dateStr);
+            }
+
         } catch (ParseException e) {
             return Result.error("日期类型转换失败!");
         }