From 5fc183d203037725c301081667598136ebc53afc Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Sat, 13 May 2023 13:18:01 +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 | 5 +++-- .../xymanager_service/impl/TerminalServiceImpl.java | 13 +------------ 2 files changed, 4 insertions(+), 14 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 28ee05c..9550bcf 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 @@ -43,7 +43,8 @@ public class TerminalModel implements Serializable { @ApiModelProperty(value = "工作状态更新时间", example = "123456") private String wsUpdateTime; - @ApiModelProperty(value = "请求时间", example = "123456") - private DateTime queryTime; + @ApiModelProperty(value = "是否最新", example = "123456") + private Boolean isNew = false; + } 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 84d3ea6..2147629 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 @@ -222,23 +222,12 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody getLastedTerminalStatus(TerminalStatusVo vo) { - /* BigInteger wsUpdateTime = terminalsDao.getUpdateTime(vo.getTermId()); - BigInteger queryTime = MyDateUtils.TimeMillSecond2Second(vo.getQueryTime()); - Boolean hasNew = wsUpdateTime.compareTo(queryTime) < 0 ? false : true; - TerminalModel model = new TerminalModel(); - 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);*/ String result = terminalPhotoDao.getRequestResult(vo.getRequestId()); TerminalModel model = new TerminalModel(); if(StringUtils.isNotBlank(result)) { JSONObject resultObj = JSONObject.parseObject(result); model = JSONObject.parseObject(resultObj.get("groupData").toString(), TerminalModel.class); + model.setIsNew(true); }else{ TerminalInfoDto dto = terminalsDao.getTerminalInfo(vo.getTermId()); if(dto!=null) {