From 76b408284c8eb7d4a3884bffe98cd9ee61decb05 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 23 七月 2024 17:19:00 +0800
Subject: [PATCH] 人脸登录更新
---
src/main/java/com/whyc/controller/FaceController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/FaceController.java b/src/main/java/com/whyc/controller/FaceController.java
index 22bd49f..71ad2d1 100644
--- a/src/main/java/com/whyc/controller/FaceController.java
+++ b/src/main/java/com/whyc/controller/FaceController.java
@@ -3,18 +3,19 @@
import com.arcsoft.face.FaceEngine;
import com.arcsoft.face.toolkit.ImageFactory;
import com.arcsoft.face.toolkit.ImageInfo;
+import com.whyc.constant.UserOperation;
import com.whyc.constant.YamlProperties;
import com.whyc.dto.Response;
import com.whyc.factory.FaceEngineFactory;
import com.whyc.pojo.PermitGroup;
import com.whyc.pojo.UserInf;
-import com.whyc.service.FaceService;
-import com.whyc.service.PermitGroupUserService;
-import com.whyc.service.UserService;
+import com.whyc.service.*;
import com.whyc.util.ActionUtil;
+import com.whyc.util.CommonUtil;
import com.whyc.util.FaceIdentifyUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -46,6 +48,12 @@
@Resource
private UserService userService;
+
+ @Resource
+ private MapOutlineService mapOutlineService;
+
+ @Autowired
+ private BaoJiGroupUserService baoJiGroupUserService;
@GetMapping("activeOnline")
@ApiOperation(value = "鍦ㄧ嚎婵�娲讳汉鑴歌瘑鍒紩鎿�",notes = "鍙渶瑕佸垰寮�濮嬫椂璋冪敤涓�娆�,浼氬鑷碼ppId涓庣‖浠惰澶囩粦瀹�,蹇呴』鏈夊閮ㄧ綉缁�,鍚﹀垯婵�娲讳細澶辫触!" +
@@ -360,7 +368,8 @@
if(!temp.getUId().equals(userByUKeyId.getUId())){
return res.set(1,false,"UKey瀵瑰簲鐢ㄦ埛鍜屽綋鍓嶄汉鑴稿搴旂敤鎴蜂笉鍖归厤");
}
- res.setData2(temp);
+ List<Object> dataList = new ArrayList<>();
+ dataList.add(temp);
// 灏嗙櫥闄嗘垚鍔熺殑鐢ㄦ埛瀛樺叆session
ActionUtil.getSession().setAttribute("user", temp);
@@ -370,12 +379,22 @@
ActionUtil.getSession().setAttribute("ip", ActionUtil.getRequest().getRemoteAddr());
List<PermitGroup> permitList = permitGroupUserService.getPermitByUser(temp.getUId());
if (permitList!=null && permitList.size()!=0) {
+ dataList.add(permitList.get(0).getPermitGroupId());
ActionUtil.getSession().setAttribute("permits", permitList);
} else {
res.setCode(1);
res.setData(false);
res.setMsg("杩樻湭鍒嗛厤鏉冮檺");
}
+
+ //鏌ヨ鐢ㄦ埛瀵瑰簲鐨勭彮缁勬爣璇�
+ dataList.add(baoJiGroupUserService.getGroupFlag(temp.getUId().intValue()));
+ //鏌ヨ婵�娲荤殑鍦板浘
+ String mapName = mapOutlineService.selectMapName();
+ dataList.add(mapName);
+ CommonUtil.record(temp.getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeName(), UserOperation.TYPE_LOGIN.getTypeNameEn());
+ res.setData2(dataList);
+
//灏嗘柊鐧诲綍鐨勭敤鎴峰瓨鍏pplication
userService.setApplication(temp);
}
--
Gitblit v1.9.1