From e459551757a0f83d1f2670f0c7a2b516c08ed3d7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 23 六月 2023 16:20:53 +0800
Subject: [PATCH] 修改时间格式化
---
src/main/java/com/yssh/dao/SuYuanMapper.java | 24 ++++++++++--------------
src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java | 13 +++++--------
src/main/java/com/yssh/utils/CalculateUtils.java | 9 ---------
src/main/java/com/yssh/utils/DateUtils.java | 8 ++++++++
4 files changed, 23 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/yssh/dao/SuYuanMapper.java b/src/main/java/com/yssh/dao/SuYuanMapper.java
index aaf7d51..6b2df8c 100644
--- a/src/main/java/com/yssh/dao/SuYuanMapper.java
+++ b/src/main/java/com/yssh/dao/SuYuanMapper.java
@@ -1,26 +1,20 @@
package com.yssh.dao;
-import java.util.Date;
import java.util.List;
import java.util.Map;
+import com.yssh.entity.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import com.yssh.entity.DistanceSuYuan;
-import com.yssh.entity.SuYuan2d;
-import com.yssh.entity.SuYuan3d;
-import com.yssh.entity.SuYuanMonitorData;
-import com.yssh.entity.Temporary;
-
@Mapper
-public interface SuYuanMapper extends BaseMapper{
+public interface SuYuanMapper extends BaseMapper {
Integer isTableExists(String tableName);
int createTable(@Param("tableName") String tableName);
-
+
List<SuYuan2d> get2d(@Param("tableName") String tableName, @Param("ids") List<String> ids);
-
+
List<SuYuan3d> get3d(@Param("tableName") String tableName, @Param("ids") List<String> ids);
List<DistanceSuYuan> getDistanceSuYuan(@Param("tableName") String tableName, @Param("ids") List<String> ids);
@@ -28,21 +22,23 @@
DistanceSuYuan getSuYuan500Max(@Param("tableName") String tableName, @Param("ids") List<String> ids);
DistanceSuYuan getSuYuanById(@Param("tableName") String tableName, @Param("id") String id);
-
+
List<Temporary> getTemporary(@Param("tableName") String tableName, @Param("ids") List<String> ids);
-
+
int update(@Param("tableName") String tableName, @Param("id") String id, @Param("value") String value);
List<SuYuan2d> getAlarmsAnalyse(@Param("tableName") String tableName, @Param("ids") List<String> ids);
List<SuYuan2d> getWarningAnalyse(@Param("tableName") String tableName, @Param("ids") List<String> ids);
-
+
List<SuYuanMonitorData> getMonitorData(@Param("tableNames") List<String> tableNames, @Param("id") String id);
List<SuYuanMonitorData> getNewMonitorData(String name, String start, String end);
-
+
//鑾峰彇鏈湀鎸囧畾鐩戞祴绔欑偣鐩戞祴鍊煎澶х殑鏁版嵁
Map<String, Object> getMonthValueDataMax(@Param("tableNames") List<String> tableNames, @Param("id") String id);
int updateVocsName(String table, String id, String vocsName);
+
+ SuYuan700 selectSuYuan700ById(String id, String time);
}
diff --git a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
index 677c451..27ca2f1 100644
--- a/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
+++ b/src/main/java/com/yssh/service/impl/SuYuanServiceImpl.java
@@ -1,6 +1,5 @@
package com.yssh.service.impl;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
@@ -44,8 +43,6 @@
@Resource
private QxshMapper qxshMapper;
-
- private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH");
//@Transactional
//@Override
@@ -260,18 +257,18 @@
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.HOUR_OF_DAY, 23);
- String end = dateFormat.format(calendar.getTime());
+ String end = DateUtils.getYyyyMmDdHh(calendar.getTime()); //dateFormat.format(calendar.getTime());
calendar.set(Calendar.HOUR_OF_DAY, 0);
calendar.add(Calendar.DATE, -7);
- String start = dateFormat.format(calendar.getTime());
+ String start = DateUtils.getYyyyMmDdHh(calendar.getTime());
return suYuanMapper.getNewMonitorData(checkPoint.getName(), start, end);
}
@Override
public int updateVocsName(Date date, String id, String vocsName) {
- String table = "su_yuan_" + dateFormat.format(date); // new Date()
+ String table = "su_yuan_" + DateUtils.getYyyyMmDdHh(date); // new Date()
if (isTableExists(table) == 0) {
return 0;
}
@@ -282,7 +279,7 @@
@Override
public List<Qxsh> queryQxsh(Date date) {
- String time = dateFormat.format(date);
+ String time = DateUtils.getYyyyMmDdHh(date);
return qxshMapper.selectByTime(time);
}
@@ -299,7 +296,7 @@
@Override
public SuYuan700 selectSuYuan700ById(String id, Date date) {
- //
+ String time = DateUtils.getYyyyMmDdHhMmSs(date);
return null;
}
diff --git a/src/main/java/com/yssh/utils/CalculateUtils.java b/src/main/java/com/yssh/utils/CalculateUtils.java
index 614773a..30c0abd 100644
--- a/src/main/java/com/yssh/utils/CalculateUtils.java
+++ b/src/main/java/com/yssh/utils/CalculateUtils.java
@@ -14,15 +14,6 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
public class CalculateUtils {
- private final static SimpleDateFormat ymdh = new SimpleDateFormat("yyyyMMddHH");
-
- /**
- * 鑾峰彇骞存湀鏃ユ椂
- */
- public static String getYearMonthDayHour(Date date) {
- return ymdh.format(date);
- }
-
/**
* 榛樿鍦扮悆鍗婂緞,璧ら亾鍗婂緞(鍗曚綅m)
*/
diff --git a/src/main/java/com/yssh/utils/DateUtils.java b/src/main/java/com/yssh/utils/DateUtils.java
index 0e771f4..1e99ee1 100644
--- a/src/main/java/com/yssh/utils/DateUtils.java
+++ b/src/main/java/com/yssh/utils/DateUtils.java
@@ -79,6 +79,14 @@
}
}
+ public static String getYyyyMmDdHh(Date date) {
+ return new SimpleDateFormat(YYYYMMDDHH).format(date);
+ }
+
+ public static String getYyyyMmDdHhMmSs(Date date) {
+ return new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS).format(date);
+ }
+
/**
* 鏃ユ湡璺緞 鍗冲勾/鏈�/鏃� 濡�2018/08/08
*/
--
Gitblit v1.9.3