Merge branch 'master' of http://120.78.165.83:8123/git/nazw

nngkxxdp/src/main/java/com/example/nngkxxdp/task/HlwTask.java

@@ -71,6 +71,21 @@ public class HlwTask {
     @Resource
     private HlwInterfaceDao hlwInterfaceDao;
 
+    public static void main(String[] args) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long startTime = System.currentTimeMillis();
+        long count = 0;
+        for (int i = 0; i < 1000000; i++) {
+            for (int j = 0; j < 1000000; j++) {
+                count += 1;
+            }
+        }
+        System.out.println(count);
+        long endTime = System.currentTimeMillis();
+        System.out.println("耗时：" + (endTime - startTime) / 1000 + "秒");
+        System.out.println("耗时：" + (endTime - startTime) / (1000 * 60) + "分");
+    }
+
     //    @Scheduled(cron = "0 10 0 * * ?")
 //    @GetMapping("/getTodayData")
     public void saveAndUpdateColumnRelationData() throws Exception {
@@ -127,6 +142,7 @@ public class HlwTask {
         String operTime = null;
         boolean status = true;
         List<JSONArray> jsonArrayList = new ArrayList<>();
+        long startTime = System.currentTimeMillis();
         try {
             while (status) {
                 JSONObject obj = HlwHttpUtil.getArticleList(page, limit, operTime, 0);
@@ -161,6 +177,9 @@ public class HlwTask {
             e.printStackTrace();
         }
         log.info("init end");
+        long endTime = System.currentTimeMillis();
+        log.info("耗时：" + (endTime - startTime) / 1000 + "秒");
+        log.info("耗时：" + (endTime - startTime) / (1000 * 60) + "分");
     }
 
     /**

nngkxxdp/src/main/resources/static/district/css/sy.css

@@ -21,7 +21,7 @@ body {
 	background-color: #2775CC;
 	overflow: hidden;
 	display: flex;
-	justify-content: space-between;
+	justify-content: flex-start;
 }
 
 /* 头部蓝色部分的logo和文字 */
@@ -38,7 +38,7 @@ body {
 
 /* 头部的搜索框 */
 .right-search {
-	width: 70%;
+	width: 47%;
 	margin: 8px 0 20px 59px;
 }
 
@@ -413,6 +413,9 @@ body {
 	margin-top: 8px;
 	flex-wrap: wrap;
 }
+.first_erw{
+	margin-right: 14px;
+}
 
 .three_tag {
 	height: 26px;
@@ -979,8 +982,33 @@ body {
 .left-map {
 	scrollbar-width: thin;
 }
+.erw{
+	display: flex;
+	align-items: center;
+}
 
 @media screen and (max-width: 1366px) {
+	.left-logo {
+		width: 446px;
+		margin-left: 20px;
+		margin-top: 17px;
+	}
+	.logo-img{
+		height: 60px;
+	}
+	.right-search{
+		width: 40%;
+		margin: 8px 0 20px 45px;
+	}
+	.input-icon{
+		width:400px;
+	}
+	.content-input{
+		width: 400px;
+	}
+	.erw{
+		margin-right: 10px;
+	}
 	.content-title>li {
 		padding: 0px;
 		text-overflow: ellipsis;

nngkxxdp/src/main/resources/static/district/js/map.json

@@ -5729,7 +5729,7 @@
 		{
 			"dep": "花园村3#公厕",
 			"address": "南岸区南城大道226号",
-			"img": "/image/hyc3#gc.jpg",
+			"img": "/image/hyc3gc.jpg",
 			"sptype": "便民服务"
 		},
 		{
@@ -5835,24 +5835,12 @@
 			"sptype": "便民服务"
 		},
 		{
-			"dep": "杨家山1号",
+			"dep": "杨家山公厕",
 			"address": "重庆市南岸区御泰路8号附11号莱顿(御泰路店)斜对面140米",
 			"img": "/image/yjs1h.jpg",
 			"sptype": "便民服务"
 		},
 		{
-			"dep": "杨家山2号",
-			"address": "重庆市南岸区御泰路8号附11号莱顿(御泰路店)斜对面140米",
-			"img": "/image/yjs2h.jpg",
-			"sptype": "便民服务"
-		},
-		{
-			"dep": "南兴路公厕",
-			"address": "重庆市南岸区江南大道南源居南侧南安起风景附近",
-			"img": "/image/nxlgc.jpg",
-			"sptype": "便民服务"
-		},
-		{
 			"dep": "鹅桥头移动公厕",
 			"address": "重庆市南岸区光电路26号龙湖·观山水-南门对面",
 			"img": "/image/eqtydgc.jpg",
@@ -5925,12 +5913,6 @@
 			"sptype": "便民服务"
 		},
 		{
-			"dep": "同景公园球场公厕",
-			"address": "同景公园内",
-			"img": "/image/tjgyqcgc.jpg",
-			"sptype": "便民服务"
-		},
-		{
 			"dep": "江南水岸公租房公厕",
 			"address": "梨子湾立交旁",
 			"img": "/image/jnsagzfgc.jpg",

nngkxxdp/src/main/resources/static/district/js/sy.js

@@ -1,3 +1,6 @@
+// var PATH = "http://data.cqna.gov.cn";
+// var PATH = "http://localhost:7777";
+var PATH = "";
 var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
 if (is_mobi) {
     window.location.href = "sy_mobile.html";
@@ -559,6 +562,7 @@ $(function() {
 			xxGEO(jtxljcdd);
 			xrxx(jtxljcdd);
 		}else if(xxtx == "交通违法处理机构"){
+			console.log(jtwfcljg)
 			xxGEO(jtwfcljg);
 			xrxx(jtwfcljg);
 		}else if(xxtx == "交通事故处理机构"){
@@ -655,7 +659,7 @@ $(function() {
 		allArr.map(function(item, index) {
 			cilckList.push(Object.assign({},item,{clickIndex: 1}))
 		});
-		let getClick = cilckList.filter(item => {
+		let getClick = cilckList.filter(function(item) {
 			return item.address == add_text
 		});
 		xxGEO(getClick);
@@ -668,7 +672,7 @@ $(function() {
 		allArr.map(function(item, index) {
 			cilckList.push(Object.assign({},item,{clickIndex: 1}))
 		});
-		let getClick = cilckList.filter(item => {
+		let getClick = cilckList.filter(function(item) {
 			return item.address == add_text
 		});
 		xxGEO(getClick);
@@ -685,7 +689,7 @@ $(function() {
 		allArr.map(function(item, index) {
 			cilckList.push(Object.assign({},item,{clickIndex: 1}))
 		});
-		let getClick = cilckList.filter(item => {
+		let getClick = cilckList.filter(function(item) {
 			return item.address == add_text
 		});
 		xxGEO(getClick);
@@ -830,6 +834,8 @@ $(function() {
 			}, "重庆市");
 		}
 	};
+		// sContnet += "<br><a class='correct_html' target='_blank' style='color: #2775CC;text-decoration:underline;'>我要纠错</a>"
+
 
 	function addGEO(arr){
 		var addToFirst;
@@ -846,6 +852,11 @@ $(function() {
 		},100);
 	}
 
+	// $(document).on('click', '.correct_html', function(){
+	// 	console.log(11111);
+	// 	window.location.href=''
+	// })
+
 	// "<li class='change-but'>" +
 	// "<input type='button' name='' id='' value='公交' class='but-bus' />" +
 	// "<input type='button' name='' id='' value='自驾' class='but-car' />" +
@@ -965,7 +976,6 @@ $(function() {
 	$(document).on("click", ".hide_list", function() {
 		var TFdisplay = $(this).siblings('.title-first1').css('display');
 		$(".title-first1").fadeIn(500);
-		console.log(TFdisplay)
 		if (TFdisplay == 'flex') {
 			$(this).text('点击展开');
 			$(".title-first1").fadeOut(500);
@@ -1114,14 +1124,14 @@ $(function() {
 		map.addOverlay(marker);
 		if (getIndex) {
 			marker.openInfoWindow(infoWindow);
-			$(".one_bus").click(async function () {
+			$(".one_bus").click(async function() {
 				var _this = this;
 				await new Promise(function (resolve, reject) {
 					busClickEvent(_this);
 					resolve();
 				});
 			});
-			$(".two_car").click(async function () {
+			$(".two_car").click(async function() {
 				var _this = this;
 				await new Promise(function (resolve, reject)  {
 					drivingClickEvent(_this);

nngkxxdp/src/main/resources/static/district/js/sy_mobile.js

@@ -1,3 +1,6 @@
+// var PATH = "http://data.cqna.gov.cn";
+// var PATH = "http://localhost:7777";
+var PATH = "";
 var is_mobi = navigator.userAgent.toLowerCase().match(/(ipod|iphone|android|coolpad|mmp|smartphone|midp|wap|xoom|symbian|j2me|blackberry|wince)/i) != null;
 if (!is_mobi) {
     window.location.href = 'sy.html';

nngkxxdp/src/main/resources/static/district/sy.html

@@ -2,7 +2,10 @@
 <html>
 	<head>
 		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="renderer" content="webkit"/>
+		<meta name="force-rendering" content="webkit"/>
+		<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"/>
+		<meta name="renderer" content="webkit">
 		<meta name="viewport" content="width=device-width, initial-scale=0.5, minimum-scale=1.0, maximum-scale=1.0">
 		<link href="img/favicon.ico" rel="shortcut icon">
 		<link rel="stylesheet" href="./layui/css/layui.css">
@@ -14,7 +17,7 @@
 		<div class="head">
 			<!-- 头部蓝色部分的logo和文字 -->
 			<div class="left-logo">
-				<img class="logo-img" src="img/map-logo.png" style="width: 446px">
+				<img class="logo-img" src="img/map-logo.png">
 			</div>
 			<!-- 头部的搜索框 -->
 			<div class="right-search">
@@ -52,6 +55,10 @@
 					</div>
 				</div>
 			</div>
+			<div class="erw">
+				<img src="./img/first-ewm-2.png" alt="" class="first_erw">
+				<img src="./img/second-erm.png" alt="" class="second_erw">
+			</div>
 		</div>
 		<div class="main">
 			<div class="left-map">
@@ -707,7 +714,8 @@
 			</div>
 			<div class="right-map" id="right-map"></div>
 		</div>
-		<script type="text/javascript" src="../page/js/constans.js"></script>
+		<div class="htm"></div>
+		<!-- <script type="text/javascript" src="../page/js/constans.js"></script> -->
 		<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=4L6UzXBVZxG1jWopGBxRdq5kdW3L36Du"></script>
 		<script type="text/javascript" src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js">
 		</script>

nngkxxdp/src/main/resources/static/district/sy_mobile.html

@@ -3,7 +3,8 @@
 
 <head>
     <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1.0,  minimum-scale=1.0, maximum-scale=1.0">
     <link href="img/favicon.ico" rel="shortcut icon">
     <link rel="stylesheet" href="./layui/css/layui.css">
@@ -640,7 +641,7 @@
             </div>
         </div>
     </div>
-    <script type="text/javascript" src="../page/js/constans.js"></script>
+    <!-- <script type="text/javascript" src="../page/js/constans.js"></script> -->
 	<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=4L6UzXBVZxG1jWopGBxRdq5kdW3L36Du"></script>
     <script type="text/javascript" src="//api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js">
     </script>