From 603cb36a5123e46656b06a5deb8d7ac7ff81307f Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 25 十二月 2019 08:48:51 +0800
Subject: [PATCH] a
---
app/src/main/java/com/basic/security/utils/socket/server/TableRowReceiveSocketServer.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/basic/security/utils/socket/server/TableRowReceiveSocketServer.java b/app/src/main/java/com/basic/security/utils/socket/server/TableRowReceiveSocketServer.java
index 8d9c4c5..cda0365 100644
--- a/app/src/main/java/com/basic/security/utils/socket/server/TableRowReceiveSocketServer.java
+++ b/app/src/main/java/com/basic/security/utils/socket/server/TableRowReceiveSocketServer.java
@@ -4,6 +4,7 @@
import com.basic.security.base.BaseApplication;
import com.basic.security.manager.BaseManager;
+import com.basic.security.manager.FeatureManager;
import com.basic.security.manager.GuestManager;
import com.basic.security.manager.OrgManager;
import com.basic.security.manager.PersonManager;
@@ -12,9 +13,9 @@
import com.basic.security.model.ModelAdapter;
import com.basic.security.model.Person;
import com.basic.security.model.PersonSocket;
+import com.basic.security.model.Sync;
import com.basic.security.utils.Constants;
import com.basic.security.utils.DetectedResult;
-import com.basic.security.utils.FaceId;
import com.basic.security.utils.ObjectUtil;
import com.basic.security.utils.SocketUtil;
@@ -90,21 +91,23 @@
if (camera_image_path_byte_array != null && camera_image_path_byte_array.length > 0) {
modelAdapter.setBlob(Person.camera_image_path, camera_image_path_byte_array);
}
- FaceId.instance.addFeatureToDb(modelAdapter.getString(Person.id), modelAdapter.getBlob(Person.camera_image_feature));
+ GuestManager.updateGuestName(modelAdapter);
+ FeatureManager.addFeature(modelAdapter.getString(Person.id), modelAdapter.getBlob(Person.camera_image_feature));
}
-// System.out.println("PersonAcceptedClient.run 1 " + modelAdapter);
+// System1.out.println("PersonAcceptedClient.run 1 " + modelAdapter);
if (IdCard.tableName.equals(table)) {
byte[] jpgData = (byte[]) modelAdapter.model.get(IdCardMessage.jpgData);
if (jpgData != null && jpgData.length > 0) {
try {
String idCardPath = Constants.attachmentPath + modelAdapter.getString(IdCard.card_number) + ".jpg";
- System.out.println("PersonAcceptedClient.run idCardPath=" + idCardPath);
+ System1.out.println("PersonAcceptedClient.run idCardPath=" + idCardPath);
IOUtils.write(jpgData, new FileOutputStream(idCardPath));
} catch (Exception e) {
e.printStackTrace();
}
}
}
+ modelAdapter.setString(Sync.needSync, Constants.FALSE);
BaseManager.save(modelAdapter);
socketUtil.writeResponseSuccess();
}
@@ -113,12 +116,17 @@
String table = modelAdapter.getString(Constants.TABLE);
if (Person.tableName.equals(table)) {
String personId = modelAdapter.getString(Person.id);
- FaceId.instance.removeFeatureFromDb(personId);
+ FeatureManager.removeFeature(personId);
if (Constants.isIndoor) {
GuestManager.removePersonId(personId);
}
}
- BaseManager.delete(modelAdapter);
+ modelAdapter.setString(Sync.needSync, Constants.FALSE);
+ if (Person.tableName.equals(table) && !Constants.deletePersonPhysical) {
+ BaseManager.deleteWithDelFlag(modelAdapter);
+ } else {
+ BaseManager.deletePhysically(modelAdapter);
+ }
socketUtil.writeResponseSuccess();
}
if (PersonSocket.signal.equals(requestType)) {
@@ -127,6 +135,7 @@
if (PersonSocket.signalInitTreeNodeList.equals(signalValue)) {
OrgManager.initTreeNodeList();
}
+ modelAdapter.setString(Sync.needSync, Constants.FALSE);
socketUtil.writeResponseSuccess();
}
if (PersonSocket.findPersonById.equals(requestType)) {
@@ -140,7 +149,7 @@
}
personByteArray = ObjectUtil.toByteArray(person.model);//SerializationUtils.serialize(person);
Map<String, Object> newPerson = (Map<String, Object>) ObjectUtil.toObject(personByteArray);//SerializationUtils.deserialize(personByteArray);
-// System.out.println("PersonAcceptedClient.run findPersonById=" + newPerson);
+// System1.out.println("PersonAcceptedClient.run findPersonById=" + newPerson);
}
Map<String, String> responseMap = new HashMap<>();
responseMap.put(PersonSocket.modelMapByteArrayLength, personByteArray.length + "");
--
Gitblit v1.8.0