接口更新

gis_application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8013
 
-spring.profiles.active=dev
+spring.profiles.active=pro
 
 # \u8BBF\u95EE\u9759\u6001\u8D44\u6E90\u8BBE\u7F6E
 spring.resources.static-locations=classpath:templates/,classpath:static/,classpath:web/

gis_common/src/main/java/com/gis/common/deyuan/util/HttpUtils.java

@@ -53,7 +53,7 @@ public class HttpUtils {
                                      Map<String, String> querys)
             throws Exception {
         HttpClient httpClient = wrapClient(host);
-
+        System.out.println("buildUrl: "+buildUrl(host, path, querys));
         HttpGet request = new HttpGet(buildUrl(host, path, querys));
         for (Map.Entry<String, String> e : headers.entrySet()) {
             request.addHeader(e.getKey(), e.getValue());

gis_common/src/main/java/com/gis/common/util/DoorUtils.java

@@ -355,6 +355,7 @@ public class DoorUtils {
         Map<String, Object> encryptMap = encrypt(param);
         log.warn("request param: " + param.toString());
         log.info("request url: "+ url);
+        log.info("encryptMap param: "+JSON.toJSONString(encryptMap));
         String result = HttpUtil.post(url, encryptMap);
         log.info("result: {}", result);
         JSONObject resultJson = JSON.parseObject(result);

gis_web/pom.xml

@@ -14,6 +14,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.locationtech.proj4j</groupId>
+            <artifactId>proj4j</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
             <groupId>com.gis</groupId>
             <artifactId>gis_common</artifactId>
         </dependency>

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/CommunityMonitor.java

@@ -6,6 +6,7 @@ import com.gis.common.deyuan.util.ResultUtils;
 import com.gis.common.util.DoorUtils;
 import com.gis.common.util.IOTUtils;
 import com.gis.common.util.Result;
+import com.gis.web.dto.VideoDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -19,12 +20,12 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Log4j2
-@Api(tags = "云平台-社区监控")
+@Api(tags = "云平台-社区监控、街道监控")
 @RestController
 @RequestMapping("communityMonitor")
 public class CommunityMonitor {
     @Autowired
-    NewResultUtils resultUtils;
+    ResultUtils resultUtils;
 
     @Autowired
     ConfigConstant configConstant;
@@ -80,7 +81,11 @@ public class CommunityMonitor {
     @GetMapping("peopleEntrance/{code}/{startTime}/{endTime}")
     public Result peopleEntrance(@PathVariable String code,@PathVariable String startTime,@PathVariable String endTime){
             String apiUrl = "/open/api/v1/device/peopleEntrance";
-            return getTimeCount(apiUrl,code,startTime,endTime);
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("residentialCode", code);
+        param.put("startTime", startTime);
+        param.put("endTime", endTime);
+        return resultUtils.doGetResult(apiUrl, param);
     }
 
 
@@ -115,15 +120,7 @@ public class CommunityMonitor {
 //    }
 
 
-    private  Result getTimeCount(String url,String code,String time1,String time2){
-        HashMap<String, Object> param = new HashMap<>();
-        param.put("residentialCode", code);
-        param.put("startTime", time1);
-        param.put("endTime", time2);
-        Result residentialResult= resultUtils.doGetResult(url, param);
 
-        return residentialResult;
-    }
 //    /*
 //     * 根据社区编码获取社区所有小区编码
 //     * @param code 社区编码
@@ -151,9 +148,10 @@ public class CommunityMonitor {
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "code", value = "组织机构编码 如：510114001017240", dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "组织机构编码 如：1.雪亮工程 2. 电梯梯控 3.普通监控4.热成像设备", dataType = "int"),
     })
-    @ApiOperation("视频列表数据")
-    @GetMapping("videoList/{code}")
+    @ApiOperation("视频列表数据（get）")
+    @GetMapping("videoListGet/{code}/{type}")
     public Result videoList(@PathVariable String code) throws Exception {
         String apiUrl =configConstant.apiVideo+"/bi/findVideoInfo";
         System.out.println("apiUrl: "+apiUrl);
@@ -163,6 +161,20 @@ public class CommunityMonitor {
         return DoorUtils.doPostDecrypt(apiUrl,param);
     }
 
+
+    @ApiOperation("视频列表数据（post）")
+    @PostMapping("videoListPost")
+    public Result videoList(@RequestBody VideoDto videoDto) throws Exception {
+        String apiUrl =configConstant.apiVideo+"/bi/findVideoInfo";
+        System.out.println("apiUrl: "+apiUrl);
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("code", videoDto.getCode());
+        param.put("pageSize", videoDto.getPageSize());
+        param.put("pageNum", videoDto.getPageNum());
+        param.put("type", videoDto.getType());
+        return DoorUtils.doPostDecrypt(apiUrl,param);
+    }
+
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "视频id ", dataType = "String"),
             @ApiImplicitParam(name = "code", value = "小区组织机构编码 如：510114001017240", dataType = "String"),

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/CommunityOverview.java

@@ -22,11 +22,11 @@ import java.util.HashMap;
 @RequestMapping("communityOverview")
 public class CommunityOverview {
     @Autowired
-    NewResultUtils resultUtils;
+    ResultUtils resultUtils;
 
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String")
+            @ApiImplicitParam(name = "code", value = "社区编码 如：测试环境 510115001076  正式环境太平社区 510114001016", dataType = "String")
     })
     @ApiOperation("社区基本信息、人口组成")
     @GetMapping("baseData/{code}")
@@ -37,7 +37,7 @@ public class CommunityOverview {
         return resultUtils.doGetResult(apiUrl, param);
     }
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String")
+            @ApiImplicitParam(name = "code", value = "社区编码 测试环境 510115001076  正式环境太平社区 510114001016", dataType = "String")
     })
     @ApiOperation("社区房屋总数、房屋属性分类")
     @GetMapping("allHouseCount/{code}")
@@ -49,7 +49,7 @@ public class CommunityOverview {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码 测试环境 510115001076  正式环境太平社区 510114001016", dataType = "String"),
             @ApiImplicitParam(name = "page", value = "页码值", dataType = "int"),
             @ApiImplicitParam(name = "size", value = "页面记录条数", dataType = "int")
     })
