From b25b814a949d2065a61fd3167206ffb51a57af65 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期日, 28 四月 2024 15:31:09 +0800
Subject: [PATCH] 修改告警阈值重启线程
---
src/main/java/com/whyc/controller/FaceController.java | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/whyc/controller/FaceController.java b/src/main/java/com/whyc/controller/FaceController.java
index 375441b..ccb0889 100644
--- a/src/main/java/com/whyc/controller/FaceController.java
+++ b/src/main/java/com/whyc/controller/FaceController.java
@@ -3,6 +3,7 @@
import com.arcsoft.face.FaceEngine;
import com.arcsoft.face.toolkit.ImageFactory;
import com.arcsoft.face.toolkit.ImageInfo;
+import com.whyc.constant.YamlProperties;
import com.whyc.dto.Response;
import com.whyc.factory.FaceEngineFactory;
import com.whyc.pojo.PermitGroup;
@@ -50,8 +51,18 @@
@ApiOperation(value = "鍦ㄧ嚎婵�娲讳汉鑴歌瘑鍒紩鎿�",notes = "鍙渶瑕佸垰寮�濮嬫椂璋冪敤涓�娆�,浼氬鑷碼ppId涓庣‖浠惰澶囩粦瀹�,蹇呴』鏈夊閮ㄧ綉缁�,鍚﹀垯婵�娲讳細澶辫触!" +
"鍚庣画浣跨敤鏃犻渶鍐嶈皟鐢ㄦ縺娲�,鍙互绂荤嚎浣跨敤")
public Response activeOnline(){
- Response model = new Response();
- boolean b = FaceIdentifyUtil.activeOnline();
+ boolean b = FaceIdentifyUtil.active(1);
+ if(b){
+ return new Response().set(1,true,"寮曟搸婵�娲绘垚鍔�");
+ }else{
+ return new Response().set(1,false,"寮曟搸婵�娲诲け璐�,璇锋鏌ョ綉缁滄槸鍚︿负澶栫綉骞剁‘璁ppId鍜宬ey鏄惁姝ｇ‘!");
+ }
+ }
+
+ @GetMapping("activeOffline")
+ @ApiOperation(value = "绂荤嚎婵�娲讳汉鑴歌瘑鍒紩鎿�,澧炲�肩増浣跨敤")
+ public Response activeOffline(){
+ boolean b = FaceIdentifyUtil.active(2);
if(b){
return new Response().set(1,true,"寮曟搸婵�娲绘垚鍔�");
}else{
@@ -64,6 +75,8 @@
public Response add(@RequestBody Map<String,Object> paramMap ){
String fileData = (String) paramMap.get("fileData");
String uName = (String) paramMap.get("uName");
+ //杩囨护 uName鐨勭壒娈婂瓧绗�,閬垮厤璺緞閬嶅巻鏀诲嚮
+ uName = ActionUtil.filterFileName(uName);
Integer uId = Integer.parseInt((String)paramMap.get("uId"));
//浼犲弬 uId,uName,fileData--鏂囦欢娴�
fileData = fileData.replaceAll(" ", "+");
@@ -102,7 +115,12 @@
File jarFile = applicationHome.getDir();
//瀛樺偍浜鸿劯鍥剧墖鐨勬枃浠跺す
- String fileDirName = jarFile.getParentFile().toString()+File.separator+"fg_photo";
+ String fileDirName;
+ if(YamlProperties.runModel == 1) {
+ fileDirName = jarFile.getParentFile().toString() + File.separator + "fg_photo";
+ }else{
+ fileDirName = jarFile.toString() + File.separator + "fg_photo";
+ }
File file = new File(fileDirName);
//涓嶅瓨鍦ㄥ垯鍒涘缓璇ユ枃浠跺す
@@ -112,16 +130,22 @@
//鏂囦欢鍏ㄨ矾寰�
String fileName = fileDirName + File.separator + uName + ".jpg";
-
+ FileOutputStream fot=null;
try {
- FileOutputStream fot = new FileOutputStream(fileName);
-
+ fot = new FileOutputStream(fileName);
fot.write(dataBytes);
fot.flush();
- fot.close();
} catch (IOException e) {
e.printStackTrace();
+ }finally {
+ if(fot!=null){
+ try {
+ fot.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
/*=========鏁版嵁搴撹〃鏇存柊===========*/
@@ -139,11 +163,13 @@
* 浜鸿劯搴撶鐞�: 鏇存柊
* @return
*/
- @PutMapping
+ @PostMapping("update")
@ApiOperation(value = "鏇存柊")
public Response update(@RequestBody String fileData,@RequestParam String uName){
//浼犲弬,uName,fileData--鏂囦欢娴�
+ //杩囨护 uName鐨勭壒娈婂瓧绗�,閬垮厤璺緞閬嶅巻鏀诲嚮
+ uName = ActionUtil.filterFileName(uName);
//鐢变簬鍥剧墖瀛楃涓叉槸鐢眀ase64缂栫爜鐨�,瑙ｇ爜鎴愬瓧鑺傛暟缁�
fileData = fileData.replaceAll(" ", "+");
fileData = fileData.split(",")[1];
@@ -173,7 +199,12 @@
File jarFile = applicationHome.getDir();
//瀛樺偍浜鸿劯鍥剧墖鐨勬枃浠跺す
- String fileDirName = jarFile.getParentFile().toString()+File.separator+"fg_photo";
+ String fileDirName;
+ if(YamlProperties.runModel == 1) {
+ fileDirName = jarFile.getParentFile().toString() + File.separator + "fg_photo";
+ }else{
+ fileDirName = jarFile.toString() + File.separator + "fg_photo";
+ }
File file = new File(fileDirName);
//涓嶅瓨鍦ㄥ垯鍒涘缓璇ユ枃浠跺す
@@ -183,16 +214,21 @@
//鏂囦欢鍏ㄨ矾寰�
String fileName = fileDirName + File.separator + uName + ".jpg";
-
+ FileOutputStream fot =null;
try {
- FileOutputStream fot = new FileOutputStream(fileName);
-
+ fot = new FileOutputStream(fileName);
fot.write(dataBytes);
fot.flush();
- fot.close();
-
} catch (IOException e) {
e.printStackTrace();
+ }finally {
+ if(fot!=null){
+ try {
+ fot.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
return new Response().setII(1,"鏇存柊鎴愬姛");
}
@@ -204,12 +240,14 @@
* 浜鸿劯搴撶鐞�: 鍒犻櫎
* @return
*/
- @DeleteMapping
+ @PostMapping("delete")
@ApiOperation(value = "鍒犻櫎")
@Transactional
public Response delete(@RequestParam Integer uId,@RequestParam Integer faceId,
@RequestParam String uName,HttpServletRequest request){
+ //杩囨护 uName鐨勭壒娈婂瓧绗�,閬垮厤璺緞閬嶅巻鏀诲嚮
+ uName = ActionUtil.filterFileName(uName);
//鏇存柊user_inf鍜宖ace琛�
service.update(uId,faceId);
@@ -303,15 +341,21 @@
}else{
for (UserInf temp:userInfList){
String filePath = temp.getFace().getUrl();
- ImageInfo imageInfo2 = ImageFactory.getRGBData(new File(filePath));
- Response res3 = FaceIdentifyUtil.faceCompare(faceEngine, imageInfo, imageInfo2);
+ File file = new File(filePath);
+ //涓嶅瓨鍦ㄥ垯涓嶇户缁墽琛�
+ if(!file.exists()){
+ continue;
+ }
+ ImageInfo imageInfo2 = ImageFactory.getRGBData(file);
+ res = FaceIdentifyUtil.faceCompare(faceEngine, imageInfo, imageInfo2);
//瀵规瘮鎴愬姛,璁板綍鐢ㄦ埛鐧诲綍淇℃伅
- if(res3.getCode()==1){
+ if(res.getCode()==1){
//Ukey瀵瑰簲鐢ㄦ埛鍜屼汉鑴稿搴旂敤鎴烽獙璇�
if(!temp.getUId().equals(userByUKeyId.getUId())){
return res.set(1,false,"UKey瀵瑰簲鐢ㄦ埛鍜屽綋鍓嶄汉鑴稿搴旂敤鎴蜂笉鍖归厤");
}
-
+ res.setData2(temp);
+
// 灏嗙櫥闄嗘垚鍔熺殑鐢ㄦ埛瀛樺叆session
ActionUtil.getSession().setAttribute("user", temp);
@@ -322,7 +366,8 @@
if (permitList!=null && permitList.size()!=0) {
ActionUtil.getSession().setAttribute("permits", permitList);
} else {
- res.setCode(0);
+ res.setCode(1);
+ res.setData(false);
res.setMsg("杩樻湭鍒嗛厤鏉冮檺");
}
//灏嗘柊鐧诲綍鐨勭敤鎴峰瓨鍏pplication
--
Gitblit v1.9.1