接口更新

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

@@ -1,7 +1,7 @@
 
 
 #log
-logging.path=E:/log/${project.en}_log
+logging.path=D:/log/${project.en}_log
 logging.config=classpath:logback-spring.xml
 logging.level.com.gis=debug
 
@@ -17,4 +17,9 @@ swagger.version=1.0
 api.screen=https://testlife.eshimin.com
 
 #\u95E8\u7981
-api.door=https://cdpre.tfsmy.com/intelligence-access-control-api
+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

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

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

gis_common/src/main/java/com/gis/common/base/entity/dto/DeviceInfo.java

@@ -0,0 +1,38 @@
+package com.gis.common.base.entity.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DeviceInfo {
+    @ApiModelProperty(value = "设备类型(必传)", name = "deviceType")
+    private String deviceType;
+    @ApiModelProperty(value = "渠道(必传)", name = "channel")
+    private String channel;
+    @ApiModelProperty(value = "设备名(必传)", name = "name")
+    private String name;
+    @ApiModelProperty(value = "设备地址(必传)", name = "address")
+    private String address;
+    @ApiModelProperty(value = "设备编码(必传)", name = "deviceCode")
+    private String deviceCode;
+    @ApiModelProperty(value = "设备状态(必传)", name = "deviceStatus")
+    private String deviceStatus;
+    @ApiModelProperty(value = "设备告警(必传)", name = "deviceWarn")
+    private Object deviceWarn;
+    @ApiModelProperty(value = "告警内容(必传)", name = "deviceWarnContent")
+    private String deviceWarnContent;
+    @ApiModelProperty(value = "告警时间(必传)", name = "deviceWarnTime")
+    private long deviceWarnTime;
+    @ApiModelProperty(value = "管理部门(非必传)", name = "manageDepartment")
+    private String manageDepartment;
+    @ApiModelProperty(value = "纬度(必传)", name = "altitude")
+    private String altitude;
+    @ApiModelProperty(value = "经度(必传)", name = "longitude")
+    private String longitude;
+    @ApiModelProperty(value = "社区编码(必传)", name = "villageCode")
+    private String villageCode;
+    @ApiModelProperty(value = "设备外部Id(必传)", name = "outId")
+    private String outId;
+    @ApiModelProperty(value = "设备专有属性(必传)", name = "extras")
+    private String extras;
+}

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

@@ -37,8 +37,10 @@ public class ConfigConstant {
     @Value("${api.screen}")
     public  String apiScreen;
 
+    @Value("${api.IOTVideo}")
+    public  String apiIOTVideo;
 
-
-
+    @Value("${api.video}")
+    public  String apiVideo;
 
 }

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

