Guwan
/
Guwan-smartSchool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

脸模版：增加这终端显示facemodelflag，在心跳中增加字段displayFaceFlag标识

This commit is contained in:
gaoben 2024-04-22 09:38:30 +08:00
parent 5fce9374b2
commit 8113e6d10a
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java
View File

@ -22,14 +22,8 @@ import net.shapelight.modules.httpapi.service.AuthService;
import net.shapelight.modules.nettyapi.config.CmdConstant; import net.shapelight.modules.nettyapi.config.CmdConstant;
import net.shapelight.modules.nettyapi.config.MyMessage; import net.shapelight.modules.nettyapi.config.MyMessage;
import net.shapelight.modules.nettyapi.utils.Result; import net.shapelight.modules.nettyapi.utils.Result;
import net.shapelight.modules.sys.entity.SysDeviceAppEntity; import net.shapelight.modules.sys.entity.*;
import net.shapelight.modules.sys.entity.SysDeviceEntity; import net.shapelight.modules.sys.service.*;
import net.shapelight.modules.sys.entity.SysDeviceLogEntity;
import net.shapelight.modules.sys.entity.SysDeviceTypeEntity;
import net.shapelight.modules.sys.service.SysDeviceAppService;
import net.shapelight.modules.sys.service.SysDeviceLogService;
import net.shapelight.modules.sys.service.SysDeviceService;
import net.shapelight.modules.sys.service.SysDeviceTypeService;
import net.shapelight.modules.ten.entity.*; import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.service.*; import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.vo.*; import net.shapelight.modules.vo.*;
@ -100,6 +94,8 @@ public class HttpApiController {
private TenLabelService tenLabelService; private TenLabelService tenLabelService;
@Autowired @Autowired
private TenCheckService tenCheckService; private TenCheckService tenCheckService;
@Autowired
private SysUserService sysUserService;
/** /**
* *
@ -229,6 +225,14 @@ public class HttpApiController {
if(redisUtils.get("DeviceRestart-"+sn)!=null){ if(redisUtils.get("DeviceRestart-"+sn)!=null){
configMap.put("restart",1); configMap.put("restart",1);
} }
//增加显示脸模flag
SysUserEntity user = sysUserService.getById(deviceEntity.getTenantId());
if (user.getPoliceNumber()!=null && user.getPoliceNumber().equals("2")) {
configMap.put("displayFaceFlag",2);
}else{
configMap.put("displayFaceFlag",1);
}
return R.ok().put("data",configMap); return R.ok().put("data",configMap);
} }