@@ -61,7 +61,7 @@ public class CommunityOverview {
         HashMap<String, Object> param = new HashMap<>();
         param.put("townCode", code);
         param.put("page", page);
-        param.put("size", size);
+        param.put("size",size);
         return resultUtils.doGetResult(apiUrl, param);
     }
 

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/EmergencyCommand.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 @RequestMapping("emergencyCommand")
 public class EmergencyCommand {
     @Autowired
-    NewResultUtils resultUtils;
+    ResultUtils resultUtils;
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String"),

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/GIS.java

@@ -0,0 +1,54 @@
+package com.gis.web.controller.dafengSmartCommunityController;
+
+import com.gis.common.util.Result;
+import com.gis.web.dto.GisT;
+import io.swagger.annotations.*;
+import lombok.extern.log4j.Log4j2;
+import org.locationtech.proj4j.*;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+
+@Log4j2
+@Api(tags = "云平台-GIS接口")
+@RestController
+@RequestMapping("gis")
+public class GIS {
+
+    @ApiOperation("坐标转换")
+    @PostMapping("transform")
+    public Object eventScore(@RequestBody GisT t){
+        return   convertByProj4(t.getX(),t.getY(),t.getEpsg1(),t.getEpsg2());
+    }
+
+
+    /**
+     * proj4的常用坐标转换方法
+     * @param x   经度或者x轴
+     * @param y   纬度或者y轴
+     * @param csName1  坐标系代码   原始数据坐标系 "EPSG:4326";  "EPSG:3857";
+     * @param csName2   坐标系代码  结果数据坐标系
+     * @return
+     */
+    public static double[] convertByProj4(double x,double y,String csName1,String csName2) {
+        CoordinateTransformFactory ctFactory = new CoordinateTransformFactory();
+        CRSFactory csFactory = new CRSFactory();
+
+        CoordinateReferenceSystem crs1 = csFactory.createFromName(csName1);
+        CoordinateReferenceSystem crs2 = csFactory.createFromName(csName2);
+
+        CoordinateTransform trans = ctFactory.createTransform(crs1, crs2);
+
+        ProjCoordinate p1 = new ProjCoordinate();
+        ProjCoordinate p2 = new ProjCoordinate();
+        p1.x = x;
+        p1.y = y;
+
+        ProjCoordinate p= trans.transform(p1, p2);
+
+        double[] xy=new double[2];
+        xy[0]=p.x;
+        xy[1]=p.y;
+        return  xy;
+    }
+}

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/SmartHumanRoom.java

@@ -19,7 +19,7 @@ import java.util.HashMap;
 @RequestMapping("smartHumanRoom")
 public class SmartHumanRoom {
     @Autowired
-    NewResultUtils resultUtils;
+    ResultUtils resultUtils;
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "code", value = "小区编码 如：510115001076510115001076012", dataType = "String"),
@@ -34,17 +34,26 @@ public class SmartHumanRoom {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String"),
-            @ApiImplicitParam(name = "unitName", value = "单元名 如：一单元", dataType = "String"),
-            @ApiImplicitParam(name = "doorCode", value = "门牌号 如：302", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "房屋id 如：", dataType = "String"),
     })