@@ -0,0 +1,196 @@
+package com.gis.common.deyuan.util;
+
+/**
+ * @Author zhouzhou
+ * @Date: 2021/7/27 11:31
+ * @Description
+ * @Version 1.0
+ */
+
+public final class Base64 {
+    private static final int BASELENGTH = 128;
+
+    private static final int LOOKUPLENGTH = 64;
+
+    private static final int TWENTYFOURBITGROUP = 24;
+
+    private static final int EIGHTBIT = 8;
+
+    private static final int SIXTEENBIT = 16;
+
+    private static final int FOURBYTE = 4;
+
+    private static final int SIGN = -128;
+
+    private static char PAD = '=';
+
+    private static byte[] base64Alphabet = new byte[128];
+
+    private static char[] lookUpBase64Alphabet = new char[64];
+
+    static {
+        int i;
+        for (i = 0; i < 128; i++)
+            base64Alphabet[i] = -1;
+        for (i = 90; i >= 65; i--)
+            base64Alphabet[i] = (byte) (i - 65);
+        for (i = 122; i >= 97; i--)
+            base64Alphabet[i] = (byte) (i - 97 + 26);
+        for (i = 57; i >= 48; i--)
+            base64Alphabet[i] = (byte) (i - 48 + 52);
+        base64Alphabet[43] = 62;
+        base64Alphabet[47] = 63;
+        for (i = 0; i <= 25; i++)
+            lookUpBase64Alphabet[i] = (char) (65 + i);
+        int j;
+        for (i = 26, j = 0; i <= 51; i++, j++)
+            lookUpBase64Alphabet[i] = (char) (97 + j);
+        for (i = 52, j = 0; i <= 61; i++, j++)
+            lookUpBase64Alphabet[i] = (char) (48 + j);
+        lookUpBase64Alphabet[62] = '+';
+        lookUpBase64Alphabet[63] = '/';
+    }
+
+    private static boolean isWhiteSpace(char octect) {
+        return (octect == ' ' || octect == '\r' || octect == '\n' || octect == '\t');
+    }
+
+    private static boolean isPad(char octect) {
+        return (octect == PAD);
+    }
+
+    private static boolean isData(char octect) {
+        return (octect < 128 && base64Alphabet[octect] != -1);
+    }
+
+    public static String encode(byte[] binaryData) {
+        if (binaryData == null)
+            return null;
+        int lengthDataBits = binaryData.length * 8;
+        if (lengthDataBits == 0)
+            return "";
+        int fewerThan24bits = lengthDataBits % 24;
+        int numberTriplets = lengthDataBits / 24;
+        int numberQuartet = (fewerThan24bits != 0) ? (numberTriplets + 1) : numberTriplets;
+        char[] encodedData = null;
+        encodedData = new char[numberQuartet * 4];
+        byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
+        int encodedIndex = 0;
+        int dataIndex = 0;
+        for (int i = 0; i < numberTriplets; i++) {
+            b1 = binaryData[dataIndex++];
+            b2 = binaryData[dataIndex++];
+            b3 = binaryData[dataIndex++];
+            l = (byte) (b2 & 0xF);
+            k = (byte) (b1 & 0x3);
+            byte val1 = ((b1 & Byte.MIN_VALUE) == 0) ? (byte) (b1 >> 2) : (byte) (b1 >> 2 ^ 0xC0);
+            byte val2 = ((b2 & Byte.MIN_VALUE) == 0) ? (byte) (b2 >> 4) : (byte) (b2 >> 4 ^ 0xF0);
+            byte val3 = ((b3 & Byte.MIN_VALUE) == 0) ? (byte) (b3 >> 6) : (byte) (b3 >> 6 ^ 0xFC);
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | k << 4];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2 | val3];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3F];
+        }
+        if (fewerThan24bits == 8) {
+            b1 = binaryData[dataIndex];
+            k = (byte) (b1 & 0x3);
+            byte val1 = ((b1 & Byte.MIN_VALUE) == 0) ? (byte) (b1 >> 2) : (byte) (b1 >> 2 ^ 0xC0);
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
+            encodedData[encodedIndex++] = PAD;
+            encodedData[encodedIndex++] = PAD;
+        } else if (fewerThan24bits == 16) {
+            b1 = binaryData[dataIndex];
+            b2 = binaryData[dataIndex + 1];
+            l = (byte) (b2 & 0xF);
+            k = (byte) (b1 & 0x3);
+            byte val1 = ((b1 & Byte.MIN_VALUE) == 0) ? (byte) (b1 >> 2) : (byte) (b1 >> 2 ^ 0xC0);
+            byte val2 = ((b2 & Byte.MIN_VALUE) == 0) ? (byte) (b2 >> 4) : (byte) (b2 >> 4 ^ 0xF0);
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | k << 4];
+            encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
+            encodedData[encodedIndex++] = PAD;
+        }
+        return new String(encodedData);
+    }
+
+    public static byte[] decode(String encoded) {
+        if (encoded == null)
+            return null;
+        char[] base64Data = encoded.toCharArray();
+        int len = removeWhiteSpace(base64Data);
+        if (len % 4 != 0)
+            return null;
+        int numberQuadruple = len / 4;
+        if (numberQuadruple == 0)
+            return new byte[0];
+        byte[] decodedData = null;
+        byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+        char d1 = Character.MIN_VALUE, d2 = Character.MIN_VALUE, d3 = Character.MIN_VALUE, d4 = Character.MIN_VALUE;
+        int i = 0;
+        int encodedIndex = 0;
+        int dataIndex = 0;
+        decodedData = new byte[numberQuadruple * 3];
+        for (; i < numberQuadruple - 1; i++) {
+            if (!isData(d1 = base64Data[dataIndex++]) ||
+                    !isData(d2 = base64Data[dataIndex++]) ||
+                    !isData(d3 = base64Data[dataIndex++]) ||
+                    !isData(d4 = base64Data[dataIndex++]))
+                return null;
+            b1 = base64Alphabet[d1];
+            b2 = base64Alphabet[d2];
+            b3 = base64Alphabet[d3];
+            b4 = base64Alphabet[d4];
+            decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+            decodedData[encodedIndex++] = (byte) ((b2 & 0xF) << 4 | b3 >> 2 & 0xF);
+            decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+        }
+        if (!isData(d1 = base64Data[dataIndex++]) ||
+                !isData(d2 = base64Data[dataIndex++]))
+            return null;
+        b1 = base64Alphabet[d1];
+        b2 = base64Alphabet[d2];
+        d3 = base64Data[dataIndex++];
+        d4 = base64Data[dataIndex++];
+        if (!isData(d3) || !isData(d4)) {
+            if (isPad(d3) && isPad(d4)) {
+                if ((b2 & 0xF) != 0)
+                    return null;
+                byte[] tmp = new byte[i * 3 + 1];
+                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+                tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+                return tmp;
+            }
+            if (!isPad(d3) && isPad(d4)) {
+                b3 = base64Alphabet[d3];
+                if ((b3 & 0x3) != 0)
+                    return null;
+                byte[] tmp = new byte[i * 3 + 2];
+                System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+                tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+                tmp[encodedIndex] = (byte) ((b2 & 0xF) << 4 | b3 >> 2 & 0xF);
+                return tmp;
+            }
+            return null;
+        }
+        b3 = base64Alphabet[d3];
+        b4 = base64Alphabet[d4];
+        decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+        decodedData[encodedIndex++] = (byte) ((b2 & 0xF) << 4 | b3 >> 2 & 0xF);
+        decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+        return decodedData;
+    }
+
+    private static int removeWhiteSpace(char[] data) {
+        if (data == null)
+            return 0;
+        int newSize = 0;
+        int len = data.length;
+        for (int i = 0; i < len; i++) {
+            if (!isWhiteSpace(data[i]))
+                data[newSize++] = data[i];
+        }
+        return newSize;
+    }
+}
+

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

