gis_application/src/main/resources/application-dev.properties

@@ -22,4 +22,6 @@ api.door=https://cdpre.tfsmy.com/intelligence-access-control-api
 # 这个是获取物联网视频的地址
 api.IOTVideo=https://cdpre.tfsmy.com/intelligent-internetrt-api
 #这个是“获取视频列表数据”  “设备列表信息查询”  “获取指定视频流信息”
-api.video=https://cdpre.tfsmy.com/intelligence-access-control-api
+api.video=https://cdpre.tfsmy.com/intelligence-access-control-api
+#信息推送
+api.info=https://cdpre.tfsmy.com

gis_application/src/main/resources/application-pro.properties

@@ -20,6 +20,8 @@ api.screen=https://life.eshimin.com
 api.door=https://tfsmy.chengdu.gov.cn/intelligence-access-control-api
 
 # 这个是获取物联网视频的地址
-api.IOTVideo=https://cdpre.tfsmy.com/intelligent-internetrt-api
+api.IOTVideo=https://tfsmy.chengdu.gov.cn/intelligent-internetrt-api
 #这个是“获取视频列表数据”  “设备列表信息查询”  “获取指定视频流信息”
-api.video=https://cdpre.tfsmy.com/intelligence-access-control-api
+api.video=https://tfsmy.chengdu.gov.cn/intelligence-access-control-api
+#信息推送
+api.info=https://tfsmy.chengdu.gov.cn

gis_application/target/classes/application-pro.properties

@@ -0,0 +1,27 @@
+
+
+#log
+logging.path=/root/user/${project.en}_log
+logging.config=classpath:logback-spring.xml
+logging.level.com.gis=debug
+
+
+
+# swagger2 \uFFFD\uFFFD\uFFFD\uFFFD\u022B\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02BD\u03AAutf-8
+swagger.package=com.gis.web.controller
+swagger.title=${project.sc}-pro
+swagger.description=${swagger.title}
+swagger.version=1.0
+
+# \u5927\u5C4F
+api.screen=https://life.eshimin.com
+
+#\u95E8\u7981
+api.door=https://tfsmy.chengdu.gov.cn/intelligence-access-control-api
+
+# ����ǻ�ȡ��������Ƶ�ĵ�ַ
+api.IOTVideo=https://tfsmy.chengdu.gov.cn/intelligent-internetrt-api
+#����ǡ���ȡ��Ƶ�б����ݡ�  ���豸�б���Ϣ��ѯ��  ����ȡָ����Ƶ����Ϣ��
+api.video=https://tfsmy.chengdu.gov.cn/intelligence-access-control-api
+#��Ϣ����
+api.info=https://tfsmy.chengdu.gov.cn

gis_common/src/main/java/com/gis/common/config/ConfigConstant.java

@@ -43,4 +43,7 @@ public class ConfigConstant {
     @Value("${api.video}")
     public  String apiVideo;
 
+    @Value("${api.info}")
+    public String info;
+
 }

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/deyuan/util/RSAUtils.java

@@ -13,7 +13,7 @@ import java.util.Base64;
  * 生成密钥对（公钥和私钥）
  * 加密内容与签名内容进行Base64加密解密（有利于HTTP协议下传输）
  */
