Commit 2b73af30 LN

panaCim根据keepAlive接口判断是否在线

1 个父辈 32b80edf
...@@ -22,6 +22,7 @@ import com.neotel.smfcore.core.system.util.EquipStatusUtil; ...@@ -22,6 +22,7 @@ import com.neotel.smfcore.core.system.util.EquipStatusUtil;
import com.neotel.smfcore.custom.fuji.bean.FujiConfig; import com.neotel.smfcore.custom.fuji.bean.FujiConfig;
import com.neotel.smfcore.custom.fuji.config.FujiCacheConfig; import com.neotel.smfcore.custom.fuji.config.FujiCacheConfig;
import com.neotel.smfcore.custom.hanwha.handler.TMSCommunicator; import com.neotel.smfcore.custom.hanwha.handler.TMSCommunicator;
import com.neotel.smfcore.custom.panacim.PanaApiController;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -155,6 +156,11 @@ public class EquipViewController { ...@@ -155,6 +156,11 @@ public class EquipViewController {
// dto.setStatus(1); // dto.setStatus(1);
} }
} }
}else if(equip.getType().equalsIgnoreCase(EquipmentType.PANACIMNEOLINK.name())) {
if (PanaApiController.isOnLine()) {
dto.setOnLine(true);
dto.setStatus(1);
}
} }
resultList.add(dto); resultList.add(dto);
......
...@@ -109,6 +109,20 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -109,6 +109,20 @@ public class PanaApiController extends BaseSmfApiListener {
private static AtomicLong seq = new AtomicLong(0); private static AtomicLong seq = new AtomicLong(0);
//panancim调用keepAlive的时间
private static long lastKeepAliveTime=-1;
public static boolean isOnLine() {
if (lastKeepAliveTime <= -1||ObjectUtil.isEmpty(PanaCIMIP)) {
return false;
}
if ((System.currentTimeMillis() - lastKeepAliveTime) < (10 * 1000)) {
return true;
}
return false;
}
@RequestMapping(value = "/setConfiguration") @RequestMapping(value = "/setConfiguration")
@ResponseBody @ResponseBody
public String setConfiguration(@RequestBody Map<String,String> map) { public String setConfiguration(@RequestBody Map<String,String> map) {
...@@ -163,6 +177,7 @@ public class PanaApiController extends BaseSmfApiListener { ...@@ -163,6 +177,7 @@ public class PanaApiController extends BaseSmfApiListener {
@RequestMapping(value = "/keepAlive") @RequestMapping(value = "/keepAlive")
@ResponseBody @ResponseBody
public String keepAlive(HttpServletRequest request) { public String keepAlive(HttpServletRequest request) {
lastKeepAliveTime=System.currentTimeMillis();
return "OK"; return "OK";
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!