@@ -0,0 +1,228 @@
+package com.gis.common.deyuan.util;
+
+import org.apache.commons.codec.digest.DigestUtils;
+
+import javax.crypto.Cipher;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.*;
+
+/**
+ * @Description
+ * @Author dengp
+ * @Date 2020/4/26
+ */
+public class SignUtil {
+
+    public static final String SIGN_ALGORITHMS = "SHA1WithRSA";
+
+    /**
+     * 把所有非空参数按参数名ASCII排序，然后以key1=value1&key2=value2拼接为字符串
+     * @param map 参数列表
+     * @return
+     */
+    public static String generateSignSrcData(Map<String, Object> map) {
+        Set<String> keys = map.keySet();
+        String[] keyArray = keys.toArray(new String[keys.size()]);
+        Arrays.sort(keyArray);
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < keyArray.length; i++) {
+            String key = keyArray[i];
+            if ("sign".equals(key) || "".equals(map.get(key))) {
+                continue;
+            } else {
+                sb.append("&").append(key).append("=").append(map.get(key));
+            }
+        }
+        if (sb.length() > 0) {
+            sb.deleteCharAt(0);
+        }
+        return sb.toString();
+    }
+
+    /**
+     * RSA签名
+     *
+     * @param content       加密明文
+     * @param privateKey    商户私钥
+     * @return 签名值
+     */
+    public static String sign(String content, String privateKey) {
+        try {
+            PKCS8EncodedKeySpec priPkcs8 = new PKCS8EncodedKeySpec(Base64.decode(privateKey));
+            KeyFactory keyf = KeyFactory.getInstance("RSA");
+            PrivateKey priKey = keyf.generatePrivate(priPkcs8);
+            java.security.Signature signature = java.security.Signature.getInstance(SIGN_ALGORITHMS);
+            signature.initSign(priKey);
+            signature.update(content.getBytes());
+            byte[] signed = signature.sign();
+            return Base64.encode(signed);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+
+    }
+
+    /**
+     * 解密
+     *
+     * @param content       密文
+     * @param privateKey   商户私钥
+     * @param inputCharset 编码格式
+     * @return 解密后的字符串
+     */
+    public static String decrypt(String content, String privateKey, String inputCharset) throws Exception {
+        PrivateKey prikey = getPrivateKey(privateKey);
+
+        Cipher cipher = Cipher.getInstance("RSA");
+        cipher.init(Cipher.DECRYPT_MODE, prikey);
+
+        InputStream ins = new ByteArrayInputStream(Base64.decode(content));
+        ByteArrayOutputStream writer = new ByteArrayOutputStream();
+        //rsa解密的字节大小最多是128，将需要解密的内容，按128位拆开解密
+        byte[] buf = new byte[128];
+        int bufl;
+        while ((bufl = ins.read(buf)) != -1) {
+            byte[] block = null;
+
+            if (buf.length == bufl) {
+                block = buf;
+            } else {
+                block = new byte[bufl];
+                for (int i = 0; i < bufl; i++) {
+                    block[i] = buf[i];
+                }
+            }
+
+            writer.write(cipher.doFinal(block));
+        }
+
+        return new String(writer.toByteArray(), inputCharset);
+    }
+
+
+    /**
+     * 得到私钥
+     *
+     * @param key 密钥字符串（经过base64编码）
+     * @throws Exception
+     */
+    public static PrivateKey getPrivateKey(String key) throws Exception {
+
+        byte[] keyBytes;
+        keyBytes = Base64.decode(key);
+        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        PrivateKey privateKey = keyFactory.generatePrivate(keySpec);
+        return privateKey;
+    }
+
+    /* -----------------毛桥社区，移动sign签名方法------------------ */
+    private static final String CHARSET = "UTF-8";
+
+    /**
+     * 生成签名
+     *
+     * @param key 签名秘钥
+     * @param parameters 参数
+     * @return
+     */
+    public static String sign(String key, Map<String, String> parameters) throws UnsupportedEncodingException {
+        Map<String, String> filteredParams = filterParameters(parameters);
+        String link = linkParameters(filteredParams);
+//        link = URLEncoder.encode(link, "UTF-8");
+        System.out.println(link);
+        String mysign = MD5.sign(link, key, CHARSET);
+        return mysign;
+    }
+
+    /**
+     * sign不参与生成签名
+     *
+     * @param parameters
+     * @return
+     */
+    private static Map<String, String> filterParameters(Map<String, String> parameters) {
+        Map<String, String> result = new HashMap<String, String>();
+        if (parameters == null || parameters.size() <= 0) {
+            return result;
+        }
+
+        for (String key : parameters.keySet()) {
+            String value = parameters.get(key);
+            if (value == null || "".equals(value) || "sign".equalsIgnoreCase(key)) {
+                continue;
+            }
+            result.put(key, value);
+        }
+        return result;
+    }
+
+    /**
+     * 参数按照字典顺序排序并按规则连接
+     *
+     * @param parameters
+     * @return
+     */
+    private static String linkParameters(Map<String, String> parameters) {
+        List<String> keys = new ArrayList<String>(parameters.keySet());
+        // 将参数按照字典顺序排序
+        Collections.sort(keys);
+        String linkedContent = "";
+        int size = keys.size();
+        for (int i = 0; i < size; i++) {
+            String key = keys.get(i);
+            String value = parameters.get(key);
+            if (i == keys.size() - 1) {
+                linkedContent = linkedContent + key + "=" + value;
+            } else {
+                linkedContent = linkedContent + key + "=" + value + "&";
+            }
+        }
+        return linkedContent;
+    }
+
+    public static class MD5 {
+
+        /**
+         * 签名字符串
+         *
+         * @param text 需要签名的字符串
+         * @param key 签名使用的密钥
+         * @param charset 编码格式
+         * @return
+         */
+        public static String sign(String text, String key, String charset) {
+            text = text + key;
+            // org.apache.commons.codec.digest.DigestUtils
+            try {
+                return DigestUtils.md5Hex(getBytes(text, charset));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+
+        /**
+         * 获取字节数组
+         *
+         * @param content
+         * @param charset
+         * @return
+         * @throws UnsupportedEncodingException
+         */
+        private static byte[] getBytes(String content, String charset) throws UnsupportedEncodingException {
+            if (charset == null || "".equals(charset)) {
+                return content.getBytes();
+            }
+            return content.getBytes(charset);
+        }
+    }
+    /* ----------------------- end ----------------------- */
+}

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

@@ -0,0 +1,197 @@
+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 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.*;
+
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Log4j2
+@Api(tags = "云平台-社区监控")
+@RestController
+@RequestMapping("communityMonitor")
+public class CommunityMonitor {
+    @Autowired
+    NewResultUtils resultUtils;
+
+    @Autowired
+    ConfigConstant configConstant;
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "小区编码 如：510115001076510115001076012", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间 格式： yyyy-MM-dd HH:mm:ss  如：2021-12-15 16:20:20", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间   格式： yyyy-MM-dd HH:mm:ss", dataType = "String"),
+    })
+    @ApiOperation("车辆进出监控")
+    @GetMapping("vehicleEntrance/{code}/{startTime}/{endTime}")
+    public Result vehicleEntrance(@PathVariable String code,@PathVariable String startTime,@PathVariable String endTime){
+        SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date(System.currentTimeMillis());
+        String day=formatter.format(date);
+        System.out.println(formatter.format(date));
+        String apiUrl = "/open/api/v1/device/vehicleEntrance";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("residentialCode", code);
+        param.put("startTime", startTime);
+        param.put("endTime", endTime);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+//    @ApiOperation("重点人员进出预警")
+//    @GetMapping("peopleEntrance/{code}/{page}/{size}")
+//    public Result peopleEntrance(@PathVariable String code,@PathVariable int page,@PathVariable int size){
+//        String apiUrl = "/open/api/v1/device/peopleEntrance";
+//        HashMap<String, Object> param = new HashMap<>();
+//        param.put("townCode", code);
+//        param.put("page", page);
+//        param.put("size", size);
+//        return resultUtils.doGetResult(apiUrl, param);
+//    }
+
+
+    @ApiOperation("根据社区code得到小区code")
+    @GetMapping("residential/{code}")
+    public Result residential(@PathVariable String code){
+        String apiUrl = "/open/api/v1/community/fuzzy/search/residential";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("areaCode", code);
+        param.put("pageIndex", 1);
+        param.put("pageSize", 100);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "小区编码 如：510115001076510115001076012", dataType = "String"),
+            @ApiImplicitParam(name = "startTime", value = "开始时间 格式： yyyy-MM-dd HH:mm:ss 如：2021-12-15 16:20:20", dataType = "String"),
+            @ApiImplicitParam(name = "endTime", value = "结束时间   格式： yyyy-MM-dd HH:mm:ss", dataType = "String"),
+    })
+    @ApiOperation("出行时间异常人群")
+    @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);
+    }
+
+
+
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "code", value = "小区编码", dataType = "String"),
+//    })
+//    @ApiOperation("出行时间异常人群")
+//    @GetMapping("peopleEntrance/{code}")
+//    public String peopleEntrance(@PathVariable String code){
+//            SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd");
+//            Date date = new Date(System.currentTimeMillis());
+//            String day=formatter.format(date);
+//            System.out.println(formatter.format(date));
+//            String time1=day+" 00:00:00";
+//            String time2=day+" 01:00:00";
+//            String time3=day+" 02:00:00";
+//            String time4=day+" 03:00:00";
+//            String time5=day+" 04:00:00";
+//            String time6=day+" 05:00:00";
+//            String time7=day+" 06:00:00";
+//
+//            String apiUrl = "/open/api/v1/device/peopleEntrance";
+//            int num1=getTimeCount(apiUrl,code,time1,time2);
+//            int num2=getTimeCount(apiUrl,code,time2,time3);
+//            int num3=getTimeCount(apiUrl,code,time3,time4);
+//            int num4=getTimeCount(apiUrl,code,time4,time5);
+//            int num5=getTimeCount(apiUrl,code,time5,time6);
+//            int num6=getTimeCount(apiUrl,code,time6,time7);
+//
+//            return  num1+" "+num2+" "+num3+" "+num4+" "+num5+" "+num6;
+//    }
+
+
+    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 社区编码
+//     */
+//    private  List<String> getResidentialCode(String code){
+//        String residentialResultUrl="/open/api/v1/community/fuzzy/search/residential";
+//        HashMap<String, Object> param1 = new HashMap<>();
+//        param1.put("areaCode", code);
+//        param1.put("pageIndex", 1);
+//        param1.put("pageSize", 100);
+//        Result residentialResult= resultUtils.doGetResult(residentialResultUrl, param1);
+//        JSONObject obj=(JSONObject) residentialResult.getData();
+//        JSONArray  arr=obj.getJSONArray("res");
+//        List<String> codes=new ArrayList<String>();
+//        Iterator<Object> it = arr.iterator();
+//        while (it.hasNext()) {
+//            JSONObject ob = (JSONObject) it.next();
+//            codes.add(ob.getString("residentialCode"));
+//            //打印出遍历出的jsonObject
+//            System.out.println(ob.getString("residentialCode"));
+//        }
+//
+//        return codes;
+//    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "组织机构编码 如：510114001017240", dataType = "String"),
+    })
+    @ApiOperation("视频列表数据")
+    @GetMapping("videoList/{code}")
+    public Result videoList(@PathVariable String code) throws Exception {
+        String apiUrl =configConstant.apiVideo+"/bi/findVideoInfo";
+        System.out.println("apiUrl: "+apiUrl);
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("code", code);
+        param.put("pageSize", 200);
+        return DoorUtils.doPostDecrypt(apiUrl,param);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "视频id ", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "小区组织机构编码 如：510114001017240", dataType = "String"),
+            @ApiImplicitParam(name = "protocol", value = "取流协议 “rtmp”:RTMP协议；“hls”:HLS协议", dataType = "String"),
+    })
+    @ApiOperation("获取视频流-普通")
+    @GetMapping("getVideo/{code}/{id}/{protocol}")
+    public Result getVideo(@PathVariable String code,@PathVariable String id,@PathVariable String protocol) throws Exception {
+        String apiUrl =configConstant.apiVideo+"/bi/getVideoUrlById";
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("code", code);
+        param.put("id", id);
+        param.put("protocol", protocol);
+        return DoorUtils.doPostDecrypt(apiUrl,param);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "视频id ", dataType = "String"),
+            @ApiImplicitParam(name = "code", value = "小区组织机构编码 如：510114001017240", dataType = "String"),
+            @ApiImplicitParam(name = "protocol", value = "取流协议 “rtmp”:RTMP协议；“hls”:HLS协议", dataType = "String"),
+    })
+    @ApiOperation("获取视频流-物联平台")
+    @GetMapping("getVideoIOT/{code}/{id}/{protocol}")
+    public Result getVideoIOT(@PathVariable String code,@PathVariable String id,@PathVariable String protocol) throws Exception {
+        String apiUrl =configConstant.apiIOTVideo+"/api/getVideoUrlById";
+        TreeMap<String, Object> param =  new TreeMap<>();
+        param.put("code", code);
+        param.put("id", id);
+        param.put("protocol", protocol);
+        return IOTUtils.doPostDecrypt(apiUrl,param);
+    }
+}

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

