From 8113e6d10af343883dba40d15dbbe37f23718f12 Mon Sep 17 00:00:00 2001
From: gaoben <ben.gao@shapelight.net>
Date: Mon, 22 Apr 2024 09:38:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=84=B8=E6=A8=A1=E7=89=88=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=99=E7=BB=88=E7=AB=AF=E6=98=BE=E7=A4=BAfacemodel?=
 =?UTF-8?q?flag=EF=BC=8C=E5=9C=A8=E5=BF=83=E8=B7=B3=E4=B8=AD=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5displayFaceFlag=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../httpapi/controler/HttpApiController.java  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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);
     }