Home Verkennen Help
Registreren Inloggen
CQ_JD
/
dt2
2
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

Merge branch 'master' of http://116.63.33.55/git/dt2

lyq 3 jaren geleden
bovenliggende
0afcfaca85 3349734d96
commit
641fe2130b
38 gewijzigde bestanden met toevoegingen van 575 en 264 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      spring-cloud/configer/src/main/resources/config/dev/threeapi-dev.yml
  2. 1 1
      spring-cloud/configer/src/main/resources/config/prod/threeapi-prod.yml
  3. 10 10
      spring-cloud/server-page/src/main/resources/static/ipad/js/constant.js
  4. 2 2
      spring-cloud/server-page/src/main/resources/static/ipad/login_sw.html
  5. 1 0
      spring-cloud/server-page/src/main/resources/static/lbzd/css/indexb.css
  6. 7 7
      spring-cloud/server-page/src/main/resources/static/lbzd/css/ztzs.css
  7. BIN
      spring-cloud/server-page/src/main/resources/static/lbzd/img/bg.png
  8. 26 0
      spring-cloud/server-page/src/main/resources/static/lbzd/wjll.html
  9. 3 1
      spring-cloud/server-page/src/main/resources/static/lbzd/wjts.html
  10. 3 51
      spring-cloud/server-page/src/main/resources/static/lbzd/ztzs.html
  11. 5 14
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test10/test10.css
  12. 3 2
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.css
  13. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.js
  14. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test32/test32.css
  15. 2 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test33/test33.js
  16. 18 3
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test35/test35.js
  17. 4 0
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test36/test36.js
  18. 19 25
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test43/test43.js
  19. 4 3
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test44/test44.js
  20. 3 11
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.css
  21. 2 2
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.html
  22. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.js
  23. 2 2
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test49/test49.html
  24. 7 7
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test50/test50.js
  25. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test51/test51.html
  26. 23 4
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.css
  27. 2 2
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.html
  28. 1 1
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.js
  29. 25 0
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/css/coom.css
  30. BIN
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/images/bgImg/图层 789.png
  31. BIN
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/images/图层 789 copy.png
  32. BIN
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/images/图层 789.png
  33. 23 0
      spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/css/main.css
  34. 6 2
      spring-cloud/server-threeapi/src/main/java/com/jd/controller/ApiUrlController.java
  35. 2 0
      spring-cloud/server-threeapi/src/main/java/com/jd/service/ApiUrlService.java
  36. 36 0
      spring-cloud/server-threeapi/src/main/java/com/jd/service/impl/ApiUrlServiceImpl.java
  37. 193 0
      spring-cloud/server-threeapi/src/main/java/com/jd/util/GisUtil.java
  38. 137 108
      xiaoniaoServer/src/main/java/com/jd/xiaoniao/api/XiaoniaoApi.java

+ 1 - 1
spring-cloud/configer/src/main/resources/config/dev/threeapi-dev.yml
Bestand weergeven 

@@ -17,4 +17,4 @@ mybatis:
 
         
 contrl:
 
   # 设置连接超时，单位：毫秒
 
-    connection-timeout: 5000
 
+  connection-timeout: 5000

+ 1 - 1
spring-cloud/configer/src/main/resources/config/prod/threeapi-prod.yml
Bestand weergeven 

@@ -17,4 +17,4 @@ mybatis:
 
         
 contrl:
 
   # 设置连接超时，单位：毫秒
 
-    connection-timeout: 5000
 
+  connection-timeout: 5000

+ 10 - 10
spring-cloud/server-page/src/main/resources/static/ipad/js/constant.js
Bestand weergeven 

@@ -1,10 +1,10 @@
 
-var FLAT_PATH = 'http://23.37.100.87:8084/';
 
+var FLAT_PATH = 'http://23.37.100.80:8084/';
 
 var FLAT_PATH_BASIC = FLAT_PATH + 'basic/';
 
 var FLAT_PATH_THREE = FLAT_PATH + 'threeapi/';
 
-var FLAT_PATH_IMG = 'http://23.37.100.87:8085';
 
-var XN_PATH = 'http://23.37.100.87:8092/';
 
-var WS_PATH = 'ws://23.37.100.87:8087';
 
-var YK_PATH = 'http://23.37.100.87:298${port}/vnc.html';
 
+var FLAT_PATH_IMG = 'http://23.37.100.80:8085';
 
+var XN_PATH = 'http://23.37.100.80:8092/';
 
+var WS_PATH = 'ws://23.37.100.80:8087';
 
