Merge remote-tracking branch 'origin/dev' into dev

common/common_utils/src/main/java/com/founder/commonutils/peopleEntity/FaceSearchParam.java

@@ -34,7 +34,7 @@ public class FaceSearchParam {
     private String ids= "";
     private Integer mergeType= 1;
     //相似度 默认0.92
-    private String scoreThreshold = "0.92";
+    private Double scoreThreshold = 0.92;
     //开始时间 格式 2019-12-07 00:00:00
     private String starttime= "";
     //结束时间 格式 2020-03-06 23:59:59
@@ -159,11 +159,11 @@ public class FaceSearchParam {
         this.mergeType = mergeType;
     }
 
-    public String getScoreThreshold() {
+    public Double getScoreThreshold() {
         return scoreThreshold;
     }
 
-    public void setScoreThreshold(String scoreThreshold) {
+    public void setScoreThreshold(Double scoreThreshold) {
         this.scoreThreshold = scoreThreshold;
     }
 

serviceapi/imageapi/src/main/java/com/founder/imageapi/mapper/xml/CameraInfoMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="getCameraInfoByIds" parameterType="java.lang.String" resultType="com.founder.commonutils.peopleEntity.Camera">
         select
-        id as cameraId,
+        ID as cameraId,
         NAME as cameraName,
         CITY as areaName,
         STATION_ID as areaCode,
@@ -14,9 +14,9 @@
 
         x as x,
         y as y,
-        area_name as cameraType
-        from t_camera_info camera   where 1=1
-        <if test="cameraIds!=null and cameraIds!=''">and CAMERA_CODE in  ${cameraIds}</if>
+        NAME as cameraType
+        from TB_ZY_CAMERA    where 1=1
+        <if test="cameraIds!=null and cameraIds!=''">and ID in  ${cameraIds}</if>
     </select>
 </mapper>
 

serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/CommonService.java

@@ -19,11 +19,10 @@ public class CommonService {
     private CameraInfoMapper cameraInfoDao;
 
     public Map<String, Object> getCameraInfoByIds(String cameraId) {
-        Map<String, Object> returnMap = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         List<Camera> cameras = cameraInfoDao.getCameraInfoByIds(cameraId);
         if (cameras != null&&cameras.size()>0) {
             for(Camera camera:cameras){
-                Map<String, String> map = new HashMap<>();
                 String address = camera.getAreaName() + " " + camera.getAreaCodeName()+ "" +camera.getCameraName();
                 String areaName = camera.getAreaName();
                 String x = camera.getX(),y = camera.getY();
@@ -39,11 +38,10 @@ public class CommonService {
                 map.put("districtCodeName",areaName);// 地区名称
                 map.put("areaCode",areaCode);// 派出所代码
                 map.put("areaCodeName",areaCodeName);// 派出所名称
-                returnMap.put(camera.getCameraId(),map);
             }
 
         }
-        return returnMap;
+        return map;
     }
 
 

serviceapi/imageapi/src/main/java/com/founder/imageapi/service/impl/ImageServiceImpl.java

@@ -501,7 +501,7 @@ public class ImageServiceImpl implements ImageService {
 
                 p.setCameraType((String)map.get("cameraType"));
                 p.setDistrictCode((String)map.get("districtCode"));
-                p.setDistrictCodeName((String)map.get("districtCodeName"));
+                //p.setDistrictCodeName((String)map.get("districtCodeName"));
                 p.setAreaCode((String)map.get("areaCode"));
                 p.setAreaCodeName((String)map.get("areaCodeName"));