内蒙人像对接(内蒙)

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkRxController.java

@@ -17,6 +17,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -66,9 +67,10 @@ public class SkRxController extends ApiController {
         System.out.println("身份稽查（静态库+布控库 1 比 N）入参:--------"+jsonObjectStr);
         String resultString = HttpClient.doPostJson(url, herders, jsonObjectStr);
         if (null != resultString) { // 如果返回结果不为空
+            System.out.println("身份稽查（静态库+布控库 1 比 N）返回:--------"+resultString);
             JSONObject result = JSONObject.parseObject(resultString);
             String errCode = result.getString("error_code");
-            if ("0000000000 ".equals(errCode) && result.containsKey("data")) {
+            if ("0000000000".equals(errCode)) {
                 JSONObject jsonArrayData = result.getJSONObject("data");
                 JSONArray jsonArray = jsonArrayData.getJSONArray("data");
                 if (null != jsonArray && jsonArray.size() > 0) {
@@ -116,9 +118,10 @@ public class SkRxController extends ApiController {
         System.out.println("身份稽查名单库查询入参:--------"+jsonObjectStr);
         String resultString = HttpClient.doPostJson(url, herders, jsonObjectStr);
         if (null != resultString) { // 如果返回结果不为空
+            System.out.println("身份稽查名单库查询返回:--------"+resultString);
             JSONObject result = JSONObject.parseObject(resultString);
             String errCode = result.getString("error_code");
-            if ("0000000000 ".equals(errCode) && result.containsKey("data")) {
+            if ("0000000000".equals(errCode)) {
                 JSONObject jsonArrayData = result.getJSONObject("data");
                 JSONArray jsonArray = jsonArrayData.getJSONArray("repositories");
                 if (null != jsonArray && jsonArray.size() > 0) {
@@ -160,5 +163,32 @@ public class SkRxController extends ApiController {
         }
         return list;
     }
-}
+
+    public static void main(String[] args) {
+
+        JSONObject result = null;
+        try {
+            result = JsonUtils.readJsonFromClassPath("data/getTest.json", JSONObject.class);
+            String errCode = result.getString("error_code");
+            if ("0000000000".equals(errCode)) {
+                JSONObject jsonArrayData = result.getJSONObject("data");
+                JSONArray jsonArray = jsonArrayData.getJSONArray("repositories");
+                if (null != jsonArray && jsonArray.size() > 0) {
+                    for (Object o : jsonArray) {
+                        JSONObject jsonObject = (JSONObject) o;
+                        String id = jsonObject.getString("id");// 库id，
+                        String factory_code = jsonObject.getString("factory_code");// 厂商code
+                        // 返回处理
+                        FaceRxbdSearchParam.mdkList mdk = new FaceRxbdSearchParam.mdkList();
+                        mdk.setCode(factory_code);
+                        mdk.setRepository_id(id);
+                    }
+                }
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+    }
 

service/publicapi/src/main/java/com/founder/publicapi/controller/SkDataOperation/SkTrailController.java

@@ -490,6 +490,7 @@ public class SkTrailController extends ApiController implements ExcelControllerI
             FaceSearchParam faceSearchParam = new FaceSearchParam();
             FaceSearchParam.imageList imageList = new FaceSearchParam.imageList();
             imageList.setData(dataImage);
+            faceSearchParam.setImage_list(imageList);
             faceSearchParam.setStart_time(Long.valueOf(DateUtil.getTimeStamp(sktrailParam.getKssj())));
             faceSearchParam.setEnd_time(Long.valueOf(DateUtil.getTimeStamp(sktrailParam.getJssj())));
             faceSearchParam.setThreshold(Integer.valueOf(sktrailParam.getXsd()));
@@ -504,9 +505,10 @@ public class SkTrailController extends ApiController implements ExcelControllerI
             System.out.println("人脸多图检索（人脸以图搜图）入参:--------"+jsonObjectStr);
             String resultString = HttpClient.doPostJson(url, herders, jsonObjectStr);
             if (null != resultString) { // 如果返回结果不为空
+            System.out.println("人脸多图检索（人脸以图搜图）返回:--------"+resultString);
             JSONObject result = JSONObject.parseObject(resultString);
             String errCode = result.getString("error_code");
-            if ("0000000000 ".equals(errCode) && result.containsKey("data")) {
+            if ("0000000000".equals(errCode)) {
                 JSONObject jsonArrayData = result.getJSONObject("data");
                 JSONArray jsonArray = jsonArrayData.getJSONArray("data");
                 if (null != jsonArray && jsonArray.size() > 0) {

service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SkRegionalsResultServiceImpl.java

@@ -752,9 +752,10 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
 
                     resultString = HttpClient.doPostJson(url, herders, jsonObjectStr);
                 if (null != resultString) { // 如果返回结果不为空
+                    System.out.println("人脸结构化查询返回:--------"+resultString);
                     JSONObject result = JSONObject.parseObject(resultString);
                     String errCode = result.getString("error_code");
-                    if ("0000000000 ".equals(errCode) && result.containsKey("data")) {
+                    if ("0000000000".equals(errCode)) {
                         JSONObject jsonArrayData = result.getJSONObject("data");
                         JSONArray jsonArray = jsonArrayData.getJSONArray("data");
                         currentPageTotal = jsonArray.size();