-    @ApiOperation("楼栋信息")
-    @PostMapping("peopleEntrance")
-    public Result peopleEntrance(@PathVariable String code, @PathVariable String unitName, @PathVariable String doorCode){
-        String apiUrl = "/open/api/v1/data-info/overview";
+    @ApiOperation("根据房屋ID获取人员信息")
+    @GetMapping("getPeopleByHouseId/{code}")
+    public Result getPeopleByHoseId(@PathVariable String code){
+        String apiUrl = "/open/api/v1/proprietor/queryPeopleByHouse";
         HashMap<String, Object> param = new HashMap<>();
-        param.put("areaCode", code);
+        param.put("houseId", code);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
 
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "小区编码 如：510114001017240", dataType = "String")
+    })
+    @ApiOperation("根据小区编码得到所有的单元和房号")
+    @PostMapping("peopleEntrance")
+    public Result peopleEntrance(@PathVariable String code){
+        String apiUrl = "/open/api/v1/community/houseTree";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("residentialCode", code);
 
         return resultUtils.doGetResult(apiUrl, param);
     }

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/SmartIOT.java

@@ -3,16 +3,14 @@ package com.gis.web.controller.dafengSmartCommunityController;
 import com.gis.common.config.ConfigConstant;
 import com.gis.common.util.DoorUtils;
 import com.gis.common.util.Result;
+import com.gis.web.dto.DeviceDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.TreeMap;
 
@@ -24,11 +22,11 @@ public class SmartIOT {
     @Autowired
     ConfigConstant configConstant;
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "组织机构编码 如：510114001017240", dataType = "String"),
-            @ApiImplicitParam(name = "type", value = "设备名称  1-门禁 2-道闸 3-消防栓 4-井盖 5-一体机 6-投屏显示器 7-路灯 8-人脸卡口 9-人员聚集 10-气象站 11- 垃圾分类12-报警柱13-隔离门磁14 热成像设备(火灾预警) 15 一氧化碳传感器 16 水位监测仪 17 水表 18 电子围栏", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "组织机构编码(必传) 如：510114001017240", dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "设备名称(必传)  1-门禁 2-道闸 3-消防栓 4-井盖 5-一体机 6-投屏显示器 7-路灯 8-人脸卡口 9-人员聚集 10-气象站 11- 垃圾分类12-报警柱13-隔离门磁14 热成像设备(火灾预警) 15 一氧化碳传感器 16 水位监测仪 17 水表 18 电子围栏", dataType = "String"),
     })
-    @ApiOperation("设备列表信息查询")
-    @GetMapping("findDeviceList/{code}/{type}")
+    @ApiOperation("设备列表信息查询(get)查询所有的数据")
+    @GetMapping ("findDeviceList/{code}/{type}")
     public Result findDeviceList(@PathVariable String code,@PathVariable String type) throws Exception {
         String apiUrl =configConstant.apiVideo+"/bi/findDeviceList";
         TreeMap<String, Object> param =  new TreeMap<>();
@@ -37,4 +35,16 @@ public class SmartIOT {
         return DoorUtils.doPostDecrypt(apiUrl,param);
     }
 
+    @ApiOperation("设备列表信息查询(post)分页查询")
+    @PostMapping ("findDeviceListPost")
+    public Result findDeviceList(@RequestBody DeviceDto deviceDto) throws Exception {
+        String apiUrl =configConstant.apiVideo+"/bi/findDeviceList";
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("code", deviceDto.getCode());
+        param.put("type", deviceDto.getType());
+        param.put("pageNum", deviceDto.getPageNum());
+        param.put("pageSize", deviceDto.getPageSize());
+        return DoorUtils.doPostDecrypt(apiUrl,param);
+    }
+
 }

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/SmartLife.java