@@ -0,0 +1,69 @@
+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;
+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 java.util.HashMap;
+
+@Log4j2
+@Api(tags = "云平台-社区概况")
+@RestController
+@RequestMapping("communityOverview")
+public class CommunityOverview {
+    @Autowired
+    NewResultUtils resultUtils;
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String")
+    })
+    @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);
+    }
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String")
+    })
+    @ApiOperation("社区房屋总数、房屋属性分类")
+    @GetMapping("allHouseCount/{code}")
+    public Result allHouseCount(@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);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String"),
+            @ApiImplicitParam(name = "page", value = "页码值", dataType = "int"),
+            @ApiImplicitParam(name = "size", value = "页面记录条数", dataType = "int")
+    })
+    @ApiOperation("走访记录")
+    @GetMapping("querySign/{code}/{page}/{size}")
+    public Result querySign(@PathVariable String code,@PathVariable int page,@PathVariable int size){
+        System.out.println(page==1);
+        String apiUrl = "/open/api/v1/zfSignin/querySign";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("townCode", code);
+        param.put("page", page);
+        param.put("size", size);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+
+}

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

@@ -0,0 +1,42 @@
+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;
+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 java.util.HashMap;
+
+@Log4j2
+@Api(tags = "云平台-应急指挥")
+@RestController
+@RequestMapping("emergencyCommand")
+public class EmergencyCommand {
+    @Autowired
+    NewResultUtils resultUtils;
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String"),
+            @ApiImplicitParam(name = "topic", value = "查询主题 取值常量：DB 表示待办、YB 表示已办", dataType = "String")
+    })
+    @ApiOperation("一键报警事件")
+    @GetMapping("getInfoList/{code}/{topic}")
+    public Result eventScore(@PathVariable String code,  @PathVariable String topic){
+        String apiUrl = "/open/api/v1/sspReportInfo/getInfoList";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("xzCode", code);
+        param.put("xzLevel", 4);
+        param.put("topic", topic);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+}

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