-public class RSAUtils {
+public class  RSAUtils {
     /**
      * 算法名称
      */

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

@@ -74,6 +74,7 @@ public class ResultUtils {
 
         String resultData = null;
 //        log.info("request url: "+ path);
+
         try {
             HttpResponse httpResponse = HttpUtils.doGet(configConstant.apiScreen, path, headers, querys);
             String restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
@@ -101,6 +102,8 @@ public class ResultUtils {
         return Result.success(JSONObject.parseObject(resultData));
     }
 
+
+
     public  JSONObject doGet(String path, Map<String, Object> param){
 
         Map<String, Object> map = new HashMap();
@@ -130,10 +133,8 @@ public class ResultUtils {
 
 //        log.info("request param: {}", querys);
 
-
         Map<String, String> headers = new HashMap<>();
         querys.put("Content-Type", "application/json;charset=utf-8");
-
         String resultData = null;
 //        log.info("request url: "+ path);
         try {
@@ -145,7 +146,6 @@ public class ResultUtils {
                 String msg = jsonObject.getString("msg");
                 if (code.equals("200")) {
                     String result = jsonObject.getString("result");
-
                     String s = RSAUtils.decryptByPrivateKey(result, RSAUtils.getPrivateKey(privateKyeRes));
                     resultData = URLDecoder.decode(s, "utf-8");
                 }
@@ -153,11 +153,62 @@ public class ResultUtils {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         log.info("result: {}", resultData);
         return JSONObject.parseObject(resultData);
     }
+    // 人员标签专用
+    public  Result doGetSpecial(String path, Map<String, Object> param){
+
+        Map<String, Object> map = new HashMap();
+
+        if (param != null) {
+            for (Map.Entry<String, Object> a : param.entrySet()) {
+                map.put(a.getKey(), a.getValue());
+            }
+        }
+
+        log.info("input param: {}", map);
+
+        String generateSignSrcData = CommonUtil.generateSignSrcData(map);
+        String sign = null;
+        String encryptParams = null;
+        try {
+            sign = RSAUtils.encryptByPublicKey(generateSignSrcData, RSAUtils.getPublicKey(publicKyeSign));
+            encryptParams = RSAUtils.encryptByPublicKey(JSONObject.toJSONString(map), RSAUtils.getPublicKey(publicKyeReq));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        Map<String, String> querys = new HashMap<>();
+        querys.put("data", encryptParams);
+        querys.put("appId", appId);
+        querys.put("sign", sign);
 
+//        log.info("request param: {}", querys);
+
+        Map<String, String> headers = new HashMap<>();
+        querys.put("Content-Type", "application/json;charset=utf-8");
+        String resultData = null;
+//        log.info("request url: "+ path);
+        try {
+            HttpResponse httpResponse = HttpUtils.doGet(configConstant.apiScreen, path, headers, querys);
+            String restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
+            if (StringUtils.isNotEmpty(restResult)) {
+                JSONObject jsonObject = JSONObject.parseObject(restResult, Feature.IgnoreNotMatch);
+                String code = jsonObject.getString("code");
+                String msg = jsonObject.getString("msg");
+                if (code.equals("200")) {
+                    String result = jsonObject.getString("result");
+                    String s = RSAUtils.decryptByPrivateKey(result, RSAUtils.getPrivateKey(privateKyeRes));
+                    resultData = URLDecoder.decode(s, "utf-8");
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        log.info("result: {}", resultData);
+        return Result.success(resultData);
+    }
 
 
     /**
@@ -174,6 +225,4 @@ public class ResultUtils {
         }
         return decode;
     }
-
-
 }

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

@@ -0,0 +1,54 @@
+package com.gis.common.util;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Hex;
+import java.security.*;
+public class AESUtils {
+
+    public static String AESIV = "E08ADE2699714B87";
+
+    private static String charset = "utf-8";
+    // 偏移量 16对应128位
+    private static int offset = 16;
+
+    private static String transformation = "AES/CBC/PKCS5Padding";
+
+    private static String algorithm = "AES";
+
+    //加密
+    public static String encrypt(String content,String key) {
+        try {
+            SecretKeySpec skey = new SecretKeySpec(key.getBytes(), algorithm);
+            IvParameterSpec iv = new IvParameterSpec(AESIV.getBytes(), 0, offset);
+            Cipher cipher = Cipher.getInstance(transformation);
+            byte[] byteContent = content.getBytes(charset);
+            cipher.init(Cipher.ENCRYPT_MODE, skey, iv);// 初始化
+            byte[] result = cipher.doFinal(byteContent);
+
+            return  Hex.encodeHexString(result); // 加密
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return  null;
+    }
+
+    //解密
+    public static String decrypt(String content,String key) {
+        try {
+            SecretKeySpec skey = new SecretKeySpec(key.getBytes(), algorithm);
+            IvParameterSpec iv = new IvParameterSpec(AESIV.getBytes(), 0, offset);
+            Cipher cipher = Cipher.getInstance(transformation);
+            cipher.init(Cipher.DECRYPT_MODE, skey, iv);// 初始化
+            byte[] result = cipher.doFinal(new Base64().decode(content));
+            return new String(result); // 解密
+        } catch (Exception e) {
+
+        }
+        return  null;
+    }
+
+
+}

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_common/src/main/java/com/gis/common/util/FileUtils.java

@@ -31,6 +31,7 @@ public class FileUtils {
             log.error("文件不能为空");
             return null;
         }
+        
 
         String time = DateUtil.format(new Date(), "yyyyMMdd_HHmmssSSS");
         savePath = savePath + time + File.separator;

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/StaticConfig.java

@@ -0,0 +1,16 @@
+package com.gis.web;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+@Configuration
+public class StaticConfig extends WebMvcConfigurerAdapter {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry
+                .addMapping("/**")
+                .allowedMethods("*")
+                .allowedOrigins("*")
+                .allowedHeaders("*");
+    }
+}

gis_web/src/main/java/com/gis/web/controller/ScreenController1.java

@@ -0,0 +1,592 @@
+//package com.gis.web.controller;
+//
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.alibaba.fastjson.serializer.SerializerFeature;
+//import com.gis.common.base.entity.dto.DeviceInfo;
+//import com.gis.common.deyuan.util.ResultUtils;
+//import com.gis.common.util.DoorUtils;
+//import com.gis.common.util.Result;
+//import com.gis.web.dto.PageDto;
+//import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+//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 lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.HashMap;
+//import java.util.TreeMap;
+//
+//
+///**
+// * Created by owen on 2020/10/18 0018 12:17
+// */
+//@Slf4j
+//@Api(tags = "大屏BI接口")
+//@RestController
+//@RequestMapping("screen")
+//public class ScreenController1 {
+//
+//    @Autowired
+//    ResultUtils resultUtils;
+//
+//    @ApiOperationSupport(order=1)
+//    @ApiOperation("街道人员组成、房屋信息")
+//    @GetMapping("baseData/{code}")
+//    public Result baseData(@PathVariable String code){
+//        String apiUrl = "/open/api/v1/community/base-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=1)
+//    @ApiOperation("街道服务")
+//    @GetMapping("serviceData/{code}")
+//    public JSONObject serviceData(@PathVariable String code){
+//        String apiUrl = "/open/api/v1/community/service-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGet(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=1)
+//    @ApiOperation("市民之声数据")
+//    @GetMapping("citizenVoiceData/{code}")
+//    public JSONObject citizenVoiceData(@PathVariable String code){
+//        String apiUrl = "/open/api/v1/community/citizen-voice-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGet(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=1)
+//    @ApiOperation("公共空间数据")
+//    @GetMapping("spaceData/{code}")
+//    public JSONObject spaceData(@PathVariable String code){
+//        String apiUrl = "/open/api/v1/community/space-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGet(apiUrl, param);
+//    }
+//
+//
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "code", value = "行政编码 (必传)", dataType = "String"),
+//            @ApiImplicitParam(name = "children", value = "查询下级节点(非必传), 必传是否查询街道及其以下社区：" +"true ", dataType = "String")
+//    })
+//    @ApiOperationSupport(order=1)
+//    @ApiOperation("社区活动")
+//    @GetMapping("activityData")
+//    public JSONObject activityData(@PathVariable String code,@PathVariable Boolean children){
+//        String apiUrl = "/open/api/v1/community/activity-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        param.put("children", children);
+//        return resultUtils.doGet(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("邻里交流，cityCode:510124112")
+//    @GetMapping("interFlow/{cityCode}")
+//    public Result interFlow(@PathVariable String cityCode) {
+//        String apiUrl = "/open/api/v1/community/statistics/interflow";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("cityCode", cityCode);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("积分商城数据")
+//    @GetMapping("pointData/{code}")
+//    public Result pointData(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/point-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("社区资讯")
+//    @GetMapping("infoData/{code}")
+//    public Result infoData(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/info-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("可信生活圈")
+//    @GetMapping("businessData/{code}/{type}")
+//    public Result businessData(@PathVariable String group,@PathVariable String[] type) {
+//        String apiUrl = "/open/api/v1/community/business-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("group", group);
+//        param.put("type", type);
+//
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "appId", value = "应用Id(必传)", dataType = "String"),
+//            @ApiImplicitParam(name = "sign", value = "参数签名(必传)， ", dataType = "String"),
+//            @ApiImplicitParam(name = "data", value = "data(非必传) ", dataType = "String")
+//    })
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("就业专栏")
+//    @GetMapping("getStatistics")
+//    public Result getStatistics(@PathVariable String appId,@PathVariable String sign,@PathVariable String data) {
+//        String apiUrl = "/open/api/v1/community/deyuan/getStatistics";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("appId", appId);
+//        param.put("sign", sign);
+//        param.put("data", data);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//
+//    /**
+//     * 2021-02-19
+//     * @param xzCode 行政编码
+//     * @param xzLevel 行政级别
+//     * @return
+//     */
+//    @ApiOperation("一键报警, 510124112006:4, 510124112:3")
+//    @GetMapping("getInfo")
+//    public Result getInfo(@PathVariable String xzCode, @PathVariable String xzLevel, @PathVariable String topic, @PathVariable String lastestNewsNum, @PathVariable String reportStarttime, @PathVariable String reportEndtime, @PathVariable String dealStartTime, @PathVariable String dealEndTime) {
+//        String apiUrl = "/open/api/v1/sspReportInfo/getInfo";
+//
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("xzCode", xzCode);
+//        param.put("xzLevel", xzLevel);
+//        param.put("topic", topic);
+//        param.put("lastestNewsNum", lastestNewsNum);
+//        param.put("reportStarttime", reportStarttime);
+//        param.put("reportEndtime", reportEndtime);
+//        param.put("dealStartTime", dealStartTime);
+//        param.put("dealEndTime", dealEndTime);
+//        return Result.success(resultUtils.doGet(apiUrl, param));
+//    }
+//
+//
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "code", value = "行政编码 (必传)", dataType = "String"),
+//            @ApiImplicitParam(name = "xzLevel", value = "行政级别(必传)， ", dataType = "String"),
+//            @ApiImplicitParam(name = "topic", value = "查询主题， DB 表示待办, YB 表示已办 （必传）， ", dataType = "String")
+//    })
+//    @ApiOperation("一键报警(已办/代办), 510124112006:4, 510124112:3")
+//    @GetMapping("sspReportInfo")
+//    public Result sspReportInfo(@PathVariable String code, @PathVariable String xzLevel, @PathVariable String topic, @PathVariable String reportStarttime, @PathVariable String reportEndtime, @PathVariable String dealStartTime, @PathVariable String dealEndTime) {
+//        String apiUrl = "/open/api/v1/sspReportInfo/getInfoList";
+//
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("xzCode", code);
+//        param.put("xzLevel", xzLevel);
+//        param.put("topic", topic);
+//        param.put("reportStarttime", reportStarttime);
+//        param.put("reportEndtime", reportEndtime);
+//        param.put("dealStartTime", dealStartTime);
+//        param.put("dealEndTime", dealEndTime);
+//        return Result.success(resultUtils.doGet(apiUrl, param));
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("党建活动")
+//    @GetMapping("activity/{code}")
+//    public Result activity(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/deyuan/activity";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("党组织概况")
+//    @GetMapping("organization/{code}")
+//    public Result organization(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/deyuan/organization";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("党建资讯")
+//    @GetMapping("article/{code}")
+//    public Result article(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/deyuan/article";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("智慧门禁健康码推送")
+//    @GetMapping("article")
+//    public Result entranceGuard(@PathVariable String idCard,@PathVariable String dataTime,@PathVariable String status,@PathVariable String desc) throws Exception{
+//        String apiUrl = "/open/api/v1/ entrance-guard/health/pull";
+//        TreeMap<String, Object> param =  new TreeMap<>();
+//        param.put("idCard", idCard);
+//        param.put("dataTime", dataTime);
+//        param.put("status", status);
+//        param.put("desc", desc);
+//        return DoorUtils.doPost(apiUrl,param);
+//    }
+//
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("走访打更")
+//    @GetMapping("zfSignin")
+//    public Result zfSignin(@PathVariable String townCode,@PathVariable String page,@PathVariable String size) {
+//        String apiUrl = "/open/api/v1/zfSignin/querySign";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("townCode", townCode);
+//        param.put("page", page);
+//        param.put("size", size);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("社区警务室信息")
+//    @GetMapping("policeRoom/{code}")
+//    public Result policeRoom(@PathVariable String code) throws Exception{
+//        String apiUrl = "/open/api/screen/policeRoom";
+//        TreeMap<String, Object> param =  new TreeMap<>();
+//        param.put("code", code);
+//        return  DoorUtils.doPost(apiUrl,param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("证明申请信息统计")
+//    @GetMapping("screenCount/{code}")
+//    public Result screenCount(@PathVariable String code) throws Exception{
+//        String apiUrl = "/open/api/screen/count";
+//        TreeMap<String, Object> param =  new TreeMap<>();
+//        param.put("code", code);
+//        return DoorUtils.doPost(apiUrl,param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("证明申请最新动态")
+//    @GetMapping("screenCount/{code}/{count}")
+//    public Result screenCount(@PathVariable String code,@PathVariable int count)throws Exception {
+//        String apiUrl = "/open/api/screen/count";
+//        TreeMap<String, Object> param =  new TreeMap<>();
+//        param.put("code", code);
+//        param.put("count", count);
+//        return DoorUtils.doPost(apiUrl,param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("社区积分商城商品数量（社区排行榜）")
+//    @GetMapping("getStatics/{code}")
+//    public Result getStatics(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/getStatics";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("空间数量统计（社区排行榜")
+//    @GetMapping("communalSpace/{code}")
+//    public Result communalSpace(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/communal/space";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("空间数量统计（社区排行榜）")
+//    @GetMapping("activityStatics/{code}")
+//    public Result activityStatics(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/activity/statics";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("资讯数量统计（社区排行榜）")
+//    @GetMapping("newsManage/{code}")
+//    public Result newsManage(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/news-manage";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("加入和访问社区统计接口（7天，30天，当天，累计加入）")
+//    @GetMapping("budCloudGovernanceBiz/{code}/{date}")
+//    public Result budCloudGovernanceBiz(@PathVariable String code,@PathVariable String date) {
+//        String apiUrl = "/open/api/v1/bi/bud-cloud-governance-biz";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        param.put("date", date);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperationSupport(order=2)
+//    @ApiOperation("基库 - 查询社区各类标签的使用详情")
+//    @GetMapping("labelUsed/{code}/{date}")
+//    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("code", code);
+//        param.put("labelType", labelType);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("积分商城-积分兑换统计，code:510124112")
+//    @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("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("积分商城-积分发放统计，code:510124112")
+//    @GetMapping("pointCountByCode/{code}")
+//    public Result pointCountByCode(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/pointCountByCode";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("areaCode", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("基库-社区人员各个省份分布")
+//    @GetMapping("provinceDistributed/{code}")
+//    public Result provinceDistributed(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/province-distributed";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("基库-社区人员本省城市分布（新增）")
+//    @GetMapping("cityDistributed/{code}")
+//    public Result cityDistributed(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/city-distributed";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//
+//    @ApiOperation("基库-小区楼栋信息（新增）")
+//    @GetMapping("residential/{code}")
+//    public Result residential(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/residential/info";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("基库-高龄老人进出预警（新增-天府用）")
+//    @GetMapping("focusAlarm/{code}")
+//    public Result focusAlarm(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/focus/alarm";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("residentialCode", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("基库-根据标签查询人员列表（新增）")
+//    @GetMapping("getPeopleByLabel/{code}/{pageIndex}/{pageSize}/{labelId}")
+//    public Result getPeopleByLabel(@PathVariable String code,@PathVariable String pageIndex,@PathVariable String pageSize,@PathVariable String labelId) {
+//        String apiUrl = "/open/api/v1/community/getPeopleByLabel";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        param.put("pageIndex", pageIndex);
+//        param.put("pageSize", pageSize);
+//        param.put("labelId", labelId);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("加入社区，门户访问量")
+//    @GetMapping("doorStatistical/{code}")
+//    public Result doorStatistical(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/door/statistical";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("启用服务数，服务总次数")
+//    @GetMapping("serviceUsestatistical/{code}")
+//    public Result serviceUsestatistical(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/service-use/statistics";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("市级别服务饼图")
+//    @GetMapping("classStatistical/{code}")
+//    public Result classStatistical(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/service/class-statistical";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("市级服务使用排行")
+//    @GetMapping("rankStatistical/{code}")
+//    public Result rankStatistical(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/service/rank-statistical";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("居民使用接口")
+//    @GetMapping("monthStatistical/{code}")
+//    public Result monthStatistical(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/service/month-statistical";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("积分发放总数、积分发放核 销分析")
+//    @GetMapping("activePointStatistical/{code}")
+//    public Result activePointStatistical(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/service/active-point-statistical";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("问卷使用量接口")
+//    @GetMapping("summaryStatistics/{code}")
+//    public Result summaryStatistics(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/summary-statistics";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("资讯阅读数统计")
+//    @GetMapping("newsManageScreen")
+//    public Result summaryStatistics(@PathVariable String code,@PathVariable String num,@PathVariable String size) {
+//        String apiUrl = "/open/api/v1/bi/news-manage/screen";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        param.put("num", num);
+//        param.put("size", size);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//    @ApiOperation("积分商城兑换统计")
+//    @GetMapping("communityPointData")
+//    public Result communityPointData(@PathVariable String code,@PathVariable String size) {
+//        String apiUrl = "/open/api/v1/community/point-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        param.put("size", size);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("党建-最新一条党建活动")
+//    @GetMapping("partyActivityOne/{code}")
+//    public Result communityPointData(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/party/activity-one";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("community_code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("工具使用量统计")
+//    @GetMapping("toolsServerData/{code}")
+//    public Result toolsServerData(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/tools/server-data";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("积分发放核销分析")
+//    @GetMapping("activePointMonthStatistical/{code}")
+//    public Result activePointMonthStatistical(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/bi/active-point-month-statistical";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("基库-高龄老人进出预警（新）-测试地址")
+//    @GetMapping("alarmFocus/{code}")
+//    public Result alarmFocus(@PathVariable String code) {
+//        String apiUrl = "/open/api/device/alarm/focus";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("code", code);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//    @ApiOperation("数据告警信息")
+//    @PostMapping("deviceInfo")
+//    public Result deviceInfo(@RequestBody DeviceInfo deviceInfo) throws Exception{
+//        String apiUrl = "/open/api/device/info";
+//        TreeMap<String, Object> param =  new TreeMap<>();
+//        param.put("deviceType", deviceInfo.getDeviceType());
+//        param.put("channel", deviceInfo.getChannel());
+//        param.put("name", deviceInfo.getName());
+//        param.put("address", deviceInfo.getAddress());
+//        param.put("deviceCode", deviceInfo.getDeviceCode());
+//        param.put("deviceStatus", deviceInfo.getDeviceStatus());
+//        param.put("deviceWarn", deviceInfo.getDeviceWarn());
+//        param.put("deviceWarnContent", deviceInfo.getDeviceWarnContent());
+//        param.put("deviceWarnTime", deviceInfo.getDeviceWarnTime());
+//        param.put("manageDepartment", deviceInfo.getDeviceType());
+//        param.put("altitude", deviceInfo.getDeviceType());
+//        param.put("longitude", deviceInfo.getDeviceType());
+//        param.put("villageCode", deviceInfo.getDeviceType());
+//        param.put("outId", deviceInfo.getDeviceType());
+//        JSONObject object = JSONObject.parseObject(deviceInfo.getExtras());
+//        param.put("extras", JSON.toJSONString(object, SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue,
+//                SerializerFeature.WriteDateUseDateFormat));
+//        return  DoorUtils.doPost(apiUrl, param);
+//    }
+//
+//
+//
+//
+////----------------------------------------------------------------------以上接口2021.12.13日修改
+//
+//    @ApiOperation(value = "就业发展-就业专栏(code:510124112、510100)", notes = "510100:有数据")
+//    @GetMapping("getStatistics/{code}")
+//    public Result getStatistics(@PathVariable String code) {
+//        String apiUrl = "/open/api/v1/community/deyuan/getStatistics";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("cityCode", code);
+//        // 商家分组编码
+//        param.put("group", "5f3de3d925892e0001e10312");
+//        return Result.success(resultUtils.doGet(apiUrl, param));
+//    }
+//
+//
+//
+//    /**
+//     * 2021-02-19
+//     * 新增接口
+//     * @param pageDto
+//     * @return
+//     */
+//    @ApiOperation("网格治理-走访打更")
+//    @PostMapping("zfSignin/querySign")
+//    public Result zfSignin(@RequestBody PageDto pageDto) {
+//        String apiUrl = "/open/api/v1/zfSignin/querySign";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("townCode", pageDto.getCode());
+//        Integer pageSize = pageDto.getPageSize();
+//        Integer pageNum = pageDto.getPageNum();
+//        if (pageSize <= 0) {
+//            pageSize = 10;
+//        }
+//        if (pageNum <= 0) {
+//            pageNum = 1;
+//        }
+//        param.put("size", pageSize);
+//        param.put("page", pageNum);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//}

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

@@ -1,11 +1,11 @@
 package com.gis.web.controller.dafengSmartCommunityController;
 
 import com.gis.common.config.ConfigConstant;
-import com.gis.common.deyuan.util.NewResultUtils;
 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 +19,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 +80,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 +119,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 +147,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 +160,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,9 +61,8 @@ 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

@@ -1,19 +1,19 @@
 package com.gis.web.controller.dafengSmartCommunityController;
 
+import com.gis.common.config.ConfigConstant;
 import com.gis.common.deyuan.util.NewResultUtils;
 import com.gis.common.deyuan.util.ResultUtils;
 import com.gis.common.util.Result;
+import com.gis.web.dto.MyEventObject;
 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.EventObject;
 import java.util.HashMap;
 
 @Log4j2
@@ -22,8 +22,9 @@ import java.util.HashMap;
 @RequestMapping("emergencyCommand")
 public class EmergencyCommand {
     @Autowired
-    NewResultUtils resultUtils;
-
+    ResultUtils resultUtils;
+    @Autowired
+    ConfigConstant configConstant;
     @ApiImplicitParams({
             @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String"),
             @ApiImplicitParam(name = "topic", value = "查询主题 取值常量：DB 表示待办、YB 表示已办", dataType = "String")
@@ -38,5 +39,49 @@ public class EmergencyCommand {
         param.put("topic", topic);
         return resultUtils.doGetResult(apiUrl, param);
     }
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "行政区划编码 如：510115001076", dataType = "String")
+    })
+    @ApiOperation("总览统计数据")
+    @GetMapping("platformCockpitTotal/{code}")
+    public Result platformCockpitTotal(@PathVariable String code){
+        String apiUrl ="/open/bud-resident-appeal/api/open/platform/cockpit/total";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("areaCode", code);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
 
+    @ApiOperation("未解决事件列表")
+    @PostMapping("cockpitToBeSolved")
+    public Result cockpitToBeSolved(@RequestBody MyEventObject eventObject){
+        String apiUrl = "/open/bud-resident-appeal/api/open/platform/cockpit/toBeSolved";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("areaCode",eventObject.getAreaCode() );
+        param.put("pageIndex",eventObject.getPageIndex());
+        param.put("pageSize",eventObject.getPageSize() );
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiOperation("已解决事件列表")
+    @PostMapping("cockpitSolved")
+    public Result cockpitSolved(@RequestBody MyEventObject eventObject){
+        String apiUrl = "/open/bud-resident-appeal/api/open/platform/cockpit/solved";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("areaCode",eventObject.getAreaCode() );
+        param.put("pageIndex",eventObject.getPageIndex());
+        param.put("pageSize",eventObject.getPageSize() );
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiOperation("最近10条事件列表")
+    @PostMapping("cockpitRecentlyReported")
+    public Result cockpitRecentlyReported(@RequestBody MyEventObject eventObject){
+        String apiUrl = "/open/bud-resident-appeal/api/open/platform/cockpit/recentlyReported";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("areaCode",eventObject.getAreaCode() );
+        param.put("pageIndex",eventObject.getPageIndex());
+        param.put("pageSize",eventObject.getPageSize() );
+        return resultUtils.doGetResult(apiUrl, param);
+    }
 }

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

@@ -2,17 +2,18 @@ package com.gis.web.controller.dafengSmartCommunityController;
 
 import com.gis.common.config.ConfigConstant;
 import com.gis.common.util.DoorUtils;
+import com.gis.common.util.IOTUtils;
 import com.gis.common.util.Result;
+import com.gis.web.dto.AlarmDto;
+import com.gis.web.dto.DeviceDto;
+import com.gis.web.dto.PersonDto;
 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 +25,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 +38,70 @@ 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);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "villageCode", value = "小区编码", dataType = "String"),
+    })
+    @ApiOperation("查询预警信息(get)-物联平台")
+    @GetMapping ("queryAlertInfo/{villageCode}")
+    public Result queryAlertInfo(@PathVariable String villageCode) throws Exception {
+        String apiUrl =configConstant.apiIOTVideo+"/api/getAlarmList";
+       // String apiUrl ="http://2j243n.natappfree.cc/api/getAlarmList";
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("villageCode", villageCode);
+        return IOTUtils.doPostDecrypt(apiUrl,param);
+    }
+    @ApiOperation("查询预警信息(post)分页-物联平台")
+    @PostMapping ("queryAlertInfoPost")
+    public Result queryAlertInfoPost(@RequestBody AlarmDto alarmDto) throws Exception {
+        String apiUrl =configConstant.apiIOTVideo+"/api/getAlarmList";
+       // String apiUrl ="http://2j243n.natappfree.cc/api/getAlarmList";
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("villageCode", alarmDto.getVillageCode());
+            param.put("deviceId", alarmDto.getDeviceId());
+            param.put("startTime", alarmDto.getStartTime());
+            param.put("endTime", alarmDto.getEndTime());
+        if(alarmDto.getPageNum()!=0){
+            param.put("pageNum", alarmDto.getPageNum());
+        }
+        if(alarmDto.getPageSize()!=0){
+            param.put("pageSize", alarmDto.getPageSize());
+        }
+        if(alarmDto.getType()!=0){
+            param.put("type", alarmDto.getType());
+        }
+
+        if(alarmDto.getDeviceType()!=0){
+            param.put("deviceType", alarmDto.getDeviceType());
+        }
+        return IOTUtils.doPostDecrypt(apiUrl,param);
+    }
+
+    @ApiOperation("查询人员进出记录(post)-物联平台")
+    @PostMapping ("queryAlertInfo")
+    public Result getPersonLogList(@RequestBody PersonDto personDto) throws Exception {
+       String apiUrl =configConstant.apiIOTVideo+"/api/getPersonLogList";
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("villageCode",personDto.getVillageCode());
+        param.put("pageSize", personDto.getPageSize());
+        param.put("currentPage", personDto.getCurrentPage());
+        param.put("cardNo", personDto.getCardNo());
+        param.put("userId", personDto.getUserId());
+        param.put("startTime", personDto.getStartTime());
+        param.put("endTime", personDto.getEndTime());
+
+
+        return IOTUtils.doPostDecrypt(apiUrl,param);
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.gis.web.controller.dafengSmartCommunityController;
 
-import com.gis.common.deyuan.util.NewResultUtils;
 import com.gis.common.deyuan.util.ResultUtils;
 import com.gis.common.util.Result;
 import io.swagger.annotations.Api;
@@ -23,10 +22,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 +36,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 +48,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 +86,7 @@ public class SmartLife {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076", dataType = "String"),
     })
     @ApiOperation("资讯列表")
     @GetMapping("communityInfodata/{code}")
@@ -85,10 +98,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

@@ -1,6 +1,5 @@
 package com.gis.web.controller.dafengSmartCommunityController;
 
-import com.gis.common.deyuan.util.NewResultUtils;
 import com.gis.common.deyuan.util.ResultUtils;
 import com.gis.common.util.Result;
 import io.swagger.annotations.Api;
@@ -24,7 +23,7 @@ import java.util.HashMap;
 public class StreetOverview {
 
     @Autowired
-    NewResultUtils resultUtils;
+    ResultUtils resultUtils;
 
 
     @ApiOperation("大丰街道基本信息")
@@ -37,7 +36,7 @@ public class StreetOverview {
     }
 
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "code", value = "社区编码 ", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "社区编码,如：510115001076 ", dataType = "String"),
     })
     @ApiOperation("居民使用服务次数")
     @GetMapping("communityServiceData/{code}")
@@ -48,38 +47,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);
-        return resultUtils.doGetResult(apiUrl, param);
+        param.put("code", code);
+        param.put("labelType", labelType);
+        return resultUtils.doGetSpecial(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/controller/dafengSmartCommunityController/Tianfushimigyun.java

@@ -0,0 +1,41 @@
+package com.gis.web.controller.dafengSmartCommunityController;
+
+import com.gis.common.config.ConfigConstant;
+import com.gis.common.util.Result;
+import com.gis.common.util.TianfushimingyunUtils;
+import com.gis.web.dto.InfoDto;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.TreeMap;
+
+@Log4j2
+@Api(tags = "云平台-消息推送")
+@RestController
+@RequestMapping("/info")
+public class Tianfushimigyun {
+    @Autowired
+    ConfigConstant configConstant;
+    @ApiOperation("新版消息推送(post)")
+    @PostMapping("queryAlertInfo")
+    public Result getPersonLogList(@RequestBody InfoDto infoDto) throws Exception {
+        String apiUrl =configConstant.info+"/message-api/openapi/msg";
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("clients", infoDto.getClients());
+        param.put("title",infoDto.getTitle());
+        param.put("body", infoDto.getBody());
+        param.put("requestId", infoDto.getRequestId());
+        param.put("appId", infoDto.getAppId());
+        param.put("action", infoDto.getAction());
+        param.put("mobile", infoDto.getMobile());
+        param.put("appsecret", infoDto.getAppsecret());
+        param.put("username", infoDto.getUsername());
+        param.put("actionContent", infoDto.getActionContent());
+        param.put("templateKey", infoDto.getTemplateKey());
+        param.put("voice", "0");
+        return TianfushimingyunUtils.doPost(apiUrl,param);
+     //   return TianfushimingyunUtils.doPostDecrypt(apiUrl,param);
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+//预警信息
+@Data
+public class AlarmDto {
+    @ApiModelProperty(value = "小区信息(必须)",required=true)
+    private String villageCode;
+    @ApiModelProperty(value = "设备id (非必须)",required=false)
+    private String deviceId;
+    @ApiModelProperty(value = "开始时间(非必须) yyyy-MM-dd",required=false)
+    private String startTime;
+    @ApiModelProperty(value = "结束时间(非必须) yyyy-MM-dd",required=false)
+    private String endTime;
+    @ApiModelProperty(value = "当前页(非必须) 默认 1",required=false)
+    private int pageNum;
+    @ApiModelProperty(value = "每页记录数(非必须) 默认 10",required=false)
+    private int pageSize;
+    @ApiModelProperty(value = "类型(非必须) 1.设备数据变化 2.设备事件上报 3.设备上下线",required=false)
+    private int type;
+    @ApiModelProperty(value = "设备类型",required=false)
+    private int deviceType;
+}

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/MyEventObject.java

@@ -0,0 +1,14 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+//事件
+@Data
+public class MyEventObject {
+        @ApiModelProperty(value = "行政区划编码")
+        private String areaCode;
+        @ApiModelProperty(value = "当前页(非必须) 默认 1")
+        private int pageIndex;
+        @ApiModelProperty(value = "每页记录数(非必须) 默认 10")
+        private int pageSize;
+}

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

@@ -0,0 +1,25 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+//查询人员进出记录-物联平台
+@Data
+public class PersonDto {
+    @ApiModelProperty(value = "当前页,默认1（必须）", name = "currentPage",required=true)
+    private Integer currentPage;
+
+    @ApiModelProperty(value = "每页数量（必须）", name = "pageSize",required=true)
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "搜索条件（必须）", name = "searchKey",required=true)
+    private String villageCode;
+    @ApiModelProperty(value = "证件号（非必须）", name = "cardNo",required=false)
+    private String cardNo;
+    @ApiModelProperty(value = "住户ID（非必须）", name = "userId",required=false)
+    private String userId;
+    @ApiModelProperty( value = "开始时间 yyyy-MM-dd（非必须）" ,name = "startTime" ,required=false)
+    private String startTime;
+    @ApiModelProperty(value = "结束时间 yyyy-MM-dd（非必须）",name = "endTime",required=false )
+    private String endTime;
+
+}

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>
 
 
             <!-- 工具类 -->
@@ -138,9 +143,26 @@
             </dependency>
 
 
-
-
-
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15</artifactId>
+                <version>1.44</version>
+            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.bouncycastle</groupId>-->
+<!--                <artifactId>bcprov-jdk15on</artifactId>-->
+<!--                <systemPath>${project.basedir}/gis_application/src/main/resources/jar/bcprov-ext-jdk15on-170.jar</systemPath>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.bouncycastle</groupId>-->
+<!--                <artifactId>bcprov-jdk15on</artifactId>-->
+<!--                <systemPath>${project.basedir}/gis_application/src/main/resources/jar/bcprov-ext-jdk15on-170.jar</systemPath>-->
+<!--            </dependency>-->
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>1.70</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>