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

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

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java

@@ -222,23 +222,12 @@ public class TerminalServiceImpl implements TerminalService {
 
     @Override
     public ServiceBody<TerminalModel> 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) {