|
@@ -51,13 +51,14 @@ public class FaceServicelimpl implements FaceServiceI {
|
51
|
51
|
responseBean.getMessage();
|
52
|
52
|
return responseBean;
|
53
|
53
|
}
|
54
|
|
- TaUser user = taUserMapper.selectByPrimaryKey(userid);
|
|
54
|
+ Integer id = otherUserID == null?userid:otherUserID;
|
|
55
|
+ TaUser user = taUserMapper.selectByPrimaryKey(id);
|
55
|
56
|
ResponseBean response = new ResponseBean();
|
56
|
57
|
TaFace taFace = new TaFace();
|
57
|
58
|
taFace.setCommunityId(user.getCommunityId());
|
58
|
59
|
taFace.setTaUserId(userid);
|
59
|
60
|
taFace.setCreateUser(userid);
|
60
|
|
- taFace.setUpdateUser(userid);
|
|
61
|
+ taFace.setUpdateUser(id);
|
61
|
62
|
taFace.setCreateDate(new Date());
|
62
|
63
|
taFace.setUpdateDate(new Date());
|
63
|
64
|
|
|
@@ -70,7 +71,6 @@ public class FaceServicelimpl implements FaceServiceI {
|
70
|
71
|
response.addError("9996", "您的身份已停用,请联系物业");
|
71
|
72
|
return response;
|
72
|
73
|
}
|
73
|
|
-
|
74
|
74
|
//身份为家属租客,状态为已停用
|
75
|
75
|
if (null!=taUser && null!=sysRole){
|
76
|
76
|
if (Constant.INVALID.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
|
|
@@ -78,7 +78,6 @@ public class FaceServicelimpl implements FaceServiceI {
|
78
|
78
|
response.addError("9996", "您的身份已停用,请联系物业");
|
79
|
79
|
return response;
|
80
|
80
|
}
|
81
|
|
-
|
82
|
81
|
}
|
83
|
82
|
//查询当前用户是否有人脸记录
|
84
|
83
|
TaFace User = taFaceMapper.getByUserId(userid);
|
|
@@ -114,6 +113,13 @@ public class FaceServicelimpl implements FaceServiceI {
|
114
|
113
|
return response;
|
115
|
114
|
}
|
116
|
115
|
|
|
116
|
+ /**
|
|
117
|
+ * 修改人脸信息
|
|
118
|
+ * @param userId 登入人ID
|
|
119
|
+ * @param uploadFile
|
|
120
|
+ * @param otherUserID 关联家属或者租客ID
|
|
121
|
+ * @return
|
|
122
|
+ */
|
117
|
123
|
@Override
|
118
|
124
|
public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserID) {
|
119
|
125
|
boolean isA = false;
|
|
@@ -128,11 +134,11 @@ public class FaceServicelimpl implements FaceServiceI {
|
128
|
134
|
responseBean.getMessage();
|
129
|
135
|
return responseBean;
|
130
|
136
|
}
|
131
|
|
- TaUser user = taUserMapper.selectByPrimaryKey(userId);
|
|
137
|
+ Integer id = otherUserID == null?userId:otherUserID;
|
132
|
138
|
TaFace taFace = new TaFace();
|
133
|
139
|
taFace.setUpdateUser(userId);
|
134
|
140
|
taFace.setUpdateDate(new Date());
|
135
|
|
- ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userId);
|
|
141
|
+ ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, id);
|
136
|
142
|
if (resps.getCode().equals("0")) {
|
137
|
143
|
|
138
|
144
|
|
|
@@ -143,9 +149,6 @@ public class FaceServicelimpl implements FaceServiceI {
|
143
|
149
|
return resps;
|
144
|
150
|
}
|
145
|
151
|
|
146
|
|
- /**
|
147
|
|
- * 人脸录入验证
|
148
|
|
- */
|
149
|
152
|
public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId) {
|
150
|
153
|
ResponseBean responseBean = new ResponseBean();
|
151
|
154
|
TaUser user = taUserMapper.selectByPrimaryKey(userId);
|
|
@@ -200,7 +203,8 @@ public class FaceServicelimpl implements FaceServiceI {
|
200
|
203
|
responseBean.getMessage();
|
201
|
204
|
return responseBean;
|
202
|
205
|
}
|
203
|
|
- TaFace face = taFaceMapper.getByUserId(userId);
|
|
206
|
+ Integer id = otherUserID == null?userId:otherUserID;
|
|
207
|
+ TaFace face = taFaceMapper.getByUserId(id);
|
204
|
208
|
if (null!= face){
|
205
|
209
|
responseBean.addSuccess(face);
|
206
|
210
|
return responseBean;
|