内蒙人像对接(内蒙)

common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/ParamsEntity/FaceJghSearchParam.java

@@ -15,6 +15,7 @@ public class FaceJghSearchParam {
     private Long end_time;// 结束时间
     private Integer search_type=0;// 检索类型：0-在线设备查询 1-离线文件查询
     private String[] device_type = {"6","20"};// 设备类型：6-通道 20-采集设备
+    private PageJgh page;// 分页参数
 
     @Data
     public static class PageJgh {

common/common_utils/src/main/java/com/founder/commonutils/model/nmDataEntity/ParamsEntity/FaceSearchParam.java

@@ -2,6 +2,8 @@ package com.founder.commonutils.model.nmDataEntity.ParamsEntity;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 人脸检索参数(以图搜图人脸结构化查询)
  * @Author yangyang
@@ -10,7 +12,7 @@ import lombok.Data;
 @Data
 public class FaceSearchParam {
 
-    private imageList image_list;// 分页大小
+    private List<imageList> image_list;// 分页大小
     private Integer threshold;// 相似度, 范围为[1-100]
     private Integer top_k = 100;// topK,范围为[1-100]
     private Long start_time;// 开始时间

common/common_utils/src/main/java/com/founder/commonutils/util/HttpClient.java

@@ -67,7 +67,7 @@ public class HttpClient {
                 // 读取服务器返回的json数据（然后解析）
                 jsonResult = EntityUtils.toString(result.getEntity(), "utf-8");
             }else{
-                throw new Exception();
+                jsonResult = EntityUtils.toString(result.getEntity(), "utf-8");
             }
         }catch (Exception e){
             e.printStackTrace();

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

@@ -408,7 +408,7 @@ public class SkRegionalsResultController extends ApiController implements ExcelC
         List<SkRegionalsTask>  taskList = skRegionalsTaskService.list(queryWrapper);
         if(taskList.size()>0) {
             String taskType = taskList.get(0).getTasktype();
-            if("skph_car".equals(taskType)||"skph_people".equals(taskType)||"skph_img".equals(taskType)||"skbs".equals(taskType)){// 徘徊/伴随数据树形结构返回
+            if("skph_car".equals(taskType)||"skph_people".equals(taskType)||"skph_img".equals(taskType)||"skbs".equals(taskType)){ // 徘徊/伴随数据树形结构返回
                 // 去重后分页数据
                 List<SkRegionalsResultAll> listResultDistinctPage = new ArrayList<>();
                 // 去重后数据

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

@@ -297,7 +297,7 @@ public class SkRegionalsTaskController extends ApiController implements ExcelCon
 
     @OperLog(message = "以图研判_获取区域信息",operation = OperationType.QUERY)
     @ApiOperation(value = "以图研判_获取区域信息")
-    @PostMapping("/queryRegionals")
+    @PostMapping("/蒙AE0W49onals")
     public MapRestResult queryRegionals(@RequestBody RegionalsTaskParams regionalsTask) {
         // 通过任务编号拿到区域集合 用于回显
         List<RegionalsParam> regionalsList = skRegionalsTaskService.queryRegionalsList(regionalsTask.getTaskId());

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

@@ -488,9 +488,11 @@ public class SkTrailController extends ApiController implements ExcelControllerI
             List<SkTrail> points = new ArrayList<>();
             // 入参组装
             FaceSearchParam faceSearchParam = new FaceSearchParam();
+            List<FaceSearchParam.imageList> listImage = new ArrayList<>();
             FaceSearchParam.imageList imageList = new FaceSearchParam.imageList();
             imageList.setData(dataImage);
-            faceSearchParam.setImage_list(imageList);
+            listImage.add(imageList);
+            faceSearchParam.setImage_list(listImage);
             faceSearchParam.setStart_time(Long.valueOf(DateUtil.getTimeStamp(sktrailParam.getKssj())));
             faceSearchParam.setEnd_time(Long.valueOf(DateUtil.getTimeStamp(sktrailParam.getJssj())));
             faceSearchParam.setThreshold(Integer.valueOf(sktrailParam.getXsd()));

service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsResultMapper.xml

@@ -13,7 +13,7 @@
         r.region as region,
         r.img as nearimg,
         r.farimg as farimg,
-        DATE_FORMAT(r.djsj,'%Y-%m-%d %H:%i:%S') as time,
+        DATE_FORMAT(r.time,'%Y-%m-%d %H:%i:%S') as time,
         r.deviceid as deviceId,
         r.deviceName as deviceName,
         r.address as address,

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

@@ -2,7 +2,9 @@ package com.founder.publicapi.service.serviceimpl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.founder.commonutils.model.newPublicEntity.SkPointlocation;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsResult;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsResultAll;
 import com.founder.commonutils.model.newPublicEntity.SkRegionalsResultFl;
@@ -12,9 +14,11 @@ import com.founder.commonutils.util.DateUtil;
 import com.founder.commonutils.util.HttpClient;
 import com.founder.commonutils.util.JsonUtils;
 import com.founder.commonutils.util.TokenUtils;
+import com.founder.publicapi.mapper.mysqlMapper.SkPointlocationMapper;
 import com.founder.publicapi.mapper.mysqlMapper.SkRegionalsResultMapper;
 import com.founder.publicapi.mapper.mysqlMapper.SkRegionalsTaskMapper;
 import com.founder.publicapi.mapper.oracleXzxtMapper.SysDictitemMapper;
+import com.founder.publicapi.service.SkPointlocationService;
 import com.founder.publicapi.service.SkRegionalsResultService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +62,8 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
     private RestTemplate restTemplate;
     @Autowired
     private SysDictitemMapper sysDictitemMapper;
+    @Autowired
+    private SkPointlocationService skPointlocationService;
     @Override
     public List<SkRegionalsResultAll> selecteRegionalsTasksResults(SkRegionalsTaskResultParamAll skRegionalsTaskResultParamAll) {
         return skRegionalsResultMapper.selecteRegionalsTasksResults(skRegionalsTaskResultParamAll);
@@ -738,6 +744,8 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
         headers.setContentType(MediaType.APPLICATION_JSON);
         while (flag) {
             try {
+                // 分页处理
+                faceJghSearchParam.setPage(faceJghSearchParamPage);
                 // 接口调用
                 String token = TokenUtils.getYtgsToken();
                 Map herders = new HashMap();
@@ -778,13 +786,17 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
                                 Map mapzd = new HashMap();
                                 mapzd.put("groupid","CODE_XZQH");
                                 mapzd.put("code",device_id.substring(0,6));
-                                skRegionalsResultSaveParam.setAddress(sysDictitemMapper.getNameByCode(mapzd));// 匹配区划
                                 skRegionalsResultSaveParam.setDeviceid(device_id);
                                 skRegionalsResultSaveParam.setDevicename(device_name);
                                 skRegionalsResultSaveParam.setTime(sf.parse(DateUtil.getDateString(Long.valueOf(snap_time))));
+                                QueryWrapper queryWrapper = new QueryWrapper();
+                                queryWrapper.eq("isDeleted", "0");
+                                queryWrapper.eq("device_id",device_id);
+                                SkPointlocation  skPointlocation = skPointlocationService.getOne(queryWrapper);
+                                skRegionalsResultSaveParam.setAddress(skPointlocation.getAddress());
                                 skRegionalsResultSaveParam.setFaceid(face_id);
-                                skRegionalsResultSaveParam.setX(longitude);
-                                skRegionalsResultSaveParam.setY(latitude);
+                                skRegionalsResultSaveParam.setX(skPointlocation.getX());
+                                skRegionalsResultSaveParam.setY(skPointlocation.getY());
                                 listResult.add(skRegionalsResultSaveParam);
                             }
                         }
@@ -792,12 +804,14 @@ public class SkRegionalsResultServiceImpl extends ServiceImpl<SkRegionalsResultM
                 }
             }catch (Exception e){
               System.out.println("人脸结构化查询接口请求错误"+e);
-            }
+                flag = false;
             }
             if (currentPageTotal < faceJghSearchParamPage.getPage_size()) {//每页的总数大于当前页返回的总数，退出循环,d当期页的总数大于分页数，说明其接口无分页
+                flag = false;
             } else if (currentPageTotal == faceJghSearchParamPage.getPage_size()) {//当前页等于总页数，则循环请求
                 faceJghSearchParamPage.setPage_num(++page);
             }
+        }
             return listResult;
     }