From 28f9093269dfb0d91103b19917d71261e7e0d095 Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Wed, 10 May 2023 15:26:09 +0800
Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shxy/xymanager_common/model/TerminalModel.java  |  4 ++--
 .../com/shxy/xymanager_common/util/MyDateUtils.java | 13 +++++++++++++
 .../xymanager_service/impl/TerminalServiceImpl.java |  8 +++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java
index 569c9b0..28ee05c 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java
@@ -37,11 +37,11 @@ public class TerminalModel implements Serializable {
     @ApiModelProperty(value = "网络连接状态 ", example = "名称名称")
     private Integer connectionState;
 
-    @ApiModelProperty(value = "cmId", example = "123456")
+    @ApiModelProperty(value = "图像监测装置 ID", example = "123456")
     private String cmId;
 
     @ApiModelProperty(value = "工作状态更新时间", example = "123456")
-    private Date wsUpdateTime;
+    private String wsUpdateTime;
 
     @ApiModelProperty(value = "请求时间", example = "123456")
     private DateTime queryTime;
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
index f1062ec..218bc90 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
@@ -20,6 +20,7 @@ import java.util.Date;
  * @author 晶晶
  */
 public class MyDateUtils extends DateUtil {
+
     public static String YYYY = "yyyy";
 
     public static String YYYY_MM = "yyyy-MM";
@@ -193,4 +194,16 @@ public class MyDateUtils extends DateUtil {
         BigInteger l = BigInteger.valueOf(time * 1000l);
         return l;
     }
+
+    /**
+     * 10位时间戳转日期
+     *
+     * @return
+     */
+    public static String TimeSecondToDate(BigInteger time) {
+        long timeLong = Long.valueOf(String.valueOf(time));
+        SimpleDateFormat sdf = new SimpleDateFormat(YYYY_MM_DD_HH_MM_SS);
+        String date =sdf.format(timeLong*1000);
+        return date;
+    }
 }
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
index b7e6649..bda4ea4 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
@@ -25,12 +25,14 @@ import com.shxy.xymanager_dao.dao.TerminalsDao;
 import com.shxy.xymanager_service.interaction.Cma;
 import com.shxy.xymanager_service.service.TerminalService;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.expression.StringValue;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.validation.constraints.NotEmpty;
 import java.math.BigInteger;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -186,6 +188,7 @@ public class TerminalServiceImpl implements TerminalService {
         }
     }
 
+
     @Override
     public ServiceBody<TerminalModel> getTerminalStatus(Integer termId) {
         String cmdId = terminalsDao.getCmdIdByTermId(termId);
@@ -194,10 +197,11 @@ public class TerminalServiceImpl implements TerminalService {
         TerminalModel model = new TerminalModel();
         TerminalInfoDto dto = terminalsDao.getTerminalInfo(termId);
         if(null!=dto) {
+            String wsUpdateTime = MyDateUtils.TimeSecondToDate(dto.getWsUpdateTime());
             BeanUtils.copyProperties(dto, model);
             DateTime now = DateTime.now();
             model.setQueryTime(now);
-
+            model.setWsUpdateTime(wsUpdateTime);
         }
 
         return Asserts.success(model);
@@ -212,6 +216,8 @@ public class TerminalServiceImpl implements TerminalService {
         if(hasNew) {
             TerminalInfoDto dto = terminalsDao.getTerminalInfo(vo.getTermId());
             BeanUtils.copyProperties(dto,model);
+            String updateTime = MyDateUtils.TimeSecondToDate(dto.getWsUpdateTime());
+            model.setWsUpdateTime(updateTime);
             return Asserts.success(model);
         }
         return Asserts.success(null);