@@ -23,10 +23,10 @@ import java.util.HashMap;
 public class SmartLife {
 
     @Autowired
-    NewResultUtils resultUtils;
+    ResultUtils resultUtils;
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码 ,如：510115001076", dataType = "String"),
     })
     @ApiOperation("公共空间、公共空间详情")
     @GetMapping("spaceData/{code}")
@@ -37,7 +37,7 @@ public class SmartLife {
         return resultUtils.doGetResult(apiUrl, param);
     }
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String"),
     })
     @ApiOperation("积分商城 (积分发放统计)")
     @GetMapping("pointCountByCode/{code}")
@@ -49,19 +49,33 @@ public class SmartLife {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String"),
     })
-    @ApiOperation("积分商城兑换统计")
-    @GetMapping("pointData/{code}")
-    public Result pointData(@PathVariable String code){
+    @ApiOperation("积分商城 (积分兑换统计)")
+    @GetMapping("shopPoint/{code}")
+    public Result shopPoint(@PathVariable String code){
+        String apiUrl = "/open/api/v1/community/shop-point";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("areaCode", code);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String"),
+            @ApiImplicitParam(name = "size", value = "返回数量", dataType = "int"),
+    })
+    @ApiOperation("积分商城（商品兑换）")
+    @GetMapping("pointData/{code}/{size}")
+    public Result pointData(@PathVariable String code,@PathVariable int size){
         String apiUrl = "/open/api/v1/community/point-data";
         HashMap<String, Object> param = new HashMap<>();
         param.put("areaCode", code);
+        param.put("size", size);
         return resultUtils.doGetResult(apiUrl, param);
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "城市/社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "城市/社区编码,如：510115001076", dataType = "String"),
     })
     @ApiOperation("邻里交流")
     @GetMapping("statisticsInterflow/{code}")
@@ -73,7 +87,7 @@ public class SmartLife {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String"),
     })
     @ApiOperation("资讯列表")
     @GetMapping("communityInfodata/{code}")
@@ -85,10 +99,10 @@ public class SmartLife {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String"),
             @ApiImplicitParam(name = "children", value = "是否查询街道及其以下社区", dataType = "Boolean")
     })
-    @ApiOperation("社区活动")
+    @ApiOperation("报名中活动")
     @GetMapping("communityActivitydata/{code}/{children}")
     public Result communityActivitydata(@PathVariable String code,@PathVariable Boolean children){
         String apiUrl = "/open/api/v1/community/activity-data";

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/StreetMonitor.java

@@ -1,13 +1,23 @@
 package com.gis.web.controller.dafengSmartCommunityController;
 
+import com.gis.common.util.DoorUtils;
+import com.gis.common.util.Result;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.TreeMap;
+
 @Log4j2
 @Api(tags = "云平台-街道监控")
 @RestController
 @RequestMapping("streetMonitor")
 public class StreetMonitor {
+    @ApiOperation("请使用“云平台-社区监控模块中的“视频列表接口”接口，type传1为雪亮工程”")
+    public void findDeviceList() throws Exception {
+    }
 }

gis_web/src/main/java/com/gis/web/controller/dafengSmartCommunityController/StreetOverview.java

@@ -24,7 +24,7 @@ import java.util.HashMap;
 public class StreetOverview {
 
     @Autowired
-    NewResultUtils resultUtils;
+    ResultUtils resultUtils;
 
 
     @ApiOperation("大丰街道基本信息")
@@ -37,7 +37,7 @@ public class StreetOverview {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码 ", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076 ", dataType = "String"),
     })
     @ApiOperation("居民使用服务次数")
     @GetMapping("communityServiceData/{code}")
@@ -48,38 +48,34 @@ public class StreetOverview {
         return resultUtils.doGetResult(apiUrl, param);
     }
 
-    @ApiOperation("就业专栏-还需修改")
-    @GetMapping("getStatistics/{code}")
-    public Result getStatistics(@PathVariable String code){
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "城市编码,如：510100 ", dataType = "String"),
+            @ApiImplicitParam(name = "group", value = "商家分组编码 示例：5f3de3d925892e0001e10312", dataType = "String"),
+    })
+    @ApiOperation("就业专栏")
+    @GetMapping("getStatistics/{code}/{group}")
+    public Result getStatistics(@PathVariable String code,@PathVariable String group){
         String apiUrl = "/open/api/v1/community/deyuan/getStatistics";
         HashMap<String, Object> param = new HashMap<>();
         param.put("cityCode", code);
-        // 商家分组编码
-        param.put("group", "5f3de3d925892e0001e10312");
+        param.put("group", group);
         return resultUtils.doGetResult(apiUrl, param);
     }
 
