diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java b/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java index 2398487..0a54e4c 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java @@ -22,14 +22,8 @@ import net.shapelight.modules.httpapi.service.AuthService; import net.shapelight.modules.nettyapi.config.CmdConstant; import net.shapelight.modules.nettyapi.config.MyMessage; import net.shapelight.modules.nettyapi.utils.Result; -import net.shapelight.modules.sys.entity.SysDeviceAppEntity; -import net.shapelight.modules.sys.entity.SysDeviceEntity; -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.sys.entity.*; +import net.shapelight.modules.sys.service.*; import net.shapelight.modules.ten.entity.*; import net.shapelight.modules.ten.service.*; import net.shapelight.modules.vo.*; @@ -100,6 +94,8 @@ public class HttpApiController { private TenLabelService tenLabelService; @Autowired private TenCheckService tenCheckService; + @Autowired + private SysUserService sysUserService; /** * @@ -229,6 +225,14 @@ public class HttpApiController { if(redisUtils.get("DeviceRestart-"+sn)!=null){ 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); }