@@ -0,0 +1,51 @@
+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;
+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.*;
+
+import java.util.HashMap;
+
+@Log4j2
+@Api(tags = "云平台-智慧人房")
+@RestController
+@RequestMapping("smartHumanRoom")
+public class SmartHumanRoom {
+    @Autowired
+    NewResultUtils resultUtils;
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "小区编码 如：510115001076510115001076012", dataType = "String"),
+    })
+    @ApiOperation("小区信息")
+    @GetMapping("villageInfo/{code}")
+    public Result villageInfo(@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);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码 如：510115001076", dataType = "String"),
+            @ApiImplicitParam(name = "unitName", value = "单元名 如：一单元", dataType = "String"),
+            @ApiImplicitParam(name = "doorCode", value = "门牌号 如：302", 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";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("areaCode", code);
+
+
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+}

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

@@ -0,0 +1,40 @@
+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 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 java.util.TreeMap;
+
+@Log4j2
+@Api(tags = "云平台-智慧物联")
+@RestController
+@RequestMapping("smartIOT")
+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"),
+    })
+    @ApiOperation("设备列表信息查询")
+    @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<>();
+        param.put("code", code);
+        param.put("type", type);
+        return DoorUtils.doPostDecrypt(apiUrl,param);
+    }
+
+}

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

