Merge branch 'v4' of http://git.ycjcjy.com/welcome/service-welcome3 into v4

src/main/java/com.huiju.welcome/controller/ImgController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiParam;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,12 +31,17 @@ public class ImgController {
 
 	@Autowired
 	TencentFaceUtils tencentFaceUtils;
+	
+	@Autowired
+	private AliFaceUtils aliFaceUtils;
 
-	@PostMapping("/face")
+	@GetMapping("/face")
 	public ResponseBean testUpload2Aliface() {
 		try {
-			tencentFaceUtils.searchFace("https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg");
-			return ResponseBean.success("");
+			//tencentFaceUtils.searchFace("https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg");
+			//return ResponseBean.success("");
+			//aliFaceUtils.createFace("10087","https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg");
+			return ResponseBean.success(aliFaceUtils.searchFace("https://estateagents.oss-cn-shanghai.aliyuncs.com/1561458925754-%E6%9C%AA%E7%9F%A5%E6%96%87%E4%BB%B6.jpg"));
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/java/com.huiju.welcome/utils/AliFaceUtils.java

@@ -17,6 +17,8 @@ import com.aliyuncs.http.FormatType;
 import com.aliyuncs.http.HttpResponse;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
+import com.aliyuncs.profile.IClientProfile;
+import com.google.gson.JsonObject;
 import com.huiju.welcome.config.AliProperties;
 import com.tencentcloudapi.common.exception.TencentCloudSDKException;
 import com.tencentcloudapi.iai.v20180301.models.GetPersonBaseInfoResponse;
@@ -50,13 +52,21 @@ public class AliFaceUtils {
     
     
     @Autowired
-    public AliFaceUtils(AliProperties p) {
+    public AliFaceUtils(AliProperties p) throws ClientException {
         profile = DefaultProfile.getProfile(AliProperties.face.getRegionId(), AliProperties.accessKeyId, AliProperties.accessKeySecret);
         client = new DefaultAcsClient(profile);
-        recognitionClient = new DefaultAcsClient(profile);
+        IClientProfile iClientProfile = DefaultProfile.getProfile(AliProperties.face.getRegionId(), AliProperties.accessKeyId, AliProperties.accessKeySecret);
+        recognitionClient = new DefaultAcsClient(iClientProfile);
     }
     
-    public JSONObject getPersonBaseInfo(String personId) throws UnsupportedEncodingException {
+    /**
+     * 获取用户信息
+     * @param personId
+     * @return
+     * @throws UnsupportedEncodingException
+     */
+    public JSONObject getPersonBaseInfo(String personId) throws Exception {
+        JSONObject result = new JSONObject();
         GetPersonRequest getPersonRequest = new GetPersonRequest();
         getPersonRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
         getPersonRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
@@ -66,7 +76,7 @@ public class AliFaceUtils {
         /**
          * personId: 用户自定义个体Id，必填
          */
-        data.put("personId", "personId_test_3");
+        data.put("personId", personId);
     
     
         getPersonRequest.setHttpContent(data.toJSONString().getBytes("UTF-8"), "UTF-8", FormatType.JSON);
@@ -79,44 +89,50 @@ public class AliFaceUtils {
     
         try {
             HttpResponse httpResponse = recognitionClient.doAction(getPersonRequest);
-        
             if (httpResponse.isSuccess()) {
                 JSONObject scrResponse = JSON.parseObject(new String(httpResponse.getHttpContent(), "UTF-8"));
-                System.out.println(JSON.toJSONString(scrResponse, true));
                 if (200 == scrResponse.getInteger("code")) {
                     JSONObject resultObject = scrResponse.getJSONObject("data");
                     if (200 == resultObject.getInteger("code")) {
-                        System.out.println(resultObject.getString("personId"));
+                        return resultObject;
                     } else {
-                        System.out.println("task process fail:" + resultObject.getInteger("code"));
+                        throw new Exception("task process fail:" + resultObject.getInteger("code"));
                     }
-                } else {
-                    System.out.println("detect not success. code:" + scrResponse.getInteger("code"));
+                } else if(400 == scrResponse.getInteger("code")){
+                    return null;
+                }else{
+                    throw new Exception("detect not success. code:" + scrResponse.getInteger("code"));
                 }
-            } else {
-                System.out.println("response not success. status:" + httpResponse.getStatus());
+            }else{
+                throw new Exception("response not success. status:" + httpResponse.getStatus());
             }
-        } catch (ServerException e) {
-            e.printStackTrace();
-        } catch (ClientException e) {
-            e.printStackTrace();
         } catch (Exception e) {
-            e.printStackTrace();
+            throw e;
         }
-        return data;
     }
     
-    public void createPerson(String personId, String personName, String url, String ...images) throws TencentCloudSDKException, UnsupportedEncodingException {
+    /**
+     * 穿件人员
+     * @param personId
+     * @param personName
+     * @throws TencentCloudSDKException
+     * @throws UnsupportedEncodingException
+     */
+    public JSONObject createPerson(String personId, String personName) throws Exception {
+        JSONObject result = new JSONObject();
         // 已经存在的人员, 不重复创建
         try {
-            getPersonBaseInfo(personId);
-            return;
+            if (null != getPersonBaseInfo(personId)){
+                return getPersonBaseInfo(personId);
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+           throw e;
         }
         AddPersonRequest addPersonRequest = new AddPersonRequest();
-        addPersonRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
-        addPersonRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
+        // 指定api返回格式
+        addPersonRequest.setAcceptFormat(FormatType.JSON);
+        // 指定请求方法
+        addPersonRequest.setMethod(com.aliyuncs.http.MethodType.POST);
         addPersonRequest.setEncoding("utf-8");
     
         JSONObject data = new JSONObject();
@@ -126,9 +142,9 @@ public class AliFaceUtils {
          * name: 用户名称，非必填
          * note: 备注信息，非必填
          */
-        data.put("personId", "personId_test_3");
-        data.put("groupIds", Arrays.asList("java_sdk_test_group"));
-        data.put("name", "测试");
+        data.put("personId", personId);
+        data.put("groupIds", Arrays.asList(AliProperties.face.getGroup()));
+        data.put("name", personName);
         data.put("note", "备注信息");
     
         addPersonRequest.setHttpContent(data.toJSONString().getBytes("UTF-8"), "UTF-8", FormatType.JSON);
@@ -144,35 +160,30 @@ public class AliFaceUtils {
         
             if (httpResponse.isSuccess()) {
                 JSONObject scrResponse = JSON.parseObject(new String(httpResponse.getHttpContent(), "UTF-8"));
-                System.out.println(JSON.toJSONString(scrResponse, true));
                 if (200 == scrResponse.getInteger("code")) {
                     JSONObject resultObject = scrResponse.getJSONObject("data");
                     if (200 == resultObject.getInteger("code")) {
-                        System.out.println(resultObject.getString("personId"));
+                        return resultObject;
                     } else {
-                        System.out.println("task process fail:" + resultObject.getInteger("code"));
+                        throw new Exception("task process fail:" + resultObject.getInteger("code"));
                     }
                 } else {
-                    System.out.println("detect not success. code:" + scrResponse.getInteger("code"));
+                    throw new Exception("detect not success. code:" + scrResponse.getInteger("code"));
                 }
             } else {
-                System.out.println("response not success. status:" + httpResponse.getStatus());
+                throw new Exception("response not success. status:" + httpResponse.getStatus());
             }
-        } catch (ServerException e) {
-            e.printStackTrace();
-        } catch (ClientException e) {
-            e.printStackTrace();
         } catch (Exception e) {
-            e.printStackTrace();
+            throw e;
         }
     }
     
-    public void createFace(String personId, String url, String ...images) throws Exception {
-        
+    public JSONObject createFace(String personId, String url) throws Exception {
+        JSONObject result = new JSONObject();
         try {
-            createPerson(personId, personId, url);
+            createPerson(personId, personId);
         } catch (Exception e) {
-            log.error(e.toString());
+            throw e;
         }
     
         AddFacesRequest addFacesRequest = new AddFacesRequest();
@@ -185,8 +196,8 @@ public class AliFaceUtils {
          * personId: 用户自定义个体Id，必填
          * urls: 图片url
          */
-        data.put("personId", "personId_test_3");
-        data.put("urls", Arrays.asList("https://img.alicdn.com/tfs/xxx-550-407.jpg"));
+        data.put("personId", personId);
+        data.put("urls", Arrays.asList(url));
     
         addFacesRequest.setHttpContent(data.toJSONString().getBytes("UTF-8"), "UTF-8", FormatType.JSON);
     
@@ -222,9 +233,10 @@ public class AliFaceUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        return result;
     }
     
-    public void searchFace(String url, String ...images) throws Exception {
+    public JSONObject searchFace(String url) throws Exception {
         ImageSyncScanRequest imageSyncScanRequest = new ImageSyncScanRequest();
         imageSyncScanRequest.setAcceptFormat(FormatType.JSON); // 指定api返回格式
         imageSyncScanRequest.setMethod(com.aliyuncs.http.MethodType.POST); // 指定请求方法
@@ -235,10 +247,10 @@ public class AliFaceUtils {
         List<Map<String, Object>> tasks = new ArrayList<Map<String, Object>>();
         Map<String, Object> task = new LinkedHashMap<String, Object>();
         task.put("dataId", UUID.randomUUID().toString());
-        task.put("url", "https://img.alicdn.com/tfs/xxx-550-407.jpg");
+        task.put("url", url);
         task.put("time", new Date());
         Map<String, String> extras = new HashMap<String, String>();
-        extras.put("groupId", "java_sdk_test_group");
+        extras.put("groupId", AliProperties.face.getGroup());
         task.put("extras", extras);
     
         tasks.add(task);
@@ -272,27 +284,24 @@ public class AliFaceUtils {
                                 String scene = ((JSONObject)sceneResult).getString("scene");
                                 String suggestion = ((JSONObject)sceneResult).getString("suggestion");
                                 //根据scene和suggetion做相关的处理
-                                //do something
-                                System.out.println("args = [" + scene + "]");
-                                System.out.println("args = [" + suggestion + "]");
+                                if (suggestion.equals("review")){
+                                    return ((JSONObject)sceneResult).getJSONArray("topPersonData").getJSONObject(0).getJSONArray("persons").getJSONObject(0);
+                                }
                             }
                         }else{
-                            System.out.println("task process fail:" + ((JSONObject)taskResult).getInteger("code"));
+                            throw new Exception("task process fail:" + ((JSONObject)taskResult).getInteger("code"));
                         }
                     }
                 } else {
-                    System.out.println("detect not success. code:" + scrResponse.getInteger("code"));
+                    throw new Exception("detect not success. code:" + scrResponse.getInteger("code"));
                 }
             } else {
-                System.out.println("response not success. status:" + httpResponse.getStatus());
+                throw new Exception("response not success. status:" + httpResponse.getStatus());
             }
-        } catch (ServerException e) {
-            e.printStackTrace();
-        } catch (ClientException e) {
-            e.printStackTrace();
         } catch (Exception e){
-            e.printStackTrace();
+            throw e;
         }
+        return null;
     }
 
     /**