dingxin 6 年前
父节点
当前提交
06c1b2194b

+ 4
- 3
CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKConstant.java 查看文件

31
      * <p>请将地址配置正确.</p>
31
      * <p>请将地址配置正确.</p>
32
      * <p>默认情况下是127.0.0.1:80 ,如果地址不通请根据实际情况修改IP端口</p>
32
      * <p>默认情况下是127.0.0.1:80 ,如果地址不通请根据实际情况修改IP端口</p>
33
      */
33
      */
34
-//    public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
35
-    // public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
36
-    public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
34
+   //public static final String OPENAPI_IP_PORT_HTTP = "http://192.168.0.122";
35
+    //  public static final String OPENAPI_IP_PORT_HTTPS = "http://192.168.0.122";
36
+    //public static final String OPENAPI_IP_PORT_HTTP = "http://huiju.ngrok.xiaomiqiu.cn";
37
+    public static final String OPENAPI_IP_PORT_HTTP = "http://6wnrrtr3.wkdl.ltd";
37
 
38
 
38
     /**
39
     /**
39
      * <p>操作用户UUID,即用户UUID,首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>
40
      * <p>操作用户UUID,即用户UUID,首次使用操作用户UUID可以通过接口 [获取默认用户UUID]来获取</p>

+ 12
- 25
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java 查看文件

61
         taFace.setUpdateUser(id);
61
         taFace.setUpdateUser(id);
62
         taFace.setCreateDate(new Date());
62
         taFace.setCreateDate(new Date());
63
         taFace.setUpdateDate(new Date());
63
         taFace.setUpdateDate(new Date());
64
-
65
         //判断身份是否为业主且状态为已停用
64
         //判断身份是否为业主且状态为已停用
66
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
65
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
67
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
66
         TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
68
         if (null!=taUser && null!=sysRole
67
         if (null!=taUser && null!=sysRole
69
                 && Constant.INVALID.equals(taUser.getStatus())&& Constant.OWNER.equals(sysRole.getRoleName())) {
68
                 && Constant.INVALID.equals(taUser.getStatus())&& Constant.OWNER.equals(sysRole.getRoleName())) {
70
-
71
             response.addError("9996", "您的身份已停用,请联系物业");
69
             response.addError("9996", "您的身份已停用,请联系物业");
72
             return response;
70
             return response;
73
         }
71
         }
74
         //身份为家属租客,状态为已停用
72
         //身份为家属租客,状态为已停用
75
         if (null!=taUser && null!=sysRole){
73
         if (null!=taUser && null!=sysRole){
76
                 if (Constant.INVALID.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
74
                 if (Constant.INVALID.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
77
-
78
                 response.addError("9996", "您的身份已停用,请联系物业");
75
                 response.addError("9996", "您的身份已停用,请联系物业");
79
                 return response;
76
                 return response;
80
             }
77
             }
88
                 if (resps.getCode().equals("0")) {
85
                 if (resps.getCode().equals("0")) {
89
                     taUser.setFaceStatus("1");
86
                     taUser.setFaceStatus("1");
90
                     taUserMapper.updateByPrimaryKeySelective(taUser);
87
                     taUserMapper.updateByPrimaryKeySelective(taUser);
91
-
92
                     resps.addSuccess("图片录入成功");
88
                     resps.addSuccess("图片录入成功");
93
                 } else {
89
                 } else {
94
                     resps.addError(resps.getMessage());
90
                     resps.addError(resps.getMessage());
101
                 if (resps.getCode().equals("0")) {
97
                 if (resps.getCode().equals("0")) {
102
                     taUser.setFaceStatus("1");
98
                     taUser.setFaceStatus("1");
103
                     taUserMapper.updateByPrimaryKeySelective(taUser);
99
                     taUserMapper.updateByPrimaryKeySelective(taUser);
104
-
105
                     resps.addSuccess("图片录入成功");
100
                     resps.addSuccess("图片录入成功");
106
                 } else {
101
                 } else {
107
                     resps.addError(resps.getMessage());
102
                     resps.addError(resps.getMessage());
131
         }
126
         }
132
         ResponseBean responseBean=getTaFaceParentId(userId,otherUserID);
127
         ResponseBean responseBean=getTaFaceParentId(userId,otherUserID);
133
         if ("1".equals(responseBean.getCode())){
128
         if ("1".equals(responseBean.getCode())){
134
-            responseBean.getMessage();
135
-            return responseBean;
129
+                responseBean.getMessage();
130
+                return responseBean;
136
         }
131
         }
137
-        Integer id = otherUserID == null?userId:otherUserID;
138
-        TaFace taFace = new TaFace();
139
-        taFace.setUpdateUser(userId);
140
-        taFace.setUpdateDate(new Date());
141
-        ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, id);
132
+            Integer id = otherUserID == null?userId:otherUserID;
133
+            TaFace taFace = new TaFace();
134
+            taFace.setUpdateUser(userId);
135
+            taFace.setUpdateDate(new Date());
136
+            ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, id);
142
         if (resps.getCode().equals("0")) {
137
         if (resps.getCode().equals("0")) {
143
-
144
-
145
             resps.addSuccess("图片修改成功");
138
             resps.addSuccess("图片修改成功");
146
         } else {
139
         } else {
147
             resps.addError(resps.getMessage());
140
             resps.addError(resps.getMessage());
157
             log.error("本地库人员ID:{}  的海康人员ID不存在", userId);
150
             log.error("本地库人员ID:{}  的海康人员ID不存在", userId);
158
             return responseBean;
151
             return responseBean;
159
         }
152
         }
160
-
161
         AESDecode aesd = new AESDecode();
153
         AESDecode aesd = new AESDecode();
162
         String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
154
         String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
163
         try {
155
         try {
164
-            responseBean = aesd.send(body);
165
-            JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
166
-            Integer type = (Integer) jsonObject.get("errno");
167
-            Integer faceNum = (Integer) jsonObject.get("face_num");
168
-
156
+                responseBean = aesd.send(body);
157
+                JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
158
+                Integer type = (Integer) jsonObject.get("errno");
159
+                Integer faceNum = (Integer) jsonObject.get("face_num");
169
             /*boolean isA为true进行添加,为false进行修改*/
160
             /*boolean isA为true进行添加,为false进行修改*/
170
             if (0 == type && 1 == faceNum && isA) {
161
             if (0 == type && 1 == faceNum && isA) {
171
-
172
-                    /*推送海康*/
162
+                /*推送海康*/
173
                 HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
163
                 HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
174
-
175
                 taFace.setFaceImg(faceImg);
164
                 taFace.setFaceImg(faceImg);
176
                 taFaceMapper.insertSelective(taFace);
165
                 taFaceMapper.insertSelective(taFace);
177
                 responseBean.addSuccess("操作成功");
166
                 responseBean.addSuccess("操作成功");
178
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
167
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
179
                 return responseBean;
168
                 return responseBean;
180
             } else if (0 == type && 1 == faceNum && isA == false) {
169
             } else if (0 == type && 1 == faceNum && isA == false) {
181
-
182
                 HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
170
                 HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
183
-
184
                 taFace.setFaceImg(faceImg);
171
                 taFace.setFaceImg(faceImg);
185
                 taFaceMapper.updateByPrimaryKeySelective(taFace);
172
                 taFaceMapper.updateByPrimaryKeySelective(taFace);
186
                 responseBean.addSuccess("操作成功");
173
                 responseBean.addSuccess("操作成功");