#20230510 欣影管理平台装置信息查询代码

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;

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;
+    }
 }

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);