修改bug态势分析_点位信息获取接口

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

@@ -164,26 +164,28 @@ public class SkPointlocationController extends ApiController implements ExcelCon
             queryWrapper.le("str_to_date(date,'%Y-%m-%d %H:%i:%s')", skPointlocationParam.getJssj());
         }
 
+
         List<Point> geoametrys = skPointlocationParam.getGeometrys();
-        if(geoametrys.size()>0) {
-            // 多个点位即为多边形
-            if (geoametrys.size()>1) {
-                String geoametryStr = "";
-                for (int i = 0; i < geoametrys.size(); i++) {
-                    if (i == geoametrys.size()-1) {
-                        geoametryStr += geoametrys.get(i).getX() + " " + geoametrys.get(i).getY();
-                    } else {
-                        geoametryStr += geoametrys.get(i).getX() + " " + geoametrys.get(i).getY() + ",";
+        if (geoametrys!=null){
+            if(geoametrys.size()>0) {
+                // 多个点位即为多边形
+                if (geoametrys.size()>1) {
+                    String geoametryStr = "";
+                    for (int i = 0; i < geoametrys.size(); i++) {
+                        if (i == geoametrys.size()-1) {
+                            geoametryStr += geoametrys.get(i).getX() + " " + geoametrys.get(i).getY();
+                        } else {
+                            geoametryStr += geoametrys.get(i).getX() + " " + geoametrys.get(i).getY() + ",";
+                        }
                     }
+                    queryWrapper.apply("ST_CONTAINS(ST_GEOMFROMTEXT('POLYGON((" + geoametryStr + "))'), coordinates)");
+                } else if(StringUtils.isNotEmpty(skPointlocationParam.getRadius())){
+                    queryWrapper.apply("ST_Distance_Sphere(coordinates, POINT(" + geoametrys.get(0).getX()+","+ geoametrys.get(0).getY() + ")) < " + skPointlocationParam.getRadius());
                 }
-                queryWrapper.apply("ST_CONTAINS(ST_GEOMFROMTEXT('POLYGON((" + geoametryStr + "))'), coordinates)");
-            } else if(StringUtils.isNotEmpty(skPointlocationParam.getRadius())){
-                queryWrapper.apply("ST_Distance_Sphere(coordinates, POINT(" + geoametrys.get(0).getX()+","+ geoametrys.get(0).getY() + ")) < " + skPointlocationParam.getRadius());
             }
-        }else{
-            return MapRestResult.error("边界数据必传!");
         }
 
+
         IPage page1 = skPointlocationService.page(page, queryWrapper);
         return new MapRestResult(200, "OK", page1.getTotal(), page1.getRecords());
 

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

@@ -25,7 +25,7 @@
         #{y},
         #{skPointlocation.address},
         #{skPointlocation.objecttype},
-        #{skPointlocation.objectname},
+        #{objectname},
         #{time},
         #{skPointlocation.date},
         '0',