|
|
@@ -3,6 +3,7 @@ package com.zd.laboratory.controller;
|
|
|
import com.zd.common.core.annotation.Log;
|
|
|
import com.zd.common.core.annotation.PreAuthorize;
|
|
|
import com.zd.common.core.log.BusinessType;
|
|
|
+import com.zd.common.core.redis.RedisService;
|
|
|
import com.zd.common.core.security.TokenService;
|
|
|
import com.zd.common.core.utils.DateUtils;
|
|
|
import com.zd.common.core.utils.ExcelUtil;
|
|
|
@@ -13,6 +14,7 @@ import com.zd.laboratory.service.ILabSecurityApplyService;
|
|
|
import com.zd.laboratory.service.ILabSubjectService;
|
|
|
import com.zd.laboratory.service.IXxpCardInfoService;
|
|
|
import com.zd.laboratory.service.IXxpDutyService;
|
|
|
+import com.zd.model.constant.CacheConstants;
|
|
|
import com.zd.model.domain.ResultData;
|
|
|
import com.zd.model.domain.per.PerFun;
|
|
|
import com.zd.model.domain.per.PerPrefix;
|
|
|
@@ -48,6 +50,8 @@ public class LabXxpCardInfoController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
|
+ @Autowired
|
|
|
+ private RedisService redisService;
|
|
|
|
|
|
/**
|
|
|
* 查询电子信息牌列表
|
|
|
@@ -58,6 +62,12 @@ public class LabXxpCardInfoController extends BaseController {
|
|
|
public TableDataInfo<XxpCardInfo> list(XxpCardInfo xxpCardInfo) {
|
|
|
startPage("create_time", "descending");
|
|
|
List<XxpCardInfo> list = xxpCardInfoService.selectXxpCardInfoList(xxpCardInfo);
|
|
|
+ for (XxpCardInfo cardInfo:list){
|
|
|
+ //设备是否在线
|
|
|
+ if(StringUtils.isNotNull(redisService.getCacheObject(CacheConstants.HEARTBEAT+cardInfo.getCardNum()))){
|
|
|
+ cardInfo.setOperate(2);
|
|
|
+ }
|
|
|
+ }
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
xuxiaofei