@@ -0,0 +1,100 @@
+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;
+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 java.util.HashMap;
+
+@Log4j2
+@Api(tags = "云平台-智慧生活")
+@RestController
+@RequestMapping("smartLife")
+public class SmartLife {
+
+    @Autowired
+    NewResultUtils resultUtils;
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+    })
+    @ApiOperation("公共空间、公共空间详情")
+    @GetMapping("spaceData/{code}")
+    public Result spaceData(@PathVariable String code){
+        String apiUrl = "/open/api/v1/community/space-data";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("code", code);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+    })
+    @ApiOperation("积分商城 (积分发放统计)")
+    @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);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+    })
+    @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("areaCode", code);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "城市/社区编码", dataType = "String"),
+    })
+    @ApiOperation("邻里交流")
+    @GetMapping("statisticsInterflow/{code}")
+    public Result statisticsInterflow(@PathVariable String code){
+        String apiUrl = "/open/api/v1/community/statistics/interflow";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("cityCode", code);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+    })
+    @ApiOperation("资讯列表")
+    @GetMapping("communityInfodata/{code}")
+    public Result communityInfodata(@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);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码", dataType = "String"),
+            @ApiImplicitParam(name = "children", value = "是否查询街道及其以下社区", dataType = "Boolean")
+    })
+    @ApiOperation("社区活动")
+    @GetMapping("communityActivitydata/{code}/{children}")
+    public Result communityActivitydata(@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.doGetResult(apiUrl, param);
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.gis.web.controller.dafengSmartCommunityController;
+
+import io.swagger.annotations.Api;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Log4j2
+@Api(tags = "云平台-街道监控")
+@RestController
+@RequestMapping("streetMonitor")
+public class StreetMonitor {
+}

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

@@ -0,0 +1,85 @@
+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;
+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 java.util.HashMap;
+
+//
+@Log4j2
+@Api(tags = "云平台-街道概况")
+@RestController
+@RequestMapping("streetOverview")
+public class StreetOverview {
+
+    @Autowired
+    NewResultUtils resultUtils;
+
+
+    @ApiOperation("大丰街道基本信息")
+    @GetMapping("baseData")
+    public Result baseData(){
+        String apiUrl = "/open/api/v1/community/base-data";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("code", "510114001");
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "社区编码 ", dataType = "String"),
+    })
+    @ApiOperation("居民使用服务次数")
+    @GetMapping("communityServiceData/{code}")
+    public Result communityServiceData(@PathVariable String code){
+        String apiUrl = "/open/api/v1/community/service-data";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("code", code);
+        return resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiOperation("就业专栏-还需修改")
+    @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 resultUtils.doGetResult(apiUrl, param);
+    }
+
+    @ApiOperation("人员标签-还需修改")
+    @GetMapping("labelUsed/{code}")
+    public Result labelUsed(@PathVariable String code){
+        String apiUrl = "/open/api/v1/community/label-used";
+        HashMap<String, Object> param = new HashMap<>();
+        param.put("cityCode", code);
+        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/BuildingDto.java

@@ -0,0 +1,18 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BuildingDto {
+    @ApiModelProperty(value = "社区编号")
+    private String code;
+    @ApiModelProperty(value = "楼栋号")
+    private String buildingNo;
+    @ApiModelProperty(value = "单元号")
+    private String buildingUniNo;
+    @ApiModelProperty(value = "房号")
+    private String houseNo;
+    @ApiModelProperty(value = "楼层")
+    private String floor;
+}

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

@@ -0,0 +1,21 @@
+package com.gis.web.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+//车辆进出日志查询
+@Data
+public class VehicleDto {
+    @ApiModelProperty(value = "小区编号（必传）", name = "residentialCode")
+    private String residentialCode;
+    @ApiModelProperty(value = "当前页码（非必传）", name = "pageIndex")
+    private String pageIndex;
+    @ApiModelProperty(value = "每页条数（非必传）", name = "pageSize")
+    private String pageSize;
+    @ApiModelProperty(value = "条件（非必传）", name = "condition")
+    private String condition;
+    @ApiModelProperty(value = "开始时间（非必传）", name = "startTime")
+    private String startTime;
+    @ApiModelProperty(value = "结束时间（非必传）", name = "endTime")
+    private String endTime;
+
+}