-    @ApiOperation("人员标签-还需修改")
-    @GetMapping("labelUsed/{code}")
-    public Result labelUsed(@PathVariable String code){
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码,如：测试  510115001076 ", dataType = "String"),
+            @ApiImplicitParam(name = "labelType", value = "标签类型 residential - 小区 house - 房屋 proprietor - 人员", dataType = "String"),
+    })
+    @ApiOperation("人员标签")
+    @GetMapping("labelUsed/{code}/{labelType}")
+    public Result labelUsed(@PathVariable String code,@PathVariable String labelType){
         String apiUrl = "/open/api/v1/community/label-used";
         HashMap<String, Object> param = new HashMap<>();
-        param.put("cityCode", code);
+        param.put("code", code);
+        param.put("labelType", labelType);
         return resultUtils.doGetResult(apiUrl, param);
     }
 
-//    @ApiOperation("人员标签")
-//    @GetMapping("peopleLabel")
-//    public  Result getPeopleLabel(){
-////        String apiUrl = "/open/api/v1/epi/distribution";
-////        HashMap<String, Object> param = new HashMap<>();
-////        param.put("areaCode", "510114001");
-//       // Result distributionResult=resultUtils.doGetResult(apiUrl, param);
-//
-//        String apiUrl1 = "/open/api/v1/ph-push";
-//        HashMap<String, Object> param1 = new HashMap<>();
-//        param1.put("code", "510114001");
-//        return resultUtils.doGetResult(apiUrl1, param1);
-//    }
+
 
 }

gis_web/src/main/java/com/gis/web/dto/DeviceDto.java

@@ -0,0 +1,19 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.bind.annotation.PathVariable;
+
+//设备
+@Data
+public class DeviceDto {
+    @ApiModelProperty(name = "code", value = "组织机构编码 如：510114001017240", dataType = "String")
+    private String code;
+    @ApiModelProperty(name = "type", value = "设备名称  1-门禁 2-道闸 3-消防栓 4-井盖 5-一体机 6-投屏显示器 7-路灯 8-人脸卡口 9-人员聚集 10-气象站 11- 垃圾分类12-报警柱13-隔离门磁14 热成像设备(火灾预警) 15 一氧化碳传感器 16 水位监测仪 17 水表 18 电子围栏", dataType = "String")
+    private String type;
+    @ApiModelProperty(value = "页码", name = "pageNum" , dataType = "int")
+    private  int pageNum;
+    @ApiModelProperty(value = "数量", name = "pageSize", dataType = "int")
+    private  int pageSize;
+}

gis_web/src/main/java/com/gis/web/dto/GisT.java

@@ -0,0 +1,17 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+//坐标转换
+@Data
+public class GisT {
+    @ApiModelProperty(name = "epsg1", value = "输入坐标系： 如：“EPSG:4326”", dataType = "String")
+    private String epsg1;
+    @ApiModelProperty(name = "epsg2", value = "输出坐标系", dataType = "String")
+    private String epsg2;
+    @ApiModelProperty(value = "X", name = "X值" , dataType = "double")
+    private  int X;
+    @ApiModelProperty(value = "Y", name = "Y值", dataType = "double")
+    private  int Y;
+}

gis_web/src/main/java/com/gis/web/dto/VideoDto.java

@@ -0,0 +1,17 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+//视频列表
+@Data
+public class VideoDto {
+    @ApiModelProperty(value = "对应组织机构编码  510114001017240", name = "code")
+    private String code;
+    @ApiModelProperty(value = "页码", name = "pageNum")
+    private  int pageNum;
+    @ApiModelProperty(value = "数量", name = "pageSize")
+    private int pageSize;
+    @ApiModelProperty(value = "类型:1.雪亮工程 2. 电梯梯控 3.普通监控4.热成像设备", name = "type")
+    private int type;
+}

pom.xml

@@ -106,6 +106,11 @@
                 <version>${fastjson.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.locationtech.proj4j</groupId>
+                <artifactId>proj4j</artifactId>
+                <version>1.1.3</version>
+            </dependency>
 
 
             <!-- 工具类 -->