|
|
@@ -106,7 +106,7 @@ public class TermBusiness {
|
|
|
return this.getTermInfoByTermNo(termNo, defaultConfig.getTenantId());
|
|
|
}
|
|
|
|
|
|
- public R<TermInfo> getTermInfoByTermNo(Long termNo, java.lang.String tenantId) {
|
|
|
+ public R<TermInfo> getTermInfoByTermNo(Long termNo, String tenantId) {
|
|
|
RemoteXfTermVo remoteVo = remoteTermService.queryByNo(termNo, tenantId);
|
|
|
if (ObjectUtil.isEmpty(remoteVo)) {
|
|
|
return R.fail(MessageFormat.format("机号为[{0}]的设备不存在", termNo), null);
|
|
|
@@ -117,7 +117,7 @@ public class TermBusiness {
|
|
|
return R.ok(termInfo);
|
|
|
}
|
|
|
|
|
|
- public R<Map<java.lang.String, Object>> checkTermTime(Integer termNo) {
|
|
|
+ public R<Map<String, Object>> checkTermTime(Integer termNo) {
|
|
|
XfTermVo termVo = termService.queryVoOneByNo(Long.valueOf(termNo));
|
|
|
if (ObjectUtil.isEmpty(termVo)) {
|
|
|
return R.fail(MessageFormat.format("机号为[{0}]的设备不存在", termNo), null);
|
|
|
@@ -132,7 +132,7 @@ public class TermBusiness {
|
|
|
lastCheckModify.put(termNo, currentTime + 1000 * 60);
|
|
|
}
|
|
|
resultMap.put("time", DateUtil.format(nowDate, DefaultConstants.DATE_TIME_FORMAT));
|
|
|
- resultMap.put("type", "te_term");
|
|
|
+ resultMap.put("type", "");
|
|
|
resultMap.put("data", termVo == null ? "" : termVo.getTermName());
|
|
|
|
|
|
return R.ok(resultMap);
|