+var YK_PATH = 'http://23.37.100.80:${port}/vnc.html';
 
 
 var DEVICE_GROUP = {
 
 	dpq: {
 
@@ -31,11 +31,11 @@ var DEVICE_GROUP = {
 
 
 var DEVICE_CODE_GROUP = ['mtq', 'hpq', 'dpq', 'xcqn', 'xcqw', 'dpzhd'];
 
 
-var DPZHD_VNC_HOST = "23.37.100.87";
 
+var DPZHD_VNC_HOST = "23.37.100.80";
 
 var DPZHD_PATH = 'http://' + DPZHD_VNC_HOST + ':8123/';
 
-var DPZHD_VNC_PATH = 'http://' + DPZHD_VNC_HOST + ':29850/vnc.html';
 
-var KJY_PATH = "http://23.37.100.87/dldp2/index.html";
 
+var DPZHD_VNC_PATH = 'http://' + DPZHD_VNC_HOST + ':29050/vnc.html';
 
+var KJY_PATH = "http://23.37.100.80/dldp2/index.html";
 
 
 
-var OLD_YK_URL_HOST = "23.37.100.80";
 
-var NEW_YK_URL_HOST = "23.37.100.87";
 
+var OLD_YK_URL_HOST = "23.37.100.87";
 
+var NEW_YK_URL_HOST = "23.37.100.80";

+ 2 - 2
spring-cloud/server-page/src/main/resources/static/ipad/login_sw.html
Bestand weergeven 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
 <head>
 
 	<meta charset="UTF-8">
 
-	<title>重庆市城市管理局-指挥席讲解台</title>
 
+	<title>重庆市城市管理局-指挥席导览台</title>
 
 	<link rel="stylesheet" type="text/css" href="font/iconfont.css"/>
 
 	<!-- <link rel="stylesheet" type="text/css" href="./css/main.css"/> -->
 
 	<style>
 
@@ -165,7 +165,7 @@
 
 	<!-- 背景div -->
 
 	<div class="login-form">
 
 		<div class="login-title">
 
-			<p>指挥席讲解台</p>
 
+			<p>指挥席导览台</p>
 
 		</div>
 
 		<div class="login-con">
 
 			<div class="login-formCon">

+ 1 - 0
spring-cloud/server-page/src/main/resources/static/lbzd/css/indexb.css
Bestand weergeven 

@@ -570,4 +570,5 @@ li {
 
     white-space: nowrap;
 
     font-size: 18px;
 
     text-align: center;
 
+    margin-top: 2%;
 
 }

+ 7 - 7
spring-cloud/server-page/src/main/resources/static/lbzd/css/ztzs.css
Bestand weergeven 

@@ -36,19 +36,19 @@ li {
 
 .ztzs-list .ztzs-item {
 
     float: left;
 
     width: 32%;
 
-    height: 30%;
 
+    height: 35%;
 
     margin-right: 2%;
 
     margin-bottom: 1.5%;
 
 }
 
 
 .ztzs-list .ztzs-item>img {
 
     width: 100%;
 
-    height: 87%;
 
+    height: 89%;
 
 }
 
 
 .ztzs-list .ztzs-item>p {
 
     width: 100%;
 
-    height: 13%;
 
+    height: 11%;
 
     text-align: center;
 
     text-overflow: ellipsis;
 
     overflow: hidden;
 
@@ -104,12 +104,12 @@ li {
 
 
 .back-ztzs {
 
     position: fixed;
 
-    top: 1%;
 
-    right: 1%;
 
-    width: 5%;
 
+    top: 4%;
 
+    right: 2%;
 
+    width: 4%;
 
     padding: 0.5%;
 
     border-radius: 10px;
 
-    background-color: rgb(218, 33, 33);
 
+    background-color: #1F7ABF;
 
 }
 
 
 .back-ztzs>img {

BIN
spring-cloud/server-page/src/main/resources/static/lbzd/img/bg.png
Bestand weergeven


+ 26 - 0
spring-cloud/server-page/src/main/resources/static/lbzd/wjll.html
Bestand weergeven 

@@ -176,6 +176,21 @@
 
             color: #FFFFFF;
 
             background-color: #1F7ABF;
 
         }
 
+        
+        .back-ztzs {
 
+            position: fixed;
 
+            top: 4%;
 
+            right: 2%;
 
+            width: 4%;
 
+            padding: 0.5%;
 
+            border-radius: 10px;
 
+            background-color: #1F7ABF;
 
+            z-index: 100;
 
+        }
 
+        
+        .back-ztzs>img {
 
+            width: 100%;
 
+        }
 
     </style>
 
 </head>
 
 
@@ -221,6 +236,9 @@
 
             </ul>
 
         </div>
 
     </div>
 
+    <div class="back-ztzs" style="display: none;">
 
+        <img src="img/back-ztzs.png" />
 
+    </div>
 
     <!-- 显示 -->
 
     <div class="show">
 
         <img src="img/a1.png" style="display: none;" />
 
@@ -238,6 +256,7 @@
 
         })
 
 
         $(".file_list").on("click", ".file_item", function() {
 
+            $(".back-ztzs").css("display", "block")
 
             $(".box").css("display", "none")
 
             $(".show").css("display", "flex")
 
             $(".wj_list").css("display", "block")
 
@@ -254,9 +273,16 @@
 
             }
 
         })
 
 
+        $(".back-ztzs").on("click", function() {
 
+            $(".show").css("display", "none")
 
+            $(".box").css("display", "block")
 
+            $(this).css("display", "none")
 
+        })
 
+
 
         $(".crumbs").on("click", ".cur", function() {
 
             $(".show").css("display", "none")
 
             $(".box").css("display", "block")
 
+            $(".back-ztzs").css("display", "none")
 
         })
 
 
         $(".file_ass").on("click", ".ass_item", function() {

+ 3 - 1
spring-cloud/server-page/src/main/resources/static/lbzd/wjts.html
Bestand weergeven 

@@ -81,6 +81,7 @@
 
             position: absolute;
 
             display: flex;
 
             align-items: center;
 
+            top: 40%;
 
         }
 
         
         .st-put .put_wj {
 
@@ -110,6 +111,7 @@
 
             background-color: #fff;
 
             text-indent: 3em;
 
             border-color: #1168B3;
 
+            border-right: none;
 
         }
 
         
         .st-put>i {
 
@@ -161,7 +163,7 @@
 
 
 <body>
 
     <div class="file_input">
 
-        <form action="#">
 
+        <form action="#" hidden>
 
             <input type="file" id="put_file" />
 
         </form>
 
         <div class="st-put">

+ 3 - 51
spring-cloud/server-page/src/main/resources/static/lbzd/ztzs.html
Bestand weergeven 

@@ -36,54 +36,6 @@
 
                 <img src="img/szcg.png" />
 
                 <p>数字城管</p>
 
             </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/spjk.png" />
 
-                <p>视频监控</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/gyyzt.png" />
 
-                <p>公园一张图</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/jsdwzq.png" />
 
-                <p>局属单位网站集群</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/yycz.png" />
 
-                <p>一云承载</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/yshj.png" />
 
-                <p>一数汇聚</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/ywtg.png" />
 
-                <p>一网通管</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/yptl.png" />
 
-                <p>一屏统览</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/yjld.png" />
 
-                <p>一键联动</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/szcg.png" />
 
-                <p>数字城管</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/spjk.png" />
 
-                <p>视频监控</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/gyyzt.png" />
 
-                <p>公园一张图</p>
 
-            </li>
 
-            <li class="ztzs-item">
 
-                <img src="img/jsdwzq.png" />
 
-                <p>局属单位网站集群</p>
 
-            </li>
 
         </ul>
 
         <div class="but-box" style="display: none;">
 
             <button type="button">上一页</button>
 
@@ -91,7 +43,7 @@
 
         </div>
 
         <!-- 适配主题展示 -->
 
         <div class="aba-theme" style="display: none;">
 
-            <iframe src="http://localhost:3000/totalplatform" frameborder="0"></iframe>
 
+            <iframe src="http://localhost:11572/totalplatform" frameborder="0"></iframe>
 
         </div>
 
         <div class="back-ztzs" style="display: none;">
 
             <img src="img/back-ztzs.png" />
 
@@ -102,14 +54,14 @@
 
         window.onload = function() {
 
             $(".ztzs-list").on("click", ".ztzs-item", function() {
 
                 $(".ztzs-list").css("display", "none");
 
-                $(".but-box").css("display", "none");
 
+                // $(".but-box").css("display", "none");
 
                 $(".aba-theme").css("display", "block");
 
                 $(".back-ztzs").css("display", "block");
 
             })
 
 
             $(".back-ztzs").on("click", function() {
 
                 $(".ztzs-list").css("display", "block");
 
-                $(".but-box").css("display", "flex");
 
+                // $(".but-box").css("display", "flex");
 
                 $(".aba-theme").css("display", "none")
 
                 $(".back-ztzs").css("display", "none")
 
             })

+ 5 - 14
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test10/test10.css
Bestand weergeven 

@@ -1,16 +1,7 @@
 
-#demo a {

-  margin: 0.15rem;

-  width: 28%;

-  float: right;

-  margin-top: 5%;

+.box10 .inner a {

+  display: inline-block;

+  margin: 0.12rem;

 }

-#demo {

-  overflow: hidden;

-  width: 100%;

-  height: 100%;

-  /* margin-top: 5%; */

-}

-#demo img {

-  display: block;

-  /* width: 1.75rem; */

+.box10 .inner a img {

+  width: 1.7rem;

 }

+ 3 - 2
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.css
Bestand weergeven 

@@ -22,6 +22,7 @@
 
 }

 .overall ul li .info {

   margin-right: 0.24rem;

+  margin-top: 0.06rem;

 }

 .overall ul li p {

   font-size: 0.22rem;

@@ -30,7 +31,7 @@
 
   color: #677ea1;

 }

 .overall ul li .num {

-  font-size: 0.25rem !important;

+  font-size: 0.28rem !important;

   font-family: "LESLIE";

   font-weight: 400;

 }

@@ -48,5 +49,5 @@
 
 .details-num {

   font-size: 120px !important;

   font-family: "LESLIE";

-  color: rgb(58, 175, 184);

+  color: #5c96ff;

 }

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test3/test3.js
Bestand weergeven 

@@ -39,7 +39,7 @@ const test3 = (function() {
 
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(0).find('sapn').html(dataObj.siteGardenCount); // 园林 -
 
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(1).find('sapn').html(dataObj.siteFacilitiesCount); // 设施
 
                     $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(2).find('sapn').html(dataObj.siteSanitationCount); // 环卫
 
-
 
+                    // $('.test3 .box3 li').eq(4).find('.details p').eq(1).find('span').eq(3).find('sapn').html(dataObj.siteLightCount); // 现场照明
 
                     
                 },
 
                 error: function() {

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test32/test32.css
Bestand weergeven 

@@ -54,7 +54,7 @@
 
 .box32 .right .info span {
 
   font-size: 0.12rem !important;
 
   margin: 0.04rem 0.08rem;
 
-  color: #707438;
 
+  color: #ee8a08;
 
   /* text-shadow: 0 0 50px #fff; */
 
 }
 
 .box32 .right .info span{

+ 2 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test33/test33.js
Bestand weergeven 

@@ -138,10 +138,11 @@ const test33 = (function() {
 
                 hoverAnimation: false,
 
                 label: {
 
                     normal: {
 
-                        show: true,
 
+                        show: false,
 
                         position: "center",
 
                         formatter: "{b}\n{c}",
 
                         textStyle: {
 
+
 
                              fontSize: 120,
 
                             fontWeight: "bold",
 
                             color: "#fff",

+ 18 - 3
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test35/test35.js
Bestand weergeven 

@@ -18,12 +18,13 @@ const test35 = (function() {
 
 
         eventClick('.test35');
 
 
+        // 漏洞趋势
 
         $.ajax({
 
             url: basicUrl +
 
                 "/SystemRisk/analyzeSystemRiskByMonth",
 
             data: {},
 
             success: function(res) {
 
-                console.log(res);
 
+                console.log('漏洞趋势',res);
 
                 let bac = res.result;
 
                 const dists = document.querySelectorAll(".test35 .floor-dist");
 
                 const testDoms = document.querySelectorAll(".test35 .box");
 
@@ -33,7 +34,7 @@ const test35 = (function() {
 
                 }
 
             },
 
             error: function(err) {
 
-                console.log("------------------------超时");
 
+                console.log("--------漏洞趋势----------------超时");
 
             },
 
         });
 
 
@@ -53,13 +54,26 @@ const test35 = (function() {
 
         let option = {
 
             tooltip: {
 
                 trigger: "axis",
 
+                padding: [0, 80, 0, 10],
 
+                lineHeight: 125,
 
+                // padding:100,
 
+                // formatter:'{b}<br>{c}{a}'
 
+                formatter:function (arg) {
 
+                  let str = ''
 
+                  for (let i = 0; i < arg.length; i++) {
 
+                    str+= `${arg[i].seriesName} ${arg[i].axisValue} ${arg[i].value}<br><br>`
 
+                  }
 
+                  return str
 
+                  
+                  
+                }
 
             },
 
             legend: {
 
                 top: "0%",
 
                 data: ["高风险", "中风险", "低风险", "直接访问", "搜索引擎"],
 
                 textStyle: {
 
                     color: "rgba(255,255,255,.5)",
 
-                    fontSize: "80",
 
+                    fontSize: "130",
 
                     //   80
 
                 },
 
             },
 
@@ -165,6 +179,7 @@ const test35 = (function() {
 
                         color: "#0184d5",
 
                         borderColor: "rgba(221, 220, 107, .1)",
 
                         borderWidth: 12,
 
+
 
                     },
 
                     data: countHighRiskArr,
 
                 },

+ 4 - 0
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test36/test36.js
Bestand weergeven 

@@ -201,11 +201,15 @@ const test36 = (function() {
 
                     axisLine: {
 
                         lineStyle: {
 
                             color: "rgb(2,185,208)",
 
+                            fontSize: 116,
 
+                            fontWeight: "bold",
 
                         },
 
                     },
 
                     axisLabel: {
 
                         textStyle: {
 
                             color: "rgb(2,185,208)",
 
+                            fontSize: 116,
 
+                            fontWeight: "bold",
 
                         },
 
                         formatter: (value, index) => {
 
                             if (value === 0 || value === 50 || value === 100) {

+ 19 - 25
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test43/test43.js
Bestand weergeven 

@@ -28,16 +28,16 @@ const test43 = (function() {
 
             getListsData(id);
 
             getDatileData(id);
 
             setTimeout(() => {
 
-                setChartsDom(document.querySelector('.charts1'))
 
-            }, 500);
 
+                setChartsDom(document.querySelector('.charts1'),0)
 
+            }, 500);  
 
             setTimeout(() => {
 
-                setChartsDom(document.querySelector('.charts2'))
 
+                setChartsDom(document.querySelector('.charts2'),0)
 
             }, 1000);
 
 
 
             setTimeout(() => {
 
-                setChartsDom(document.querySelector('.charts3'))
 
+                setChartsDom(document.querySelector('.charts3'),0)
 
             }, 1500);
 
         })
 
 
@@ -181,6 +181,19 @@ const test43 = (function() {
 
                 const data2 = arr[0].data[1];
 
                 const data3 = arr[0].data[2];
 
                 console.log('获取单个资源的详细信息', data1, data2, data3, arr);
 
+
 
+              //   setTimeout(() => {
 
+              //     setChartsDom(document.querySelector('.charts1'),data1)
 
+              // }, 500);
 
+  
+              // setTimeout(() => {
 
+              //     setChartsDom(document.querySelector('.charts2'),data2)
 
+              // }, 1000);
 
+  
+  
+              // setTimeout(() => {
 
+              //     setChartsDom(document.querySelector('.charts3'),data3)
 
+              // }, 1500);
 
             },
 
             error: function(err) {
 
                 console.log('获取单个资源的详细信息超时');
 
@@ -248,26 +261,6 @@ const test43 = (function() {
 
                                 )
 
                             ]
 
                         ],
 
-                        // color: [
 
-                        //     [0.3, '#00ed03'],
 
-                        //     [0.7, '#ffb800'],
 
-                        //     [1, '#af00a9']
 
-                        // ]
 
-                        /*color: [
 
-                            [1, new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
 
-                                    offset: 0.3,
 
-                                    color: "#00ed03"
 
-                                },
 
-                                {
 
-                                    offset: 0.7,
 
-                                    color: "#ffb800"
 
-                                },
 
-                                {
 
-                                    offset: 1,
 
-                                    color: "#af00a9"
 
-                                }
 
-                            ])]
 
-                        ]*/
 
                     }
 
                 },
 
                 // radius: '50%',
 
@@ -300,7 +293,8 @@ const test43 = (function() {
 
                 detail: {
 
                     valueAnimation: true,
 
                     formatter: '{value} %',
 
-                    color: 'white'
 
+                    color: 'white',
 
+                    fontSize:100
 
                 },
 
                 data: [{
 
                     value: data

+ 4 - 3
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test44/test44.js
Bestand weergeven 

@@ -65,7 +65,7 @@ const test44 = (function () {
 
           axisLabel: {
 
             show: true,
 
             color: "#fff",
 
-            fontSize: 100,
 
+            fontSize: 150,
 
             distance: -50,
 
             formatter: function (v) {
 
               return v;
 
@@ -139,7 +139,7 @@ const test44 = (function () {
 
             textStyle: {
 
               fontWeight: "bold",
 
               color: "#0ab7ff",
 
-              fontSize: 100,
 
+              fontSize: 120,
 
             },
 
           },
 
           //仪表盘详情，用于显示数据。
 
@@ -148,7 +148,8 @@ const test44 = (function () {
 
             offsetCenter: [0, "-40%"],
 
             color: "#ffffff",
 
             textStyle: {
 
-              fontSize: 120,
 
+              fontSize: 180,
 
+              fontWeight: "bold",
 
               color: "#4aca96",
 
             },
 
           },

+ 3 - 11
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.css
Bestand weergeven 

@@ -2,11 +2,9 @@
 
   overflow: hidden;

 }

 .box45 .content {

-  margin: 0;

-  width: 90%;

-  height: 90%;

-  margin-top: 2%;

-  margin-left: 6%;

+  margin: 0 auto;

+  width: 98%;

+  height: 93%;

 }

 .box45 .left,

 .box45 .right {

@@ -75,9 +73,3 @@
 
 .box45 .success {

   background-color: #4162ce;

 }

-.box45 .commonly {

-  background-color: #66650c;

-}

-.box45 .commonly {

-  background-color: #66650c;

-}

+ 2 - 2
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.html
Bestand weergeven 

@@ -11,7 +11,7 @@
 
     <div class="test-box">
 
         <div class="content">
 
             <!-- 漏洞数据 -->
 
-            <table id="stuTable" class="table">
 
+            <table id="stuTable" class="table newTable">
 
                 <thead>
 
                     <tr>
 
                         <th>资源名称</th>
 
@@ -23,7 +23,7 @@
 
                 <tbody>
 
                     <tr>
 
                         <td>OA和运维监控平台</td>
 
-                        <td class="serious level">严重</td>
 
+                        <td class="level"><span class="serious">严重</span></td>
 
                         <td>2022年1月13日 14:36:29</td>
 
                         <td>资源连接失败</td>
 
                     </tr>

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test45/test45.js
Bestand weergeven 

@@ -73,7 +73,7 @@ const test45 = (function() {
 
             }
 
             str += `<tr>
 
             <td>${data.RES_NAME}</td>
 
-            <td class='${cn} level'>${leve}</td>
 
+            <td class='level'><span class=${cn}>${leve}</span></td>
 
             <td>${getDateString(data.ALARM_DATE)}</td>
 
             <td>${data.ALARM_CONTENT}</td>
 
             </tr>`

+ 2 - 2
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test49/test49.html
Bestand weergeven 

@@ -15,7 +15,7 @@
 
               <div class="title">
 
                   <span>业务统计A</span>
 
               </div>
 
-              <table id="stuTable" class="table">
 
+              <table id="stuTable" class="table newTable">
 
                   <thead>
 
                       <tr>
 
                           <th>系统名称</th>
 
@@ -75,7 +75,7 @@
 
               <div class="title">
 
                   <span>业务统计B</span>
 
               </div>
 
-              <table id="content-stuTable" class="table">
 
+              <table id="content-stuTable" class="table newTable">
 
                   <thead>
 
                       <tr>
 
                           <th>系统名称</th>

+ 7 - 7
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test50/test50.js
Bestand weergeven 

@@ -638,7 +638,7 @@ const test50 = (function () {
 
       });

 

       roomIndex = $(this).index();

-      // roomIndex = 9;

+      roomIndex = 9;

       if (roomIndex === 0) {

         $(".roomThree62").css("visibility", "inherit");

         $(".roomThree63").css("visibility", "hidden");

@@ -668,12 +668,12 @@ const test50 = (function () {
 
         $(".roomThree66").css("visibility", "hidden");

         module65();

       } else {

-        $('.roomThree62').css('visibility', 'hidden');

-        $('.roomThree63').css('visibility', 'hidden');

-        $('.roomThree64').css('visibility', 'hidden');

-        $('.roomThree65').css('visibility', 'hidden');

-        $('.roomThree66').css('visibility', 'inherit');

-        module66();

+        // $('.roomThree62').css('visibility', 'hidden');

+        // $('.roomThree63').css('visibility', 'hidden');

+        // $('.roomThree64').css('visibility', 'hidden');

+        // $('.roomThree65').css('visibility', 'hidden');

+        // $('.roomThree66').css('visibility', 'inherit');

+        // module66();

       }

       $(".sf5").slideToggle();

     });

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test51/test51.html
Bestand weergeven 

@@ -10,7 +10,7 @@
 
     </div>
 
     <div class="test-box">
 
         <div class="content">
 
-            <table id="stuTable" class="table">
 
+            <table id="stuTable" class="table newTable">
 
                 <thead>
 
                     <tr>
 
                         <th>序号</th>

+ 23 - 4
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.css
Bestand weergeven 

@@ -256,18 +256,22 @@
 
   content: "";
 
     width: 0;
 
     height: 0;
 
+    display: inline-block;
 
     border-top: 50px solid transparent;
 
-    border-right: 100px solid red;
 
+    border-right: 50px solid #00dcffc4;
 
     border-bottom: 50px solid transparent;
 
+    margin-left: 100px;
 
 }
 
 
 .number-box::before{
 
+    display: inline-block;
 
     content: "";
 
     width: 0;
 
     height: 0;
 
     border-top: 50px solid transparent;
 
-    border-left: 100px solid red;
 
+    border-left: 50px solid #00dcffc4;
 
     border-bottom: 50px solid transparent;
 
+    margin-right: 100px;
 
 }
 
 
 .Popup-name {
 
@@ -308,12 +312,27 @@
 
 }
 
 
 .box61 #stuTable thead tr th:nth-child(1){
 
-  padding-left: 8%;
 
+  padding-left: 3%;
 
 }
 
 
 .box61 #stuTable thead tr th:nth-child(2){
 
   position: relative;
 
-  left: 6%;
 
+  left: 4%;
 
+}
 
+
 
+.box61 #stuTable thead tr th:nth-child(3){
 
+  position: relative;
 
+  left: 2%;
 
+}
 
+
 
+
 
+/* 偶 */
 
+.box61 tbody tr:nth-child(2n){  
+  background-color: #1c538ce6;
 
+}
 
+/* 奇 */
 
+.box61 tbody tr:nth-child(2n+1){
 
+  background-color: #1c538c63;
 
 }

+ 2 - 2
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.html
Bestand weergeven 

@@ -69,7 +69,7 @@
 
     </div>
 
     <!-- 感染病毒详情弹窗 -->
 
     <div class="Popup hiddenScroll" style="display: none">
 
-      <div class="Popup-name">市环卫中心<span class="close-Popup">X</span></div>
 
+      <div class="Popup-name"><span>市环卫中心</span><span class="close-Popup">X</span></div>
 
       <div class="tablebox hiddenScroll">
 
         <table id="stuTable" class="table">
 
           <thead>
 
@@ -99,7 +99,7 @@
 
           </tbody>
 
         </table>
 
       </div>
 
-      <div class="number-box" style="display: none;">病毒感染总数：<span>5</span>台</div>
 
+      <div class="number-box">病毒感染总数：<span>5</span>台</div>
 
     </div>
 
   </div>
 
   <div class="panel-footer"></div>

+ 1 - 1
spring-cloud/server-page/src/main/resources/static/testEcharts/test/components/test61/test61.js
Bestand weergeven 

@@ -72,7 +72,7 @@ const test61 = (function() {
 
         let popFlag = false;
 
         $(".test61 .left-box-three").click(function() {
 
           const tit = $(this).find('.left-box-one-title').html();
 
-          $('.Popup-name').text(tit);
 
+          $('.Popup-name span').eq(0).text(tit);
 
           const id = +$(this).attr('data-id');
 
           $.ajax({
 
             url: basicUrl +

+ 25 - 0
spring-cloud/server-page/src/main/resources/static/testEcharts/test/css/coom.css
Bestand weergeven 

@@ -445,3 +445,28 @@ th {
 
 .progress span span {
 
   opacity: 0;
 
 }
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+
 
+.newTable#stuTable td,.box51 #stuTable th{
 
+  white-space: nowrap;
 
+  flex: 1;
 
+  width: 600px;
 
+  overflow: hidden;
 
+  text-indent: 150px;
 
+  text-overflow: ellipsis;
 
+}
 
+
 
+
 
+.newTable#stuTable tr{
 
+  height: 0.3rem;
 
+  line-height: 0.3rem;
 
+  display: flex;
 
+  align-items: center;
 
+}

BIN
spring-cloud/server-page/src/main/resources/static/testEcharts/test/images/bgImg/图层 789.png
Bestand weergeven


BIN
spring-cloud/server-page/src/main/resources/static/testEcharts/test/images/图层 789 copy.png
Bestand weergeven


BIN
spring-cloud/server-page/src/main/resources/static/testEcharts/test/images/图层 789.png
Bestand weergeven


+ 23 - 0
spring-cloud/server-page/src/main/resources/static/testEcharts/test/main/css/main.css
Bestand weergeven 

@@ -720,12 +720,35 @@ ul.subject li .previewBox {
 
     width: 4rem;
 
     height: 90%;
 
     margin-top: 0.3rem;
 
+    overflow: auto;
 
 }
 
 
 .detailsToos .detail-container .item:hover {
 
     background-color: #0011ff6c;
 
 }
 
 
+
 
+.detail-container::-webkit-scrollbar {
 
+  /*滚动条整体样式*/
 
+  width: 20px;
 
+  /*高宽分别对应横竖滚动条的尺寸*/
 
+  height: 20px;
 
+}
 
+
 
+.detail-container::-webkit-scrollbar-thumb {
 
+  /*滚动条里面小方块*/
 
+  border-radius: 0.2rem;
 
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
 
+  background: rgba(70, 116, 214, 0.452);
 
+}
 
+
 
+.detail-container::-webkit-scrollbar-track {
 
+  /*滚动条里面轨道*/
 
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
 
+  border-radius: 10px;
 
+  background: #ededed;
 
+}
 
+
 
 .detailsToos .detail-container .list {
 
     height: 90%;
 
 }

File diff suppressed because it is too large
+ 6 - 2
spring-cloud/server-threeapi/src/main/java/com/jd/controller/ApiUrlController.java


+ 2 - 0
spring-cloud/server-threeapi/src/main/java/com/jd/service/ApiUrlService.java
Bestand weergeven 

@@ -15,4 +15,6 @@ public interface ApiUrlService {
 
 	JSONObject sendApiUrl(String urlCode);
 
 	
 	JSONObject sendApiUrl(String urlCode, String params);
 
+	
+	JSONObject sendGisApi(String urlCode, String params);
 
 }

+ 36 - 0
spring-cloud/server-threeapi/src/main/java/com/jd/service/impl/ApiUrlServiceImpl.java
Bestand weergeven 

@@ -7,6 +7,7 @@ import com.jd.entity.threeapi.ApiUrl;
 
 import com.jd.mapper.ApiUrlMapper;
 
 import com.jd.service.ApiUrlService;
 
 import com.jd.util.ApiUrlUtil;
 
+import com.jd.util.GisUtil;
 
 
 import cn.hutool.json.JSONObject;
 
 import cn.hutool.json.JSONUtil;
 
@@ -27,6 +28,10 @@ public class ApiUrlServiceImpl implements ApiUrlService {
 
 	@Autowired
 
 	private ApiUrlUtil apiUrlUtil;
 
 	
+
 
+	@Autowired
 
+	private GisUtil gisUtil;
 
+	
 	@Override
 
 	public JSONObject sendApiUrl(String urlCode) {
 
 		ApiUrl apiUrl = apiUrlMapper.getApiUrlByUrlCode(urlCode);
 
@@ -70,4 +75,35 @@ public class ApiUrlServiceImpl implements ApiUrlService {
 
 			return null;
 
 		}
 
 	}
 
+	
+	@Override
 
+	public JSONObject sendGisApi(String urlCode, String params){
 
+		ApiUrl apiUrl = apiUrlMapper.getApiUrlByUrlCode(urlCode);
 
+		ApiUrl generateTokenApiUrl = apiUrlMapper.getApiUrlByUrlCode("GIS_01");
 
+		ApiUrl refreshTokenApiUrl = apiUrlMapper.getApiUrlByUrlCode("GIS_02");
 
+		if(apiUrl == null || generateTokenApiUrl == null || refreshTokenApiUrl == null) {
 
+			return null;
 
+		}
 
+		JSONObject gisToken = gisUtil.getGisToken(generateTokenApiUrl, refreshTokenApiUrl);
 
+		String urlApi = apiUrl.getUrlApi();
 
+		String tokenStr = "{token}";
 
+		int indexOf = urlApi.indexOf(tokenStr);
 
+		if(indexOf > -1) {
 
+			urlApi = urlApi.replace(tokenStr, gisToken.getStr("accessToken"));
 
+		}
 
+		String result = apiUrlUtil.sendHttpRequest(apiUrl, params);
 
+		if(result == null) {
 
+			return null;
 
+		}
 
+		if("".equals(result)) {
 
+			return new JSONObject();
 
+		}
 
+		try {
 
+			JSONObject parseObj = JSONUtil.parseObj(result);
 
+			return parseObj;
 
+		} catch (Exception e) {
 
+			log.error("json数据转换错误: " + e.getMessage());
 
+			return null;
 
+		}
 
+	}
 
 }

+ 193 - 0
spring-cloud/server-threeapi/src/main/java/com/jd/util/GisUtil.java
Bestand weergeven 

@@ -0,0 +1,193 @@
 
+package com.jd.util;
 
+
 
+import javax.annotation.Resource;
 
+
 
+import org.springframework.beans.factory.annotation.Value;
 
+import org.springframework.data.redis.core.RedisTemplate;
 
+import org.springframework.stereotype.Component;
 
+
 
+import com.jd.entity.threeapi.ApiUrl;
 
+
 
+import cn.hutool.core.codec.Base64Encoder;
 
+import cn.hutool.core.convert.Convert;
 
+import cn.hutool.core.date.DateField;
 
+import cn.hutool.core.date.DateTime;
 
+import cn.hutool.core.date.DateUtil;
 
+import cn.hutool.core.util.CharsetUtil;
 
+import cn.hutool.core.util.StrUtil;
 
+import cn.hutool.crypto.SecureUtil;
 
+import cn.hutool.http.Header;
 
+import cn.hutool.http.HttpRequest;
 
+import cn.hutool.json.JSONObject;
 
+import cn.hutool.json.JSONUtil;
 
+import lombok.extern.log4j.Log4j2;
 
+
 
+/**
 
+ * GIS地图接口调用
 
+ * @author leihy
 
+ *
 
+ */
 
+@Component
 
+@Log4j2
 
+public class GisUtil {
 
+	
+
 
+	@Resource
 
+	private RedisTemplate<String, Object> redisTemplate;
 
+
 
+	@Value("${contrl.connection-timeout}")
 
+	private Integer connectionTimeout = 30000;
 
+	
+	public JSONObject getGisToken(ApiUrl generateTokenApiUrl, ApiUrl refreshTokenApiUrl){
 
+		Long expiresTime = Convert.toLong(redisTemplate.opsForValue().get("gis.expiresTime"));
 
+		String accessToken = Convert.toStr(redisTemplate.opsForValue().get("gis.accessToken"));
 
+		String refreshToken = Convert.toStr(redisTemplate.opsForValue().get("gis.refreshToken"));
 
+		if(StrUtil.isEmpty(refreshToken)) {
 
+			// 未申请令牌
 
+			return getGenerateToken(generateTokenApiUrl);
 
+		}
 
+		
+		if(expiresTime == null || StrUtil.isEmpty(accessToken)){
 
+			// 令牌已不存在
 
+			return getRefreshToken(refreshTokenApiUrl, refreshToken);
 
+		}
 
+		
+		Long nowTime = DateUtil.date().getTime();
 
+		if(nowTime >= expiresTime){
 
+			// 令牌已过期
 
+			return getRefreshToken(refreshTokenApiUrl, refreshToken);
 
+		}
 
+		
+		JSONObject jsonObject = new JSONObject();
 
+		jsonObject.set("expiresTime", expiresTime);
 
+		jsonObject.set("accessToken", accessToken);
 
+		jsonObject.set("refreshToken", refreshToken);
 
+		return jsonObject;
 
+	}
 
+	
+	private JSONObject getGenerateToken(ApiUrl apiUrl) {
 
+		String urlParam = apiUrl.getUrlParam();
 
+		JSONObject urlParamObject = JSONUtil.parseObj(urlParam);
 
+		String password = urlParamObject.getStr("password");
 
+		String passwordMd5 = SecureUtil.md5(password);
 
+		String account = urlParamObject.getStr("password");
 
+		String authorization = Base64Encoder.encode(account + ":" + passwordMd5, CharsetUtil.CHARSET_UTF_8);
 
+		String url = apiUrl.getUrlPrefix();
 
+		String generateMethod = apiUrl.getUrlApi();
 
+		JSONObject sendUrl = sendUrl(url, generateMethod, authorization);
 
+		JSONObject resultMap = resultMap(sendUrl);
 
+		return resultMap;
 
+	}
 
+	
+
 
+	private JSONObject getRefreshToken(ApiUrl apiUrl, String authorization) {
 
+		String url = apiUrl.getUrlPrefix();
 
+		String refreshMethod = apiUrl.getUrlApi();
 
+		JSONObject sendUrl = sendUrl(url, refreshMethod, authorization);
 
+		JSONObject resultMap = resultMap(sendUrl);
 
+		return resultMap;
 
+	}
 
+	
+	private JSONObject resultMap(JSONObject resultData) {
 
+		JSONObject resultMap = new JSONObject();
 
+		String createTime = resultData.getStr("createTime");
 
+		DateTime myDate = DateUtil.parse(createTime);
 
+		Integer expiresIn = resultData.getInt("expiresIn");
 
+		myDate = myDate.offsetNew(DateField.MINUTE, expiresIn - 1);
 
+		Long expiresTime = myDate.getTime();
 
+		redisTemplate.opsForValue().set("gis.expiresTime", expiresTime);
 
+		
+		String accessToken = resultData.getStr("accessToken");
 
+		redisTemplate.opsForValue().set("gis.accessToken", accessToken);
 
+		
+		String refreshToken = resultData.getStr("refreshToken");
 
+		redisTemplate.opsForValue().set("gis.refreshToken", refreshToken);
 
+		
+		JSONObject jsonObject = new JSONObject();
 
+		jsonObject.set("expiresTime", expiresTime);
 
+		jsonObject.set("accessToken", accessToken);
 
+		jsonObject.set("refreshToken", refreshToken);
 
+		return jsonObject;
 
+	}
 
+	
+	private JSONObject sendUrl(String url, String method, String authorization){
 
+		try {
 
+			String result = HttpRequest.get(url + method).header(Header.AUTHORIZATION, authorization).setConnectionTimeout(connectionTimeout)
 
+					.execute()
 
+					.body();
 
+			log.info("返回参数: " + result);
 
+			JSONObject resultObject = JSONUtil.parseObj(result);
 
+			JSONObject metaObject = resultObject.getJSONObject("meta");
 
+			Integer code = metaObject.getInt("code",-100);
 
+			if(code == 200) {
 
+				return resultObject.getJSONObject("data");
 
+			}
 
+			return null;
 
+		} catch (Exception e) {
 
+			log.error("请求报错: " + e.getMessage());
 
+			e.printStackTrace();
 
+			return null;
 
+		}
 
+	}
 
+
 
+	public String getAddressList(String url,String params) {
 
+		JSONObject paramsObj = JSONUtil.parseObj(params);
 
+		String result = HttpRequest.get(url)
 
+			.body(paramsObj.toJSONString(0))
 
+			.execute()
 
+			.body();
 
+		System.err.println("getAddressList.result:");
 
+		System.err.println(result);
 
+		return result;
 
+	}
 
+
 
+	public static String getLat(String url,String params) {
 
+		JSONObject paramsObj = JSONUtil.parseObj(params);
 
+		String result = HttpRequest.get(url)
 
+			.body(paramsObj.toJSONString(0))
 
+			.execute()
 
+			.body();
 
+		System.err.println("getLat.result:");
 
+		System.err.println(result);
 
+		return result;
 
+	}
 
+	
+	public static void main(String[] args) {
 
+		GisUtil gisUtil = new GisUtil();
 
+		String url = "http://23.211.37.5:9600";
 
+		String method = "/auth/om-provider-user/userManage/service/token/generate";
 
+		String account = "Wjj@2022";
 
+		String password = "cgjzhzx2022";
 
+		
+		// 获取token
 
+		String passwordMd5 = SecureUtil.md5(password);
 
+		String authorization = Base64Encoder.encode(account + ":" + passwordMd5, CharsetUtil.CHARSET_UTF_8);
 
+		JSONObject resultData = gisUtil.sendUrl(url, method, authorization);
 
+		String refreshToken = resultData.getStr("refreshToken");
 
+		System.err.println("refreshToken:" + refreshToken);
 
+		String accessToken = resultData.getStr("accessToken");
 
+		System.err.println("refreshToken:" + accessToken);
 
+		
+		
+		// 刷新token
 
+		method = "/auth/om-provider-user/userManage/service/token/refresh";
 
+		authorization = refreshToken;
 
+		resultData = gisUtil.sendUrl(url, method, authorization);
 
+		accessToken = resultData.getStr("accessToken");
 
+		System.err.println("refreshToken:" + accessToken);
 
+		
+		//获取地址列表
 
+		method = "/gw/portal/GN63JL92/sxjIg/{token}";
 
+		method = method.replace("{token}", accessToken);
 
+		String params = "{\"pageIndex\":1,pageSize:20,\"name\":\"市政信息中心\"}";
 
+		gisUtil.getAddressList(url + method, params);
 
+		
+		//地址转坐标
 
+		method = "/gw/portal/GN52YL88/IK71c/{token}";
 
+		method = method.replace("{token}", accessToken);
 
+		String ak ="sHXMpUkCncAKl0wGWrgAULCLIPnSka6W";
 
+		params = "{\"address\":\"重庆市\",\"ak\":\"" + ak + "\",\"output\":\"json\",\"ret_coordtype\":\"gcj02ll\"}";
 
+		gisUtil.getLat(url + method, params);
 
+	}
 
+	
+}

+ 137 - 108
xiaoniaoServer/src/main/java/com/jd/xiaoniao/api/XiaoniaoApi.java
Bestand weergeven 

@@ -5,6 +5,8 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Component;
 
 
+import com.alibaba.fastjson.JSON;
 
+import com.alibaba.fastjson.JSONObject;
 
 import com.jd.xiaoniao.api.entity.BwotIn;
 
 import com.jd.xiaoniao.api.entity.BwotOut;
 
 import com.jd.xiaoniao.api.entity.CwsnIn;
 
@@ -63,7 +65,7 @@ import com.jd.xiaoniao.api.util.SocketTCP;
 
 public class XiaoniaoApi {
 
 	
 	@Autowired
 
-	private SocketTCP socket;
 
+	private SocketTCP socket = new SocketTCP();
 
 	
 	/**
 
 	 * 获取设备信息
 
@@ -425,111 +427,138 @@ public class XiaoniaoApi {
 
 		return result;
 
 	}
 
 	
-//	public void main(String[] args) {
 
-////		System.err.println("-----------getGvsn 1.1 获取设备信息----------");
 
-////		sendGvsn();
 
-//		
-////		System.err.println("-----------getGiin 1.2 获取输入端口----------");
 
-////		sendGiin(SignalCategory.VIDEO);
 
-//		
-////		System.err.println("-----------getGiou 1.3 获取输出端口----------");
 
-////		sendGiou(SignalCategory.VIDEO);
 
-//		
-////		System.err.println("-----------getGtim 1.4 读取时序----------");
 
-////		sendGtim();
 
-//		
-////		System.err.println("-----------getRtsp 1.5 获取rtsp流信息----------");
 
-////		List<String> inputportIds = new ArrayList<>();
 
-////		inputportIds.add("192.168.1.202");
 
-////		inputportIds.add("192.168.1.205");
 
-////		sendRtsp(inputportIds);
 
-//		
-////		System.err.println("-----------getGvws 2.1 读取拼接屏清单----------");
 
-////		sendGvws();
 
-//		
-////		System.err.println("-----------getGvwd 2.2 读取拼接屏的屏幕信息----------");
 
-////		sendGvwd(1);
 
-//		
-////		System.err.println("-----------getOpen 2.3. 向指定大屏开窗----------");
 
-////		List<OpenGawdIn> openGawdIns = new ArrayList<>();
 
-////		OpenGawdIn openGawdIn = new OpenGawdIn(1, "192.168.1.202", 960, 0, 960, 1080, 1);
 
-////		openGawdIns.add(openGawdIn);
 
-////		openGawdIn = new OpenGawdIn(2, "192.168.1.205", 0, 0, 1930, 1080, 1);
 
-////		openGawdIns.add(openGawdIn);
 
-////		sendOpen(openGawdIns, true);
 
-//		
-////		System.err.println("-----------getShut 2.4 关闭指定大屏的窗口----------");
 
-////		List<Integer> sorts = new ArrayList<>();
 
-////		sorts.add(1);
 
-////		sorts.add(2);
 
-////		sendShut(sorts, 1 , true);
 
-//		
-////		System.err.println("-----------getBwot 2.5 窗口置顶----------");
 
-////		sendBwot(1, 1 , true);
 
-//		
-////		System.err.println("-----------getSwtb 2.6 窗口置底----------");
 
-////		sendSwtb(1, 1 , true);
 
-//		
-////		System.err.println("-----------getSall 2.7 清空置顶大屏的窗口----------");
 
-////		List<Integer> groupIds = new ArrayList<>();
 
-////		groupIds.add(1);
 
-////		sendSall(groupIds, true);
 
-//		
-////		System.err.println("-----------getEnab 2.8 使能大屏的所有操作----------");
 
-////		sendEnab(1);
 
-//		
-////		System.err.println("-----------getGawd 2.9 读取指定拼接屏的所有窗口----------");
 
-////		sendGawd(1);
 
-//		
-////		System.err.println("-----------getSosm 2.10 配置指定输出端口的显示模式----------");
 
-////		sendSosm("192.168.1.204", SplitMode.NONE);
 
-//		
-////		System.err.println("-----------getGosm 2.11 获取指定输出端口的显示模式----------");
 
-////		List<String> outputIds = new ArrayList<>();
 
-////		outputIds.add("192.168.1.203");
 
-////		outputIds.add("192.168.1.204");
 
-////		sendGosm(SignalCategory.VIDEO, outputIds);
 
-//		
-////		System.err.println("-----------getSwis 2.12 拼接窗口信号源变更----------");
 
-////		List<SwisGawdIn> swisGawdIns = new ArrayList<>();
 
-////		SwisGawdIn swisGawdIn = new SwisGawdIn(1, "192.168.1.202", 1);
 
-////		swisGawdIns.add(swisGawdIn);
 
-////		swisGawdIn = new SwisGawdIn(2, "192.168.1.205", 1);
 
-////		swisGawdIns.add(swisGawdIn);
 
-////		sendSwis(swisGawdIns, true);
 
-//
 
-////		System.err.println("-----------getUwib 2.13 拼接窗口大小位置变更----------");
 
-////		List<UwibGawdIn> uwibGawdIns = new ArrayList<>();
 
-////		UwibGawdIn uwibGawdIn = new UwibGawdIn(1, 960, 0, 960, 1080, 1);
 
-////		uwibGawdIns.add(uwibGawdIn);
 
-////		uwibGawdIn = new UwibGawdIn(2, 0, 0, 960, 1080, 1);
 
-////		uwibGawdIns.add(uwibGawdIn);
 
-////		sendUwib(uwibGawdIns, true);
 
-//
 
-////		System.err.println("-----------2.14 大屏冻结（没起效果）----------");
 
-////		sendHold(1);
 
-//
 
-////		System.err.println("-----------2.15 获取场景列表----------");
 
-////		sendGwsl(1);
 
-//		
-////		System.err.println("-----------2.16 调用拼接场景----------");
 
-////		sendCwsn(1, "34154c2b53624c06bbba2416d0400267");
 
-//		
-////		System.err.println("-----------2.17 保存拼接场景-------- --");
 
-////		sendSwsn(1, "我的拼接场景");
 
-//		
-////		System.err.println("-----------2.18 删除拼接场景----------");
 
-////		sendDwsn("0748e47668e54599875f856c1e225dd8");
 
-//		
-////		for (int i = 0; i < 1; i++) {
 
-////			new Thread() {
 
-////				@Override
 
-////				public void run() {
 
-////					System.err.println("-----------"+this.getName()+"----------");
 
-////					sendGvsn();
 
-////				}
 
-////				
-////			}.start();
 
-////		}
 
-//	}
 
+	public static void main(String[] args) {
 
+//		System.err.println("-----------getGvsn 1.1 获取设备信息----------");
 
+//		sendGvsn();
 
+		
+//		System.err.println("-----------getGiin 1.2 获取输入端口----------");
 
+//		sendGiin(SignalCategory.VIDEO);
 
+		
+//		System.err.println("-----------getGiou 1.3 获取输出端口----------");
 
+//		sendGiou(SignalCategory.VIDEO);
 
+		
+//		System.err.println("-----------getGtim 1.4 读取时序----------");
 
+//		sendGtim();
 
+		
+//		System.err.println("-----------getRtsp 1.5 获取rtsp流信息----------");
 
+//		List<String> inputportIds = new ArrayList<>();
 
+//		inputportIds.add("192.168.1.202");
 
+//		inputportIds.add("192.168.1.205");
 
+//		sendRtsp(inputportIds);
 
+		
+//		System.err.println("-----------getGvws 2.1 读取拼接屏清单----------");
 
+//		sendGvws();
 
+		
+//		System.err.println("-----------getGvwd 2.2 读取拼接屏的屏幕信息----------");
 
+//		sendGvwd(1);
 
+		
+//		System.err.println("-----------getOpen 2.3. 向指定大屏开窗----------");
 
+//		List<OpenGawdIn> openGawdIns = new ArrayList<>();
 
+//		OpenGawdIn openGawdIn = new OpenGawdIn(1, "192.168.1.202", 960, 0, 960, 1080, 1);
 
+//		openGawdIns.add(openGawdIn);
 
+//		openGawdIn = new OpenGawdIn(2, "192.168.1.205", 0, 0, 1930, 1080, 1);
 
+//		openGawdIns.add(openGawdIn);
 
+//		sendOpen(openGawdIns, true);
 
+		
+//		System.err.println("-----------getShut 2.4 关闭指定大屏的窗口----------");
 
+//		List<Integer> sorts = new ArrayList<>();
 
+//		sorts.add(1);
 
+//		sorts.add(2);
 
+//		sendShut(sorts, 1 , true);
 
+		
+//		System.err.println("-----------getBwot 2.5 窗口置顶----------");
 
+//		sendBwot(1, 1 , true);
 
+		
+//		System.err.println("-----------getSwtb 2.6 窗口置底----------");
 
+//		sendSwtb(1, 1 , true);
 
+		
+//		System.err.println("-----------getSall 2.7 清空置顶大屏的窗口----------");
 
+//		List<Integer> groupIds = new ArrayList<>();
 
+//		groupIds.add(1);
 
+//		sendSall(groupIds, true);
 
+		
+//		System.err.println("-----------getEnab 2.8 使能大屏的所有操作----------");
 
+//		sendEnab(1);
 
+		
+//		System.err.println("-----------getGawd 2.9 读取指定拼接屏的所有窗口----------");
 
+//		sendGawd(1);
 
+		
+//		System.err.println("-----------getSosm 2.10 配置指定输出端口的显示模式----------");
 
+//		sendSosm("192.168.1.204", SplitMode.NONE);
 
+		
+//		System.err.println("-----------getGosm 2.11 获取指定输出端口的显示模式----------");
 
+//		List<String> outputIds = new ArrayList<>();
 
+//		outputIds.add("192.168.1.203");
 
+//		outputIds.add("192.168.1.204");
 
+//		sendGosm(SignalCategory.VIDEO, outputIds);
 
+		
+//		System.err.println("-----------getSwis 2.12 拼接窗口信号源变更----------");
 
+//		List<SwisGawdIn> swisGawdIns = new ArrayList<>();
 
+//		SwisGawdIn swisGawdIn = new SwisGawdIn(1, "192.168.1.202", 1);
 
+//		swisGawdIns.add(swisGawdIn);
 
+//		swisGawdIn = new SwisGawdIn(2, "192.168.1.205", 1);
 
+//		swisGawdIns.add(swisGawdIn);
 
+//		sendSwis(swisGawdIns, true);
 
+
 
+//		System.err.println("-----------getUwib 2.13 拼接窗口大小位置变更----------");
 
+//		List<UwibGawdIn> uwibGawdIns = new ArrayList<>();
 
+//		UwibGawdIn uwibGawdIn = new UwibGawdIn(1, 960, 0, 960, 1080, 1);
 
+//		uwibGawdIns.add(uwibGawdIn);
 
+//		uwibGawdIn = new UwibGawdIn(2, 0, 0, 960, 1080, 1);
 
+//		uwibGawdIns.add(uwibGawdIn);
 
+//		sendUwib(uwibGawdIns, true);
 
+
 
+//		System.err.println("-----------2.14 大屏冻结（没起效果）----------");
 
+//		sendHold(1);
 
+
 
+//		System.err.println("-----------2.15 获取场景列表----------");
 
+//		sendGwsl(1);
 
+		
+//		System.err.println("-----------2.16 调用拼接场景----------");
 
+//		sendCwsn(1, "34154c2b53624c06bbba2416d0400267");
 
+		
+//		System.err.println("-----------2.17 保存拼接场景-------- --");
 
+//		sendSwsn(1, "我的拼接场景");
 
+		
+//		System.err.println("-----------2.18 删除拼接场景----------");
 
+//		sendDwsn("0748e47668e54599875f856c1e225dd8");
 
+		
+//		for (int i = 0; i < 1; i++) {
 
+//			new Thread() {
 
+//				@Override
 
+//				public void run() {
 
+//					System.err.println("-----------"+this.getName()+"----------");
 
+//					sendGvsn();
 
+//				}
 
+//				
+//			}.start();
 
+//		}
 
+		
+		XiaoniaoApi xiaoniaoApi = new XiaoniaoApi();
 
+//		System.err.println("-----------getGvws 2.1 读取拼接屏清单----------");
 
+//		ResultData<GvwsOut> sendGvws = xiaoniaoApi.sendGvws();
 
+//		JSONObject parseObject = JSON.parseObject(JSON.toJSONString(sendGvws));
 
+//		JSONArray jsonArray = parseObject.getJSONArray("data");
 
+//		for (int i = 0; i < jsonArray.size(); i++) {
 
+//			JSONObject jsonObject = jsonArray.getJSONObject(i);
 
+//			Integer groupId = jsonObject.getInteger("groupId");
 
+//			ResultData<GvwdOut> sendGvwd = xiaoniaoApi.sendGvwd(groupId);
 
+//			JSONObject parseObject2 = JSON.parseObject(JSON.toJSONString(sendGvwd));
 
+//			jsonObject.put("sendGvwdList", parseObject2.getJSONArray("data"));
 
+//			ResultData<GawdOut> sendGawd = xiaoniaoApi.sendGawd(groupId);
 
+//			JSONObject parseObject3 = JSON.parseObject(JSON.toJSONString(sendGawd));
 
+//			jsonObject.put("sendGawdList", parseObject3.getJSONArray("data"));
 
+//		}
 
+//		System.out.println(JSON.toJSONString(parseObject));
 
+		
+		JSONObject jsonObject = new JSONObject();
 
+//		ResultData<GvwdOut> sendGvwd = xiaoniaoApi.sendGvwd(6);
 
+//		JSONObject parseObject2 = JSON.parseObject(JSON.toJSONString(sendGvwd));
 
+//		jsonObject.put("sendGvwdList", parseObject2.getJSONArray("data"));
 
+		ResultData<GawdOut> sendGawd = xiaoniaoApi.sendGawd(6);
 
+		JSONObject parseObject3 = JSON.parseObject(JSON.toJSONString(sendGawd));
 
+		jsonObject.put("sendGawdList", parseObject3.getJSONArray("data"));
 
+		System.out.println(jsonObject.toJSONString());
 
+		
+	}
 
 }

Some files were not shown because too many files changed in this diff