m

youxiw2000
1 parent 0ca2eb74
Showing 30 changed files with 1835 additions and 897 deletions
trash-admin/settings.txt
trash-admin/src/main/resources/183.66.242.6.crt
trash-admin/src/main/resources/EC_keystore.jks
trash-admin/src/main/resources/application-dev.yml
trash-admin/src/main/resources/application.yml
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/dist.zip
trash-ui/server.key
trash-ui/server.pem
trash-ui/src/api/business/track.js
trash-ui/src/api/trackTable.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index33.vue → trash-ui/src/layout/index4.vue
trash-ui/src/main.js
trash-ui/src/permission.js
trash-ui/src/router/index.js
trash-ui/src/views/business/track/trackTable.vue
-2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1 2 1 1
 \ No newline at end of file
+2 1 10 2 1 10 2 1 10 2 1 10 2 1 10 2 1 10 2 1 10 2 1 10
 \ No newline at end of file
+-----BEGIN CERTIFICATE-----
+MIIEhjCCAm6gAwIBAgICEREwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCQ04x
+DjAMBgNVBAgMBUh1bmFuMREwDwYDVQQHDAhDaGFuZ3NoYTERMA8GA1UECgwIU3Ry
+ZWFtYXgxETAPBgNVBAsMCFN0cmVhbWF4MRUwEwYDVQQDDAwxODMuNjYuMjQyLjYw
+HhcNMjQwMTA5MDcyNDU0WhcNMjQwMjA4MDcyNDU0WjBtMQswCQYDVQQGEwJDTjEO
+MAwGA1UECAwFSHVuYW4xETAPBgNVBAcMCENoYW5nc2hhMREwDwYDVQQKDAhTdHJl
+YW1heDERMA8GA1UECwwIU3RyZWFtYXgxFTATBgNVBAMMDDE4My42Ni4yNDIuNjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSSZZJ7E/x7yd/yIPW0dwxG
+yrqX32q2035s6itrYy0Fk1Fnzp66U/pgkwkOz7LRGOEanzqgsYxoKuIdgroEeoqC
+44NN9sdICuYyl2m8jkF5SNRWjkq+WWKNK/CBJxaZSCgNwxmRKgw61GIBGZiSPJM5
+0yMj6uZ14zKKKTBfBspnPyMoyJUd+fT056DS6TTFjig+Q7xJ+j2+iSYnTBxBpQJi
+0lXswCnShQXC+4MqG7+QvDhnEqzL6q/WagUXMY14z3EpGbgZuE9By+mAMVkqUAjb
+6zj4YHkdKyXHag3SV+0huF6Qv6RdoBOd4hKoGsqGy0Jy2HuNrqINZZPZt+OI8HUC
+AwEAAaMwMC4wFwYDVR0RBBAwDoIAhwS3QvIGhwQKHhkdMBMGA1UdJQQMMAoGCCsG
+AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4ICAQAxSefkJ5hXC/GB4lok98T2e/T8a4ve
+j91/flFsE5A5MGdqi+Hj6Xpg+3uPuI/X17DRm8Zlofnyr4O6aHfYJNob75cn6OUF
+HRi7MV24BY8fjLE0lYMaC51vdg5WDftoGDwHcVfRcVI1MFgNibBVIiYh+3RyhC7c
++WxhL6UJF1xrN5KCSHe1mGcZjwee4REcmKd1m5nZNQJAhCINeEEVQyHwrN1RYhn8
+aeHEdrN+qrLCCWpURyGQt+8+mhAkwMTt3WcyW67eq9IPfGL6J2z0V/gpCGZy9vhO
+GB3zonFazIeaGYJZXAg82ZHcVBNYh23XC6zqcSuvWigW6IVhStEImky7WFxG4M7y
+0uASmoTjbozkzwhblHBl1D3VodGJAYD4zSzMe0ZcCiaMGshHsK7x7wLwHywFwdFI
+yg5PpVISBosZE4YdI/F/3Dylft6lShO3uVqyX/alYcdHlJRaDVpVuJLFBT5r08BD
+LP/PJkFUayFyVq08X+Zn9n3zHvFbZqloA9dt9BCSYm6Ucl+JttdwufllbPeCqYnP
+KsFtaiBRmDUHLX83AHnvO4XaGKbQcUMqCTQmTJrhTw20lo8uTaugWmahPi11b+LK
+8BaqXUJucNzEUC37IWH0SgbWl75m9Frlvezsrl50NAL+7/aOEgxXen6mJAexBSON
+16BJ5xHG9whbPw==
+-----END CERTIFICATE-----
@@ -16,9 +16,9 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    #remotePath: http://175.6.47.84:8008
+    #remotePath: https://175.6.47.84:8008
     #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
-    remotePath: http://183.66.242.6:14601
+    remotePath: https://183.66.242.6:14601
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
@@ -80,7 +80,10 @@ swagger:
   enabled: false
   # 请求前缀
   pathMapping: /dev-api
-
+  
+swagger-ui:
+  # 是否开启swagger
+  enabled: false
 # 防止XSS攻击
 xss: 
 package com.trash.common.utils;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.SecureRandom;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.trash.common.config.trashConfig;
-import com.trash.common.core.redis.RedisCache;
-import com.trash.common.utils.SecurityUtils;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -24,122 +39,114 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 public class RemoteServerUtils {
-	
-//	public static String remote = "http://183.66.242.6:14601/";
-	
-//	public static String remote = "http://175.6.47.84:8008/"; 
-	
-	
+
+	// public static String remote = "http://183.66.242.6:14601/";
+
+	// public static String remote = "http://175.6.47.84:8008/";
+
 	public static String remote;
-	
+
 	public static OkHttpClient okHttpClient;
-	
+
 	public static String TruckListRequestPath = "/api/gpsservice/cs/basevehicle/ledger/list";
-	
+
 	public static String UpdateTruckRequestPath = "/api/gpsservice/cs/basevehicle/credit/status";
-	
+
 	public static String TruckStatusListRequestPath = "/api/gpsservice/cs/basevehicle/statusquery";
-													
-	
-	
+
 	public static String TruckInfo = "/api/gpsservice/cs/basevehicle/";
 	public static String EarthSitesInfo = "/api/siteservice/cs/earthsites/";
-	
+
 	public static String EarthSitesList = "/api/siteservice/cs/earthsites/ledger/list";
-	
+
 	public static String ConstructionInfo = "/api/siteservice/cs/constructionsites/";
-	
-	//license/ 留一下...
+
+	// license/ 留一下...
 	public static String constructionLicenseById = "/api/siteservice/cs/constructionsites/";
 	public static String ConstructionList = "/api/siteservice/cs/constructionsites/search";
-	
-	public static String UpdateConstruction= "/api/siteservice/cs/constructionsites/status";
-	public static String UpdateSupervision= "/api/gpsservice/cs/supervision/status/update";
+	public static String UpdateConstruction = "/api/siteservice/cs/constructionsites/status";
+
+	public static String UpdateSupervision = "/api/gpsservice/cs/supervision/status/update";
-	
 	public static String CompanyListRequestPath = "/api/gpsservice/cs/companies/ledger/list";
-	
+
 	public static String UpdateCompanyRequestPath = "/api/gpsservice/cs/companies/credit/status";
 	public static String UpdateEarthSiteRequestPath = "/api/siteservice/cs/earthsites/status";
 	public static String UpdateConractRequestPath = "/api/siteservice/cs/sitecontract/audit/status";
-	
+
 	public static String DriverListPath = "/api/gpsservice/v1/drivers/search";
-	
+
 	public static String CompanyUpdateAudit = "/api/gpsservice/cs/companies/audit/status";
 	public static String TruckUpdateAudit = "/api/gpsservice/cs/basevehicle/audit/status";
-	
+
 	public static String DriverUpdateAudit = "/api/gpsservice/v1/drivers/audit/status";
-	
+
 	public static String BasevehicleInfo = "/api/gpsservice/cs/basevehicle/";
-	
+
 	public static String ContractList = "/api/siteservice/cs/sitecontract/ledger/list";
-	
+
 	public static String Unitetransport = "/api/siteservice/cs/unitetransport/bysite/";
-	
-	
+
 	public static String GETAUTH = "/api/gpsservice/cs/authority";
-	
-	
-	public static JSONArray getUnitetransport(String id){
-		JSONArray list  = null;
+
+	public static JSONArray getUnitetransport(String id) {
+		JSONArray list = null;
 		try {
-			list = (JSONArray)get(Unitetransport+id,null);
+			list = (JSONArray) get(Unitetransport + id, null);
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
-		
+
 		return list;
 	}
-	
-	
-	public static JSONArray getContractList(Map map){
-		JSONArray list=null;
-		Object object = post(ContractList,map);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-			 list = jsonObject.getJSONArray("list");
+
+	public static JSONArray getContractList(Map map) {
+		JSONArray list = null;
+		Object object = post(ContractList, map);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
 		}
-		
+
 		return list;
 	}
-	
-	public static JSONArray getContractList(Map map,String token){
-		
-		JSONArray list=null;
-		Object object = post(ContractList,map,token);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-			 list = jsonObject.getJSONArray("list");
+
+	public static JSONArray getContractList(Map map, String token) {
+
+		JSONArray list = null;
+		Object object = post(ContractList, map, token);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
 		}
-		
+
 		return list;
 	}
-	
-	
-	public static JSONArray getEarthSitesList(Map map){
-		JSONArray list=null;
-		Object object = post(EarthSitesList,map);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-			 list = jsonObject.getJSONArray("list");
+
+	public static JSONArray getEarthSitesList(Map map) {
+		JSONArray list = null;
+		Object object = post(EarthSitesList, map);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
 		}
-		
+
 		return list;
 	}
-	public static JSONArray getEarthSitesList(Map map,String token){
-		JSONArray list=null;
-		Object object = post(EarthSitesList,map,token);
+	public static JSONArray getEarthSitesList(Map map, String token) {
+		JSONArray list = null;
+		Object object = post(EarthSitesList, map, token);
-		if(object != null){
+		if (object != null) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
 			list = jsonObject.getJSONArray("list");
 		}
@@ -147,11 +154,11 @@ public class RemoteServerUtils {
 		return list;
 	}
-	public static JSONArray getConstructionList(Map map){
-		JSONArray list=null;
-		Object object = post(ConstructionList,map);
+	public static JSONArray getConstructionList(Map map) {
+		JSONArray list = null;
+		Object object = post(ConstructionList, map);
-		if(object != null){
+		if (object != null) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
 			list = jsonObject.getJSONArray("list");
 		}
@@ -159,11 +166,11 @@ public class RemoteServerUtils {
 		return list;
 	}
-	public static JSONArray getConstructionList(Map map,String token){
-		JSONArray list=null;
-		Object object = post(ConstructionList,map,token);
+	public static JSONArray getConstructionList(Map map, String token) {
+		JSONArray list = null;
+		Object object = post(ConstructionList, map, token);
-		if(object != null){
+		if (object != null) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
 			list = jsonObject.getJSONArray("list");
 		}
@@ -171,121 +178,117 @@ public class RemoteServerUtils {
 		return list;
 	}
-	public static JSONArray getTruckOnline(Map map){
-		JSONArray turckList=null;
-		Object object = post(TruckStatusListRequestPath,map);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-        	 turckList = jsonObject.getJSONArray("list");
+	public static JSONArray getTruckOnline(Map map) {
+		JSONArray turckList = null;
+		Object object = post(TruckStatusListRequestPath, map);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			turckList = jsonObject.getJSONArray("list");
 		}
-		
+
 		return turckList;
 	}
-	
-	public static Object updateConstationCreditAndStatus(List<Map> map){
-		JSONArray turckList=null;
-		Object object = post(UpdateConstruction,map);
-		
+
+	public static Object updateConstationCreditAndStatus(List<Map> map) {
+		JSONArray turckList = null;
+		Object object = post(UpdateConstruction, map);
+
 		return object;
 	}
-	public static Object UpdateSupervisionStatus(List<Map> map){
-		Object object = post(UpdateSupervision,map);
+	public static Object UpdateSupervisionStatus(List<Map> map) {
+		Object object = post(UpdateSupervision, map);
 		return object;
 	}
-	
-	
-	public static Object updateCompanyAudit(List<Map> map,String token){
-		Object object = post(CompanyUpdateAudit,map,token);
+
+	public static Object updateCompanyAudit(List<Map> map, String token) {
+		Object object = post(CompanyUpdateAudit, map, token);
 		return object;
 	}
-	public static Object updateTruckAudit(List<Map> map,String token){
-		Object object = post(TruckUpdateAudit,map,token);
+
+	public static Object updateTruckAudit(List<Map> map, String token) {
+		Object object = post(TruckUpdateAudit, map, token);
 		return object;
 	}
-	
-	public static Object updateDriverAudit(List<Map> map,String token){
-		Object object = post(DriverUpdateAudit,map,token);
+
+	public static Object updateDriverAudit(List<Map> map, String token) {
+		Object object = post(DriverUpdateAudit, map, token);
 		return object;
 	}
-	
-	public static Object updateCompanyAudit(List<Map> map){
-		Object object = post(CompanyUpdateAudit,map);
+
+	public static Object updateCompanyAudit(List<Map> map) {
+		Object object = post(CompanyUpdateAudit, map);
 		return object;
 	}
-	
-	public static Object updateTruckAudit(List<Map> map){
-		Object object = post(TruckUpdateAudit,map);
+
+	public static Object updateTruckAudit(List<Map> map) {
+		Object object = post(TruckUpdateAudit, map);
 		return object;
 	}
-	
-	public static Object updateDriverAudit(List<Map> map){
-		Object object = post(DriverUpdateAudit,map);
+
+	public static Object updateDriverAudit(List<Map> map) {
+		Object object = post(DriverUpdateAudit, map);
 		return object;
 	}
-	
-	public static Object updateEarthSitesCreditAndStatus(List<Map> map){
-		JSONArray turckList=null;
-		Object object = post(UpdateEarthSiteRequestPath,map);
-		
+
+	public static Object updateEarthSitesCreditAndStatus(List<Map> map) {
+		JSONArray turckList = null;
+		Object object = post(UpdateEarthSiteRequestPath, map);
+
 		return object;
 	}
-	
-	public static Object updateConractStatus(List<Map> map){
-		JSONArray turckList=null;
-		Object object = post(UpdateConractRequestPath,map);
-		
+
+	public static Object updateConractStatus(List<Map> map) {
+		JSONArray turckList = null;
+		Object object = post(UpdateConractRequestPath, map);
+
 		return object;
 	}
-	
-	
-
 	public static JSONObject getEarthSitesInfo(String id) {
-		JSONObject json=null;
-		Object object = get(EarthSitesInfo + id,null);
-		
-		if(object != null){
+		JSONObject json = null;
+		Object object = get(EarthSitesInfo + id, null);
+
+		if (object != null) {
 			json = JSON.parseObject(object.toString());
 			return json;
 		}
-		
+
 		return json;
 	}
+	public static JSONObject getTruckInfo(String id) {
+		JSONObject turckList = null;
+		Object object = get(TruckInfo + id, null);
-	
-	public static JSONObject getTruckInfo(String id){
-		JSONObject turckList=null;
-		Object object = get(TruckInfo + id,null);
-		
-		if(object != null){
+		if (object != null) {
 			turckList = JSON.parseObject(object.toString());
 			return turckList;
 		}
-		
+
 		return turckList;
 	}
-	
+
 	public static JSONObject getConstructionLicenseById(String id) {
-		JSONObject turckList=null;
-		Object object = get(constructionLicenseById + id,null);
-		
-		if(object != null){
+		JSONObject turckList = null;
+		Object object = get(constructionLicenseById + id, null);
+
+		if (object != null) {
 			turckList = JSON.parseObject(object.toString());
 			return turckList;
 		}
-		
+
 		return turckList;
-		
+
 	}
-	public static JSONObject getConstructionLicenseById(String id,String token) {
-		JSONObject turckList=null;
-		Object object = get(constructionLicenseById + id,null,token);
-		if(object != null){
+	public static JSONObject getConstructionLicenseById(String id, String token) {
+		JSONObject turckList = null;
+		Object object = get(constructionLicenseById + id, null, token);
+
+		if (object != null) {
 			turckList = JSON.parseObject(object.toString());
 			return turckList;
 		}
@@ -294,426 +297,505 @@ public class RemoteServerUtils {
 	}
-	
 	public static JSONObject getConstructionInfo(String id) {
-		JSONObject turckList=null;
-		Object object = get(ConstructionInfo + id,null);
-		
-		if(object != null){
+		JSONObject turckList = null;
+		Object object = get(ConstructionInfo + id, null);
+
+		if (object != null) {
 			turckList = JSON.parseObject(object.toString());
 			return turckList;
 		}
-		
+
 		return turckList;
-		
+
 	}
-	
-	public static JSONArray getCompanyList(Map params){
-		JSONArray turckList=null;
-		Object object = post(CompanyListRequestPath,params);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-        	 turckList = jsonObject.getJSONArray("list");
+	public static JSONArray getCompanyList(Map params) {
+		JSONArray turckList = null;
+		Object object = post(CompanyListRequestPath, params);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			turckList = jsonObject.getJSONArray("list");
 		}
-		
+
 		return turckList;
 	}
-	
+
 	public static Object updateCompanyList(List<Map> updateList) {
-		JSONArray turckList=null;
-		Object object = post(UpdateCompanyRequestPath,updateList);
-		
-		
+		JSONArray turckList = null;
+		Object object = post(UpdateCompanyRequestPath, updateList);
+
 		return object;
 	}
-	
-	
-	public static JSONArray getAreas(){
-		JSONArray array=null;
-		Object object = get("/api/gpsservice/cs/area",null);
-		
-		if(object != null){
-			 array = JSON.parseArray(object.toString());
+
+	public static JSONArray getAreas() {
+		JSONArray array = null;
+		Object object = get("/api/gpsservice/cs/area", null);
+
+		if (object != null) {
+			array = JSON.parseArray(object.toString());
 		}
-		
+
 		return array;
 	}
-	
-	public static JSONArray getDict(Map params){
-		JSONArray array=null;
-		Object object = get("/api/gpsservice/cs/dataDict",params);
-		
-		if(object != null){
-			 array = JSON.parseArray(object.toString());
+
+	public static JSONArray getDict(Map params) {
+		JSONArray array = null;
+		Object object = get("/api/gpsservice/cs/dataDict", params);
+
+		if (object != null) {
+			array = JSON.parseArray(object.toString());
 		}
-		
+
 		return array;
 	}
-	public static JSONArray getTruckList(Map params){
-		JSONArray turckList=null;
-		Object object = post(TruckListRequestPath,params);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-        	 turckList = jsonObject.getJSONArray("list");
+	public static JSONArray getTruckList(Map params) {
+		JSONArray turckList = null;
+		Object object = post(TruckListRequestPath, params);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			turckList = jsonObject.getJSONArray("list");
 		}
-		
+
 		return turckList;
 	}
-	
-
 	public static Object updateTruckList(List<Map> updateList) {
-		JSONArray turckList=null;
-		Object object = post(UpdateTruckRequestPath,updateList);
-		
-		
+		JSONArray turckList = null;
+		Object object = post(UpdateTruckRequestPath, updateList);
+
 		return object;
 	}
-	
-	
-	
-	public static JSONArray getTruckOnline(Map map,String token){
-		JSONArray turckList=null;
-		Object object = post(TruckStatusListRequestPath,map,token);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-        	 turckList = jsonObject.getJSONArray("list");
+
+	public static JSONArray getTruckOnline(Map map, String token) {
+		JSONArray turckList = null;
+		Object object = post(TruckStatusListRequestPath, map, token);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			turckList = jsonObject.getJSONArray("list");
 		}
-		
+
 		return turckList;
 	}
-	
-	public static Object updateConstationCreditAndStatus(List<Map> map,String token){
-		JSONArray turckList=null;
-		Object object = post(UpdateConstruction,map,token);
-		
+
+	public static Object updateConstationCreditAndStatus(List<Map> map, String token) {
+		JSONArray turckList = null;
+		Object object = post(UpdateConstruction, map, token);
+
 		return object;
 	}
-	
-	public static Object updateEarthSitesCreditAndStatus(List<Map> map,String token){
-		JSONArray turckList=null;
-		Object object = post(UpdateEarthSiteRequestPath,map,token);
-		
+
+	public static Object updateEarthSitesCreditAndStatus(List<Map> map, String token) {
+		JSONArray turckList = null;
+		Object object = post(UpdateEarthSiteRequestPath, map, token);
+
 		return object;
 	}
-	
-	public static Object updateConractStatus(List<Map> map,String token){
-		JSONArray turckList=null;
-		Object object = post(UpdateConractRequestPath,map,token);
-		
+
+	public static Object updateConractStatus(List<Map> map, String token) {
+		JSONArray turckList = null;
+		Object object = post(UpdateConractRequestPath, map, token);
+
 		return object;
 	}
-	
-	
+	public static JSONObject getEarthSitesInfo(String id, String token) {
+		JSONObject json = null;
+		Object object = get(EarthSitesInfo + id, null, token);
-	public static JSONObject getEarthSitesInfo(String id,String token) {
-		JSONObject json=null;
-		Object object = get(EarthSitesInfo + id,null,token);
-		
-		if(object != null){
+		if (object != null) {
 			json = JSON.parseObject(object.toString());
 			return json;
 		}
-		
+
 		return json;
 	}
+	public static JSONObject getTruckInfo(String id, String token) {
+		JSONObject turckList = null;
+		Object object = get(TruckInfo + id, null, token);
-	
-	public static JSONObject getTruckInfo(String id,String token){
-		JSONObject turckList=null;
-		Object object = get(TruckInfo + id,null,token);
-		
-		if(object != null){
+		if (object != null) {
 			turckList = JSON.parseObject(object.toString());
 			return turckList;
 		}
-		
+
 		return turckList;
 	}
-	
-	
-	public static JSONObject getConstructionInfo(String id,String token) {
-		JSONObject turckList=null;
-		Object object = get(ConstructionInfo + id,null,token);
-		
-		if(object != null){
+
+	public static JSONObject getConstructionInfo(String id, String token) {
+		JSONObject turckList = null;
+		Object object = get(ConstructionInfo + id, null, token);
+
+		if (object != null) {
 			turckList = JSON.parseObject(object.toString());
 			return turckList;
 		}
-		
+
 		return turckList;
-		
+
 	}
-	
-	public static JSONArray getCompanyList(Map params,String token){
-		JSONArray turckList=null;
-		Object object = post(CompanyListRequestPath,params,token);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-        	 turckList = jsonObject.getJSONArray("list");
+	public static JSONArray getCompanyList(Map params, String token) {
+		JSONArray turckList = null;
+		Object object = post(CompanyListRequestPath, params, token);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			turckList = jsonObject.getJSONArray("list");
 		}
-		
+
 		return turckList;
 	}
-	
-	public static Object updateCompanyList(List<Map> updateList,String token) {
-		JSONArray turckList=null;
-		Object object = post(UpdateCompanyRequestPath,updateList,token);
-		
-		
+
+	public static Object updateCompanyList(List<Map> updateList, String token) {
+		JSONArray turckList = null;
+		Object object = post(UpdateCompanyRequestPath, updateList, token);
+
 		return object;
 	}
-	
-	
-	public static JSONArray getAreas(String token){
-		JSONArray array=null;
-		Object object = get("/api/gpsservice/cs/area",null,token);
-		
-		if(object != null){
-			 array = JSON.parseArray(object.toString());
+
+	public static JSONArray getAreas(String token) {
+		JSONArray array = null;
+		Object object = get("/api/gpsservice/cs/area", null, token);
+
+		if (object != null) {
+			array = JSON.parseArray(object.toString());
 		}
-		
+
 		return array;
 	}
-	
-	public static JSONArray getDict(Map params,String token){
-		JSONArray array=null;
-		Object object = get("/api/gpsservice/cs/dataDict",params,token);
-		
-		if(object != null){
-			 array = JSON.parseArray(object.toString());
+
+	public static JSONArray getDict(Map params, String token) {
+		JSONArray array = null;
+		Object object = get("/api/gpsservice/cs/dataDict", params, token);
+
+		if (object != null) {
+			array = JSON.parseArray(object.toString());
 		}
-		
+
 		return array;
 	}
-	
-	
-	public static JSONArray getTruckList(Map params,String token){
-		JSONArray turckList=null;
-		Object object = post(TruckListRequestPath,params,token);
-		
-		if(object != null){
-			 JSONObject jsonObject = JSON.parseObject(object.toString());
-        	 turckList = jsonObject.getJSONArray("list");
+
+	public static JSONArray getTruckList(Map params, String token) {
+		JSONArray turckList = null;
+		Object object = post(TruckListRequestPath, params, token);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			turckList = jsonObject.getJSONArray("list");
 		}
-		
+
 		return turckList;
 	}
-	
+	public static Object updateTruckList(List<Map> updateList, String token) {
+		JSONArray turckList = null;
+		Object object = post(UpdateTruckRequestPath, updateList, token);
-	public static Object updateTruckList(List<Map> updateList,String token) {
-		JSONArray turckList=null;
-		Object object = post(UpdateTruckRequestPath,updateList,token);
-		
-		
 		return object;
 	}
-	
-	public static Object post(String url,Object obj){
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+
+	// 实现X509TrustManager接口
+	public static class MyTrustManager implements X509TrustManager {
+		@Override
+		public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+		}
+
+		@Override
+		public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+		}
+
+		@Override
+		public X509Certificate[] getAcceptedIssuers() {
+			return new X509Certificate[0];
+		}
+	}
+
+	private static SSLSocketFactory createSSLSocketFactory() {
+		SSLSocketFactory ssfFactory = null;
+		try {
+			MyTrustManager mMyTrustManager = new MyTrustManager();
+			SSLContext sc = SSLContext.getInstance("TLS");
+			sc.init(null, new TrustManager[] { mMyTrustManager }, new SecureRandom());
+			ssfFactory = sc.getSocketFactory();
+		} catch (Exception ignored) {
+			ignored.printStackTrace();
+		}
+
+		return ssfFactory;
+	}
+
+	// 实现HostnameVerifier接口
+	private class TrustAllHostnameVerifier implements HostnameVerifier {
+		@Override
+		public boolean verify(String hostname, SSLSession session) {
+			return true;
+		}
+	}
+
+	/**
+	 * 获去信任自签证书的trustManager
+	 *
+	 * @param ins
+	 *            自签证书输入流
+	 * @return 信任自签证书的trustManager
+	 * @throws GeneralSecurityException
+	 */
+	private static X509TrustManager trustManagerForCertificates(InputStream... ins) throws GeneralSecurityException {
+		// 创建证书工厂
+		CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
+
+		// 通过证书工厂得到自签证书对象集合
+		Collection<Certificate> certificates = new ArrayList<>();
+
+		for (InputStream inputStream : ins) {
+			certificates.addAll(certificateFactory.generateCertificates(inputStream));
+		}
+
+		if (certificates.isEmpty()) {
+			throw new IllegalArgumentException("expected non-empty set of trusted certificates");
+		}
+
+		// 为证书设置一个keyStore
+		char[] password = "password".toCharArray(); // Any password will work.
+		KeyStore keyStore = newEmptyKeyStore(password);
+		int index = 0;
+		// 将所有证书放入证书放入keystore中
+		for (Certificate certificate : certificates) {
+			String certificateAlias = Integer.toString(index++);
+			keyStore.setCertificateEntry(certificateAlias, certificate);
+		}
+
+		// Use it to build an X509 trust manager.
+		// 使用包含自签证书信息的keyStore去构建一个X509TrustManager
+		KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+		keyManagerFactory.init(keyStore, password);
+		TrustManagerFactory trustManagerFactory = TrustManagerFactory
+				.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+		trustManagerFactory.init(keyStore);
+		TrustManager[] trustManagers = trustManagerFactory.getTrustManagers();
+		if (trustManagers.length == 0) {
+			throw new IllegalStateException("Unexpected default trust managers:" + Arrays.toString(trustManagers));
+		}
+		return ((X509TrustManager) trustManagers[0]);
+	}
+
+	private static KeyStore newEmptyKeyStore(char[] password) throws GeneralSecurityException {
+		try {
+			KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+			InputStream in = null; // By convention, 'null' creates an empty key
+									// store.
+			keyStore.load(null, password);
+			return keyStore;
+		} catch (IOException e) {
+			throw new AssertionError(e);
+		}
+	}
+
+	public static Object post(String url, Object obj) {
+		if (okHttpClient == null) {
+
+			okHttpClient = getOkClient();
 		}
-		
 		String token = SecurityUtils.getLoginUser().getToken();
-		
-		if(token.contains("durable:")){
-	    	token = token.replace("durable:", "Bearer durable:auth:token:");
-		}else{
-	    	token = "Bearer auth:token:"+ token;
-		}
-    				
-    	String param = JSON.toJSON(obj).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(remote+url).addHeader("Authorization",token ).post(body).build();
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if(json.getInteger("code") == 200){
-            		return json.get("result");
-            	}
-            	
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
-		}
-        
-        return null;
+
+		if (token.contains("durable:")) {
+			token = token.replace("durable:", "Bearer durable:auth:token:");
+		} else {
+			token = "Bearer auth:token:" + token;
+		}
+
+		String param = JSON.toJSON(obj).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(remote + url).addHeader("Authorization", token).post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if (json.getInteger("code") == 200) {
+					return json.get("result");
+				}
+
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+
+		return null;
 	}
-	public static Object get(String url,Map<String,String> obj){
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+	public static Object get(String url, Map<String, String> obj) {
+		if (okHttpClient == null) {
+			okHttpClient = getOkClient();
 		}
-		
+
 		String token = SecurityUtils.getLoginUser().getToken();
-		
-		if(token.contains("durable:")){
-	    	token = token.replace("durable:", "Bearer durable:auth:token:");
-		}else{
-	    	token = "Bearer auth:token:"+ token;
+		if (token.contains("durable:")) {
+			token = token.replace("durable:", "Bearer durable:auth:token:");
+		} else {
+			token = "Bearer auth:token:" + token;
 		}
-		
-    	String params = "";
-    	
-    	
-    	if(obj != null){
-        	
-    		params += "?";
-        	
-        	for(String key:obj.keySet()){
-        		params += key + "=" + obj.get(key) + "&";
-        	}
-        	
-        	params = params.substring(0,params.length()-1);
-    	}
-    	
-    	
-    	url += params;
-
-        Request request = new Request.Builder().url(remote+url).addHeader("Authorization",token ).get().build();
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if("success".equals(json.getString("message"))){
-            		return json.get("result");
-            	}
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
-		}
-        
-        return null;
+
+		String params = "";
+
+		if (obj != null) {
+
+			params += "?";
+
+			for (String key : obj.keySet()) {
+				params += key + "=" + obj.get(key) + "&";
+			}
+
+			params = params.substring(0, params.length() - 1);
+		}
+
+		url += params;
+
+		Request request = new Request.Builder().url(remote + url).addHeader("Authorization", token).get().build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if ("success".equals(json.getString("message"))) {
+					return json.get("result");
+				}
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+
+		return null;
 	}
-	public static Object post(String url,Object obj,String token){
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
-		}
-
-    	token = "Bearer "+ token;
-    				
-    	String param = JSON.toJSON(obj).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(remote+url).addHeader("Authorization",token ).post(body).build();
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if(json.getInteger("code") == 200){
-            		return json.get("result");
-            	}
-            	
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
-		}
-        
-        return null;
+
+	public static Object post(String url, Object obj, String token) {
+		if (okHttpClient == null) {
+
+			okHttpClient = getOkClient();
+		}
+
+		token = "Bearer " + token;
+
+		String param = JSON.toJSON(obj).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(remote + url).addHeader("Authorization", token).post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if (json.getInteger("code") == 200) {
+					return json.get("result");
+				}
+
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+
+		return null;
 	}
-	public static Object get(String url,Map<String,String> obj,String token){
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+	public static OkHttpClient getOkClient() {
+		X509TrustManager x509TrustManager = null;
+		try {
+			File file = new File("src/main/resources/183.66.242.6.crt");
+			x509TrustManager = trustManagerForCertificates(new FileInputStream(file));
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (GeneralSecurityException e) {
+			// TODO Auto-generated catch blockxiashuo 
+			e.printStackTrace();
 		}
+
+		okHttpClient = new OkHttpClient.Builder().sslSocketFactory(createSSLSocketFactory(), x509TrustManager)
+				.connectTimeout(20, TimeUnit.SECONDS).writeTimeout(20, TimeUnit.SECONDS)
+				.readTimeout(30, TimeUnit.SECONDS).build();
-    	token = "Bearer "+ token;
-    	String params = "";
-    	
-    	
-    	if(obj != null){
-        	
-    		params += "?";
-        	
-        	for(String key:obj.keySet()){
-        		params += key + "=" + obj.get(key) + "&";
-        	}
-        	
-        	params = params.substring(0,params.length()-1);
-    	}
-    	
-    	
-    	url += params;
-
-        Request request = new Request.Builder().url(remote+url).addHeader("Authorization",token ).get().build();
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if("success".equals(json.getString("message"))){
-            		return json.get("result");
-            	}
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
+		return okHttpClient;
+	}
+
+	public static Object get(String url, Map<String, String> obj, String token) {
+		if (okHttpClient == null) {
+
+
+			okHttpClient = getOkClient();
+		}
+
+		token = "Bearer " + token;
+		String params = "";
+
+		if (obj != null) {
+
+			params += "?";
+
+			for (String key : obj.keySet()) {
+				params += key + "=" + obj.get(key) + "&";
+			}
+
+			params = params.substring(0, params.length() - 1);
+		}
+
+		url += params;
+
+		Request request = new Request.Builder().url(remote + url).addHeader("Authorization", token).get().build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if ("success".equals(json.getString("message"))) {
+					return json.get("result");
+				}
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
 		}
 		return null;
 	}
-	public static JSONObject getBasevehicleInfo(String id,String token) {
-		JSONObject turckList=null;
-		Object object = get(BasevehicleInfo + id,null,token);
-		if(object != null){
+	public static JSONObject getBasevehicleInfo(String id, String token) {
+		JSONObject turckList = null;
+		Object object = get(BasevehicleInfo + id, null, token);
+
+		if (object != null) {
 			turckList = JSON.parseObject(object.toString());
 			return turckList;
 		}
@@ -722,338 +804,287 @@ public class RemoteServerUtils {
 	}
 	public static JSONArray getDriverList(String token) {
-	
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
-		}
-
-    	token = "Bearer "+ token;
-    				
-    	String param = JSON.toJSON(new HashMap<>()).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(remote+DriverListPath).addHeader("Authorization",token ).post(body).build();
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	return json.getJSONArray("list");
-            	
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
+
+		if (okHttpClient == null) {
+			okHttpClient = getOkClient();
+		}
+
+		token = "Bearer " + token;
+
+		String param = JSON.toJSON(new HashMap<>()).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(remote + DriverListPath).addHeader("Authorization", token)
+				.post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				return json.getJSONArray("list");
+
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
 		}
 	}
-	
-	
 	static String upUrl = "https://cszgf.tyykj.com:37251/";
-	
-	public static boolean updateUpCase(Map map){
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+
+	public static boolean updateUpCase(Map map) {
+		if (okHttpClient == null) {
+			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
+					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-		
-		
-    	String param = JSON.toJSON(map).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(upUrl + "api/thirdApi/query/callback").addHeader("Authorization",getUpUser()).post(body).build();
-
-            okhttp3.Response response;
-            String result;
-			try {
-				response = okHttpClient.newCall(request).execute();
-
-	            result = response.body().string();
-	            JSONObject json = JSON.parseObject(result);
-	        	if(json.getBoolean("success")){
-	        		return json.getBoolean("success");
-	        	}
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+
+		String param = JSON.toJSON(map).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(upUrl + "api/thirdApi/query/callback")
+				.addHeader("Authorization", getUpUser()).post(body).build();
+
+		okhttp3.Response response;
+		String result;
+		try {
+			response = okHttpClient.newCall(request).execute();
+
+			result = response.body().string();
+			JSONObject json = JSON.parseObject(result);
+			if (json.getBoolean("success")) {
+				return json.getBoolean("success");
 			}
-			
-			return false;
-           
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return false;
+
 	}
-	
-	public static String getUpUser(){
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+
+	public static String getUpUser() {
+		if (okHttpClient == null) {
+			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
+					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-		
-		
+
 		Map map = new HashMap<>();
 		map.put("userName", "市渣土管理系统");
 		map.put("password", "u2nuQKePryLy6ccJywKCCQ==");
-    	String param = JSON.toJSON(map).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/token").post(body).build();
-
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if(json.getBoolean("success")){
-            		return json.getString("data");
-            	}
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
+		String param = JSON.toJSON(map).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/token").post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if (json.getBoolean("success")) {
+					return json.getString("data");
+				}
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
 		}
 		return null;
 	}
-	
+
 	public static JSONArray getUpArea() {
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+		if (okHttpClient == null) {
+			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
+					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-		
-		
+
 		Map map = new HashMap<>();
-		
-		
-    	String param = JSON.toJSON(map).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/areaList").addHeader("Authorization",getUpUser()).post(body).build();
-
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if( json.getBoolean("success")){
-            		return json.getJSONArray("data");
-            	}
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	
-		}
-        return null;
-	}
-	
+		String param = JSON.toJSON(map).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/areaList")
+				.addHeader("Authorization", getUpUser()).post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if (json.getBoolean("success")) {
+					return json.getJSONArray("data");
+				}
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+
+		}
+		return null;
+	}
 	public static boolean replyUpCase(Map params) {
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+		if (okHttpClient == null) {
+			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
+					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-		
-		
+
 		Map map = new HashMap<>();
-		
-		
-    	String param = JSON.toJSON(params).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(upUrl + "api/thirdApi/push/handleResult").addHeader("Authorization",getUpUser()).post(body).build();
-
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	return json.getBoolean("success");
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	
-		}
-        return false;
+
+		String param = JSON.toJSON(params).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(upUrl + "api/thirdApi/push/handleResult")
+				.addHeader("Authorization", getUpUser()).post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				return json.getBoolean("success");
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+
+		}
+		return false;
 	}
-	
 	public static boolean insertUpCase(Map params) {
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+		if (okHttpClient == null) {
+			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
+					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-		
-		
+
 		Map map = new HashMap<>();
-		
-		
-    	String param = JSON.toJSON(params).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(upUrl + "api/thirdApi/push/acceptEvt").addHeader("Authorization",getUpUser()).post(body).build();
-
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	return json.getBoolean("success");
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	
-		}
-        return false;
-	}
-	
-	
+		String param = JSON.toJSON(params).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(upUrl + "api/thirdApi/push/acceptEvt")
+				.addHeader("Authorization", getUpUser()).post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				return json.getBoolean("success");
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+
+		}
+		return false;
+	}
 	public static JSONObject getUpClass() {
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+		if (okHttpClient == null) {
+			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
+					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-		
-		
+
 		Map map = new HashMap<>();
-    	map.put("industryType", "01");
-		
-    	String param = JSON.toJSON(map).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/classList").addHeader("Authorization",getUpUser()).post(body).build();
-
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if(json.getBoolean("success")){
-            		
-            		for(Object object : json.getJSONArray("data")){
-            			JSONObject jsonObj = (JSONObject) object;
-            			
-            			
-            			if(jsonObj.getString("name").equals("")){
-            				
-            			}
-            			
-            			
-            		}
-            		
-            		
-            	}
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
+		map.put("industryType", "01");
+
+		String param = JSON.toJSON(map).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(upUrl + "api/thirdApi/basic/classList")
+				.addHeader("Authorization", getUpUser()).post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if (json.getBoolean("success")) {
+
+					for (Object object : json.getJSONArray("data")) {
+						JSONObject jsonObj = (JSONObject) object;
+
+						if (jsonObj.getString("name").equals("")) {
+
+						}
+
+					}
+
+				}
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
 		}
 		return null;
 	}
-	
-	public static JSONArray getCaseList(){
-		if(okHttpClient == null){
-			okHttpClient = new OkHttpClient.Builder()
-	                .connectTimeout(20, TimeUnit.SECONDS)
-	                .writeTimeout(20, TimeUnit.SECONDS)
-	                .readTimeout(30, TimeUnit.SECONDS)
-	                .build();
+
+	public static JSONArray getCaseList() {
+		if (okHttpClient == null) {
+			okHttpClient = new OkHttpClient.Builder().connectTimeout(20, TimeUnit.SECONDS)
+					.writeTimeout(20, TimeUnit.SECONDS).readTimeout(30, TimeUnit.SECONDS).build();
 		}
-		
-		
+
 		Map map = new HashMap<>();
-		
-		
-    	String param = JSON.toJSON(map).toString();
-    	
-    	RequestBody body = RequestBody.create(MediaType.parse("application/json"), param );
-
-        Request request = new Request.Builder().url(upUrl + "api/thirdApi/query/dispatchEvtList").addHeader("Authorization",getUpUser()).post(body).build();
-
-
-        try {
-            okhttp3.Response response = okHttpClient.newCall(request).execute();
-            String result = response.body().string();
-            
-            if(result != null){
-            	JSONObject json = JSON.parseObject(result);
-            	if(json.getBoolean("success")){
-            		return json.getJSONArray("data");
-            	}
-            }else{
-            	return null;
-            }
-            
-        }catch (Exception e) {
-        	e.printStackTrace();
-        	return null;
+
+		String param = JSON.toJSON(map).toString();
+
+		RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+
+		Request request = new Request.Builder().url(upUrl + "api/thirdApi/query/dispatchEvtList")
+				.addHeader("Authorization", getUpUser()).post(body).build();
+
+		try {
+			okhttp3.Response response = okHttpClient.newCall(request).execute();
+			String result = response.body().string();
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result);
+				if (json.getBoolean("success")) {
+					return json.getJSONArray("data");
+				}
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
 		}
 		return null;
 	}
-	
 	public static Object getAuth(String token) {
-		
-		return get(GETAUTH, null,token.replace("Bearer ", ""));
-	}
-
-
-
+		return get(GETAUTH, null, token.replace("Bearer ", ""));
+	}
 }
@@ -112,11 +112,11 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/common/download**").anonymous()
                 .antMatchers("/common/download/resource**").anonymous()
                 .antMatchers("/business/threestep/download/**").anonymous()
-                .antMatchers("/swagger-ui.html").anonymous()
-                .antMatchers("/swagger-resources/**").anonymous()
+//                .antMatchers("/swagger-ui.html").anonymous()
+//                .antMatchers("/swagger-resources/**").anonymous()
+//                .antMatchers("/*/api-docs").anonymous()
+//                .antMatchers("/druid/**").anonymous()
                 .antMatchers("/webjars/**").anonymous()
-                .antMatchers("/*/api-docs").anonymous()
-                .antMatchers("/druid/**").anonymous()
                 .antMatchers("/user/login").anonymous()
                 .antMatchers("/user/send/verify").anonymous()
 //                .antMatchers("/user/logout").anonymous()
@@ -120,11 +120,7 @@ public class SysLoginService
     public LoginUser loginByRemote(String token)
     {	
-    	    	OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .connectTimeout(20, TimeUnit.SECONDS)
-                .writeTimeout(20, TimeUnit.SECONDS)
-                .readTimeout(30, TimeUnit.SECONDS)
-                .build();
+    	OkHttpClient okHttpClient = RemoteServerUtils.getOkClient();
     	JSONObject userJson = null;
@@ -187,6 +187,14 @@ public class DriverTask {
 			paramsMap.put("type_" + i + "_timeout", arr[i * 3]);
 			paramsMap.put("type_" + i + "_season", arr[i * 3 + 1]);
 			paramsMap.put("type_" + i + "_pect", arr[i * 3 + 2]);
+		}		
+		
+		JSONArray areas = redisCache.getCacheObject("areaList");
+		Map<String, String> area = new HashMap<>();
+
+		for (Object object : areas) {
+			JSONObject json = (JSONObject) object;
+			area.put(json.getString("code"), json.getString("name"));
 		}
 		try{
@@ -247,7 +255,7 @@ public class DriverTask {
 			logs = logs.subList(0, (int) (logs.size() * pect));
 			for(CaseOffline l:logs){
-				insertData(l.getId() + "", "电子交办案卷:" + l.getSiteName(), type, "治理事务部", l.getLocationDec());
+				insertData(l.getId() + "", "电子交办案卷:" + l.getSiteName(), type, "治理事务部", area.get(l.getPlace()));
 			}
 		}catch(Exception e){
@@ -287,18 +295,12 @@ public class DriverTask {
-		JSONArray areas = redisCache.getCacheObject("areaList");
 		Gson g = new Gson();
 		JSONArray array;
-		Map<String, String> area = new HashMap<>();
-		for (Object object : areas) {
-			JSONObject json = (JSONObject) object;
-			area.put(json.getString("code"), json.getString("name"));
-		}
 		array = redisCache.getCacheObject("truckList");// 车辆
 		if (array != null && array.size() > 0) {
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAtJJlknsT/HvJ3/Ig9bR3DEbKupffarbTfmzqK2tjLQWTUWfO
+nrpT+mCTCQ7PstEY4RqfOqCxjGgq4h2CugR6ioLjg032x0gK5jKXabyOQXlI1FaO
+Sr5ZYo0r8IEnFplIKA3DGZEqDDrUYgEZmJI8kznTIyPq5nXjMoopMF8Gymc/IyjI
+lR359PTnoNLpNMWOKD5DvEn6Pb6JJidMHEGlAmLSVezAKdKFBcL7gyobv5C8OGcS
+rMvqr9ZqBRcxjXjPcSkZuBm4T0HL6YAxWSpQCNvrOPhgeR0rJcdqDdJX7SG4XpC/
+pF2gE53iEqgayobLQnLYe42uog1lk9m344jwdQIDAQABAoIBAQCdwtHvOozpqJVl
+jTvyr2rbVPZGM+5EY9s/t5SXvsj1Ssu88b75ur0oITwVS9V222yrLwEyzbaRf2kI
+CNRwBP2zCkwQKguTbIPpPwY+oTiAR6Czs7O55bhefAyJoa0u91itdeig680axkNM
+JL3iKNG3p2uqZfUSyKhpPYBi/IMITdiDOw6EzPJYgB9QLVnslanzxoKnHpkLvxTG
+vZlW6RqDyFov/orF8BsZ6bV/Qc+QLPk9CjvjYVoiTzrymgVviowfR9MtJpwFMr5F
+Q0DpL22XXZX2Qhcr3rHYqi1h3ohqez9pIqyMo9vaIySHOZQ1qWnya4PaUAy4jDOb
+VpMsY255AoGBANqiCGDSTUfbVw2wNpecbvWi6QJm1CiX5Dk3p/w+F9b8XFpjXl6l
+yfVM3xNbSNOgPZW8FuORWPFIi7GR8GbrJZMe5i0dwvJtj0NFh25EO14ygt+dOmRz
+KJQCXzUWIasmbiCj2ul9Ce8C8ttkcn4mz9NsFfYwyjncvocpWdj9l8cDAoGBANNv
+DogKzPGipDW8p5ysF8s5cLtkvtRYyAFy2td9FAZRe5c74tfsX52r8EtM1x62TIAH
+0caoXDpeVbjziUKuoR8uIIpO6g9ga3TQ7Nm9IWsvdVc9h3e+pMscqimqJ5M+Blwz
+avCdsvUT7W0gjNENRsikbuacnmw6fRbXi9CdEjUnAoGBAIy/LwGVoSaXL62iOSLV
+FCGR5MslA4O2dLfY+o3KM3K1N4cA3Wm09RSzjhBZ/cIvMDZKxblugoGiIDwKJWc8
+Dg5uH+P/etaybT3zbsIvrsBvaA0onMS51e+ir0PvoXEa5l6g3XbehhyWG13dhk9s
+EPKcbG727djeINHGbw7gAmudAoGAH2MwNA/uZryvRe7wrvh5O8kWLCuDjMB1SInF
+ZRIDZAC6qTPRtB45/40jyfnpQXzslGEUyjn6HwwcC63TpZuI/bj6Sa33XzsAGMJf
+Nt+101SjRcUzlBowGprxw+enolsl1JApgvjWNT21FGstnGctJ+IJOKDtf8GbCkYL
+UnfO2ScCgYBZeT+5v1e2PssloAUeFCWsZBCOChLVMcQ8gvZqRoPmB8IiI5kV0acI
+za9T0hWsCWrsJ8vuD/XSUljaRvk6nq9Y2tBn13KdITdqFu7zRCLpAy8LbiErF4Rm
+DSpL3IyYX1B/fzuUclCwp1sm4GIeSA1slxqCbqxRhcJ5wpJuO99W6A==
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEhjCCAm6gAwIBAgICEREwDQYJKoZIhvcNAQELBQAwbTELMAkGA1UEBhMCQ04x
+DjAMBgNVBAgMBUh1bmFuMREwDwYDVQQHDAhDaGFuZ3NoYTERMA8GA1UECgwIU3Ry
+ZWFtYXgxETAPBgNVBAsMCFN0cmVhbWF4MRUwEwYDVQQDDAwxODMuNjYuMjQyLjYw
+HhcNMjQwMTA5MDcyNDU0WhcNMjQwMjA4MDcyNDU0WjBtMQswCQYDVQQGEwJDTjEO
+MAwGA1UECAwFSHVuYW4xETAPBgNVBAcMCENoYW5nc2hhMREwDwYDVQQKDAhTdHJl
+YW1heDERMA8GA1UECwwIU3RyZWFtYXgxFTATBgNVBAMMDDE4My42Ni4yNDIuNjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSSZZJ7E/x7yd/yIPW0dwxG
+yrqX32q2035s6itrYy0Fk1Fnzp66U/pgkwkOz7LRGOEanzqgsYxoKuIdgroEeoqC
+44NN9sdICuYyl2m8jkF5SNRWjkq+WWKNK/CBJxaZSCgNwxmRKgw61GIBGZiSPJM5
+0yMj6uZ14zKKKTBfBspnPyMoyJUd+fT056DS6TTFjig+Q7xJ+j2+iSYnTBxBpQJi
+0lXswCnShQXC+4MqG7+QvDhnEqzL6q/WagUXMY14z3EpGbgZuE9By+mAMVkqUAjb
+6zj4YHkdKyXHag3SV+0huF6Qv6RdoBOd4hKoGsqGy0Jy2HuNrqINZZPZt+OI8HUC
+AwEAAaMwMC4wFwYDVR0RBBAwDoIAhwS3QvIGhwQKHhkdMBMGA1UdJQQMMAoGCCsG
+AQUFBwMBMA0GCSqGSIb3DQEBCwUAA4ICAQAxSefkJ5hXC/GB4lok98T2e/T8a4ve
+j91/flFsE5A5MGdqi+Hj6Xpg+3uPuI/X17DRm8Zlofnyr4O6aHfYJNob75cn6OUF
+HRi7MV24BY8fjLE0lYMaC51vdg5WDftoGDwHcVfRcVI1MFgNibBVIiYh+3RyhC7c
++WxhL6UJF1xrN5KCSHe1mGcZjwee4REcmKd1m5nZNQJAhCINeEEVQyHwrN1RYhn8
+aeHEdrN+qrLCCWpURyGQt+8+mhAkwMTt3WcyW67eq9IPfGL6J2z0V/gpCGZy9vhO
+GB3zonFazIeaGYJZXAg82ZHcVBNYh23XC6zqcSuvWigW6IVhStEImky7WFxG4M7y
+0uASmoTjbozkzwhblHBl1D3VodGJAYD4zSzMe0ZcCiaMGshHsK7x7wLwHywFwdFI
+yg5PpVISBosZE4YdI/F/3Dylft6lShO3uVqyX/alYcdHlJRaDVpVuJLFBT5r08BD
+LP/PJkFUayFyVq08X+Zn9n3zHvFbZqloA9dt9BCSYm6Ucl+JttdwufllbPeCqYnP
+KsFtaiBRmDUHLX83AHnvO4XaGKbQcUMqCTQmTJrhTw20lo8uTaugWmahPi11b+LK
+8BaqXUJucNzEUC37IWH0SgbWl75m9Frlvezsrl50NAL+7/aOEgxXen6mJAexBSON
+16BJ5xHG9whbPw==
+-----END CERTIFICATE-----
@@ -44,6 +44,19 @@ export function addTrack(data) {
   })
 }
+export function getTables(query) {
+  return request({
+    url: '/business/track/getTables',
+    method: 'get',
+    params: query
+  })
+}
+export function getAllDate() {
+  return request({
+    url: '/business/track/getAllDate',
+    method: 'get'
+  })
+}
 // 修改跟踪监督
 export function updateTrack(data) {
   return request({
+import {
+  listTrack,
+  getTrack,
+  delTrack,
+  addTrack,
+  updateTrack,
+  exportTrack,
+  getAllDate,
+  getTables,
+} from "@/api/business/track";
+
+import {
+  getArea,
+} from "@/api/dict";
+
+import companyInfo from "@/views/activiti/task/companyInfo";
+
+import logisticsInfo from "@/views/office/logistics/logisticsInfo";
+
+import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
+import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
+
+import {historyFromDataByTime} from '@/api/activiti/historyFormdata'
+
+export default {
+  name: "Track",
+  components: {
+    companyInfo,
+    logisticsInfo,
+    violationCaseFileInfo,
+    caseOfflineInfo
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 跟踪监督表格数据
+      trackList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      info0: false,
+      info1: false,
+      info2: false,
+      info3: false,
+      settings: null,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+        title: null,
+        place: null,
+        status: null,
+        objectId: null,
+        type: null
+      },
+      // 表单参数
+      form: {},
+      seasons:[],
+      areas: [],
+      years:[],
+      tableList:[],
+      activeName:"first"
+    };
+  },
+  created() {
+
+    getAllDate().then(res=>{
+      this.seasons = res.data.season;
+      this.years = res.data.year;
+    });
+
+    getArea().then(res => {
+      this.areas = res.result;
+    });
+
+    this.getList();
+  },
+  methods: {
+    printBody(tag){
+
+      let body = document.body;
+
+      document.body.innerHTML = document.getElementById(tag).innerHTML;
+
+      window.print();
+
+      window.location.reload();
+    },
+
+    showErrorTable(obj){
+      this.object = obj;
+
+
+      let data = {
+        createTime:obj.createTime,
+        updateTime:obj.updateTime,
+        businessKey:this.workflowType[obj.type] +":"+obj.id,
+      }
+
+      historyFromDataByTime(data).then(res=>{
+        this.formData = res.data;
+
+        this.errorTableShow = true;
+      });
+
+    },
+    showTable(obj){
+      this.object = obj;
+      let data = {
+        createTime:obj.createTime,
+        updateTime:obj.updateTime,
+        businessKey:"workflow_supervision:" + obj.id
+      }
+
+      historyFromDataByTime(data).then(res=>{
+        this.formData = res.data;
+        this.tableShow = true;
+      });
+
+    },
+    getInfo(type, objectId, id,obj) {
+      this.object = obj;
+      this.objectId = objectId;
+      this.id = id;
+      this.infoDialog = true;
+
+      if (type == 0) {
+        this.objectType = 2;
+        this.info0 = true;
+      } else if (type == 1) {
+        this.objectType = 3;
+        this.info0 = true;
+      } else if (type == 2) {
+        this.objectType = 0;
+        this.info0 = true;
+      } else if (type == 3) {
+        this.objectType = 4;
+        this.info0 = true;
+      } else if (type == 4) {
+        this.objectType = 1;
+        this.info0 = true;
+      } else if (type == 5) {
+        this.info1 = true;
+      } else if (type == 6) {
+
+        this.info2 = true;
+      } else if (type == 7) {
+        this.info3 = true;
+
+      }
+
+    },
+    getStatusName(value){
+      if(value == 0){
+        return "已提交";
+      }else if(value == 1){
+        return "通过";
+      }else if(value == 2){
+        return "审批驳回";
+      }else if(value == 3){
+        return "督办中";
+      }else if(value == 4){
+        return "已回复";
+      }else if(value == 5){
+        return "督办异常-驳回";
+      }
+    },
+    dialogClose() {
+
+      this.infoDialog = false;
+      this.info0 = false;
+      this.info1 = false;
+      this.info2 = false;
+      this.info3 = false;
+      this.getList();
+
+    },
+    update(state) {
+      let data = {
+        id: this.id,
+        status: state
+      };
+      if(state == 3){
+        data.title = this.form.title;
+        data.endTime = this.form.endTime;
+      }
+
+      updateTrack(data).then(res => {
+        if (res.code == 200) {
+          this.$message(res.message);
+          this.infoDialog = false;
+          this.errorDialog = false;
+
+          this.getList();
+        }
+      });
+    },
+
+    saveSettings() {
+      saveSettings(this.settings).then(res => {
+        if (res.code == 200) {
+
+          this.$message("保存成功");
+        }
+        this.settingsOpen = false;
+      });
+    },
+    /** 查询跟踪监督列表 */
+    getList() {
+      this.loading = true;
+      listTrack(this.queryParams).then(response => {
+        this.trackList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+
+      getTables(this.queryParams).then(res=>{
+        this.tableList = res.data;
+
+        for(let i in this.tableList){
+          if(this.tableList[i].type == 0){
+            this.tableList[i].type = "工地"
+          }
+          if(this.tableList[i].type == 1){
+            this.tableList[i].type = "消纳场"
+          }
+          if(this.tableList[i].type == 2){
+            this.tableList[i].type = "企业"
+          }
+          if(this.tableList[i].type == 3){
+            this.tableList[i].type = "合同"
+          }
+          if(this.tableList[i].type == 4){
+            this.tableList[i].type = "车辆"
+          }
+          if(this.tableList[i].type == 5){
+            this.tableList[i].type = "后勤管理"
+          }
+          if(this.tableList[i].type == 6){
+            this.tableList[i].type = "交办案卷"
+          }
+          if(this.tableList[i].type == 7){
+            this.tableList[i].type = "违规案卷"
+          }
+
+        }
+
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        type: null,
+        title: null,
+        dept: null,
+        place: null,
+        createBy: null,
+        createTime: null,
+        updateTime: null,
+        updateBy: null,
+        attach: null,
+        status: 0,
+        objectId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+
+    handleSelect(value) {
+      if (value == 99) {
+        getSettings().then(response => {
+          this.settings = response.data;
+          this.settingsOpen = true;
+        });
+        return;
+      }
+
+
+      this.queryParams.type = value;
+      this.getList();
+
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加跟踪监督";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getTrack(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改跟踪监督";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTrack(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTrack(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除跟踪监督编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delTrack(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有跟踪监督数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return exportTrack(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    }
+  }
+};
 <template>
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container" />
+    <div :class="{ hasTagsView: false }" class="main-container">
+      <tags-view v-if="needTagsView" />
       <app-main />
+
+    </div>
+  </div>
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
+import { mapState } from 'vuex'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -45,45 +52,56 @@ export default {
 </script>
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
-
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.preview figure {
+  float: left;
+  width: 30%;
+  height: calc(30vw - 0px);
+  margin: 1.5%;
+}
+
+.preview figure img {
+  width: 400px;
+}
 </style>
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{ hasTagsView: false }" class="main-container">
-      <tags-view v-if="needTagsView" />
       <app-main />
-
-    </div>
-  </div>
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
-import { mapState } from 'vuex'
 import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
+import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -52,56 +45,45 @@ export default {
 </script>
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
   }
-}
-
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth});
-  transition: width 0.28s;
-}
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px)
-}
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
-.mobile .fixed-header {
-  width: 100%;
-}
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
-.preview figure {
-  float: left;
-  width: 30%;
-  height: calc(30vw - 0px);
-  margin: 1.5%;
-}
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
-.preview figure img {
-  width: 400px;
-}
+  .mobile .fixed-header {
+    width: 100%;
+  }
 </style>
@@ -42,8 +42,8 @@ Vue.use(plugins)
 Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
-Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
-// Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
+Vue.prototype.remoteFrame = "https://183.66.242.6:14601"
+// Vue.prototype.remoteFrame = "https://175.6.47.84:8008"
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
@@ -16,7 +16,6 @@ const whiteList = [&#39;/login&#39;, &#39;/auth-redirect&#39;, &#39;/bind&#39;, &#39;/register&#39;]
 router.beforeEach((to, from, next) => {
   NProgress.start()
   var token = getToken();
-
   if(to.query.token && token && to.query.token.indexOf(token) == -1){
       removeToken();
       token = null;
@@ -205,7 +205,13 @@ export const constantRoutes = [
           component: (resolve) => require(['@/views/business/track'], resolve),
           name: '跟踪监督',
           meta: { title: '跟踪监督' }
-        },
+        },
+        {
+            path: 'trackTable',
+            component: (resolve) => require(['@/views/business/track/trackTable'], resolve),
+            name: '纪检报表',
+            meta: { title: '纪检报表' }
+          },
       {
         path: 'supervision/threestep',
         component: (resolve) => require(['@/views/business/threestep'], resolve),
+<template>
+  <div class="app-container">
+
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="年份" prop="year">
+        <el-select v-model="queryParams.year" placeholder="请选择年份 "  size="small">
+         <el-option v-for="item in years" :label="item" :value="item" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="季度" prop="season">
+        <el-select v-model="queryParams.season" placeholder="请选择季度 "  size="small">
+         <el-option v-for="item in seasons" :label="item" :value="item" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属区域" prop="place">
+        <el-select v-model="queryParams.place" placeholder="请选择所属区域 "  size="small">
+         <el-option v-for="item in areas" :label="item.name" :value="item.name" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="督办项目" prop="type">
+      <el-select v-model="queryParams.type" placeholder="督办项目" clearable size="small">
+        <el-option value="0" label="工地" />
+        <el-option value="1" label="消纳场"/>
+        <el-option value="2" label="企业"/>
+        <el-option value="3" label="合同"/>
+        <el-option value="4" label="车辆"/>
+        <el-option value="5" label="后勤管理"/>
+        <el-option value="6" label="交办案卷" />
+        <el-option value="7" label="违规案卷"/>
+      </el-select>
+
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+ <!--
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['workflow:track:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    -->
+ <el-tabs v-model="activeName">
+    <el-tab-pane label="督办统计" name="first">
+    <el-table v-loading="loading" :data="tableList" >
+      <el-table-column label="督办项目" prop="type" align="center" width="200"/>
+      <el-table-column label="总数" align="center" prop="count" >
+        <template slot-scope="scope">
+          <span>{{ !scope.row.count ? 0 : scope.row.count }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批中" align="center" prop="status0"  >
+        <template slot-scope="scope">
+          <span>{{ !scope.row.status0 ? 0 : scope.row.status0 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批完成" align="center" prop="status1"  >
+        <template slot-scope="scope">
+          <span>{{ !scope.row.status1 ? 0 : scope.row.status1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批驳回" align="center" prop="status2"  >
+        <template slot-scope="scope">
+          <span>{{ !scope.row.status2 ? 0 : scope.row.status2 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="异常审批中" align="center" prop="status3"  >
+        <template slot-scope="scope">
+          <span>{{ !scope.row.status3 ? 0 : scope.row.status3 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="异常审批完成" align="center" prop="status4"  >
+        <template slot-scope="scope">
+          <span>{{ !scope.row.status4 ? 0 : scope.row.status4 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="异常审批" align="center" prop="status5"  >
+        <template slot-scope="scope">
+          <span>{{ !scope.row.status5 ? 0 : scope.row.status5 }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+</el-tab-pane>
+    <el-tab-pane label="督办历史" name="second">
+    <el-table v-loading="loading" :data="trackList" >
+      <el-table-column label="序号" align="center" type="index" />
+      <el-table-column label="督查事项" align="center" prop="title" />
+      <el-table-column label="所属区域" align="center" prop="place" />
+      <el-table-column label="生成时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="督察时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="督察结果" align="center" prop="status" >
+        <template slot-scope="scope">
+            <span>
+              {{ getStatusName(scope.row.status)}}
+            </span>
+            <el-button v-if="scope.row.status == 1" @click="showTable(scope.row)">督查情况表</el-button>
+            <el-button v-if="scope.row.status == 4" @click="showErrorTable(scope.row)">整改交办单</el-button>
+          </template>
+        </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+</el-tab-pane>
+  </el-tabs>
+    <!-- 添加或修改跟踪监督对话框
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="类型 0工地 1消纳场 2企业 3合同 4车 5后勤管理 6电子交办案卷 7违规案卷" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型 0工地 1消纳场 2企业 3合同 4车 5后勤管理 6电子交办案卷 7违规案卷">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="督查事项" prop="title">
+          <el-input v-model="form.title" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="部门" prop="dept">
+          <el-input v-model="form.dept" placeholder="请输入部门" />
+        </el-form-item>
+        <el-form-item label="所属区域" prop="place">
+          <el-input v-model="form.place" placeholder="请输入所属区域" />
+        </el-form-item>
+        <el-form-item label="所属区域" prop="attach">
+          <el-input v-model="form.attach" placeholder="请输入所属区域" />
+        </el-form-item>
+        <el-form-item label="审批状态 0审批中 1审批通过 2审批驳回 3异常审批 4异常通过 5异常驳回">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="基础数据ID" prop="objectId">
+          <el-input v-model="form.objectId" placeholder="请输入基础数据ID" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>-->
+  </div>
+</template>
+
+
+
+<script src="../../../api/trackTable.js" />
+
+<style>
+  .bd_padding{
+    font-size: 14px;
+    padding:10px;
+  }
+
+  .bd_right {
+    border-right: 1px solid black;
+  }
+
+  .bd_left {
+    border-left: 1px solid black;
+  }
+
+  .bd_top {
+    border-top: 1px solid black;
+  }
+
+  .bd_bottom {
+    border-bottom: 1px solid black;
+  }
+</style>
@@ -82,7 +82,7 @@
       <el-table-column label="工地名称" align="center" prop="construction" />
       <el-table-column label="车牌号" align="center" prop="licensePlate" />
       <el-table-column label="运输企业" align="center" prop="company" />
-      <el-table-column label="处理场所" align="center" prop="earthsite" />
+      <el-table-column label="处理场所" align="center" prop="earthName" />
       <el-table-column label="激活时间" align="center" prop="activateTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.activateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -41,13 +41,14 @@ module.exports = {
         }
       },
         ['/api']: {
-          target: `http://183.66.242.6:14601`,
+          target: `https://183.66.242.6:14601`,
           // target: `http://175.6.47.84:8008`,
           changeOrigin: true,
         }
     },
-    disableHostCheck: true
+    disableHostCheck: true,
+    https: true,
   },
   configureWebpack: {
     name: name,
@@ -5,6 +5,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -24,6 +25,7 @@ import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
 import com.trash.business.domain.SupervisionTrack;
+import com.trash.business.mapper.SupervisionTrackMapper;
 import com.trash.business.service.ISupervisionTrackService;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
@@ -41,6 +43,8 @@ public class SupervisionTrackController extends BaseController
     @Autowired
     private ISupervisionTrackService supervisionTrackService;
+    @Autowired
+    private SupervisionTrackMapper mapper;
     /**
      * 查询跟踪监督列表
      */
@@ -51,6 +55,44 @@ public class SupervisionTrackController extends BaseController
         List<SupervisionTrack> list = supervisionTrackService.selectSupervisionTrackList(supervisionTrack);
         return getDataTable(list);
     }
+    
+    @GetMapping("/getAllDate")
+    public AjaxResult getAllDate(SupervisionTrack supervisionTrack)
+    {
+        startPage();
+        List<Map<String,String>> list = mapper.getAllDate();
+        
+        Map<String,List<String>> data = new HashMap<>();
+        
+        data.put("year", new ArrayList<String>());
+        data.put("season", new ArrayList<String>());
+        
+        for(Map<String,String> map : list){
+        	String y = map.get("month").split("-")[0];
+        	String m = map.get("month").split("-")[1];
+        	
+        	int season = (int)Math.ceil(Double.parseDouble(m) / 3);
+        	
+        	if(data.get("year").indexOf(y) == -1){
+        		data.get("year").add(y);
+        	}
+        	
+        	if(data.get("season").indexOf(y + "第" + season + "季度") == -1){
+        		data.get("season").add(y + "第" + season + "季度");
+        	}
+        }
+        
+        return AjaxResult.success(data);
+    }
+    
+    @GetMapping("/getTables")
+    public AjaxResult getTables(SupervisionTrack supervisionTrack)
+    {
+        List<Map<String,String>> list = mapper.getTables(supervisionTrack);
+        
+        
+        return AjaxResult.success(list);
+    }
     /**
      * 查询跟踪监督列表
@@ -44,9 +44,38 @@ public class SupervisionTrack extends BaseEntity
     @Excel(name = "基础数据ID")
     private String objectId;
+    String year;
+    
+    String season;
+    
     String endTime;
+    
-    @Override
+    public String getYear() {
+		return year;
+	}
+
+	public void setYear(String year) {
+		this.year = year;
+	}
+
+	public String getSeason() {
+		return season;
+	}
+
+	public void setSeason(String season) {
+		
+		String[] arr = season.replace("第", "-").replace("季度", "").split("-");
+		
+		String year = arr[0];
+		int s = Integer.parseInt(arr[1]);
+		
+		String b = " STR_TO_DATE('" + year +"-"+  ((s-1)*3 +1) +"'," + "'%Y-%m')" +  " and STR_TO_DATE('" + year +"-"+  (s*3) +"'," + "'%Y-%m')";
+		
+		this.season = b;
+	}
+
+	@Override
     public String getEndTime() {
     	// TODO Auto-generated method stub
     	return super.getEndTime();
 package com.trash.business.mapper;
 import java.util.List;
+import java.util.Map;
+
 import com.trash.business.domain.SupervisionTrack;
 /**
@@ -58,4 +60,9 @@ public interface SupervisionTrackMapper
      * @return 结果
      */
     int deleteSupervisionTrackByIds(Long[] ids);
+    
+    List<Map<String, String>> getAllDate();
+
+    List<Map<String, String>> getTables(SupervisionTrack supervisionTrack);
+    
 }
@@ -98,8 +98,30 @@ public class CaseOffline extends BaseEntity
     private List<String> names;
+
+    private List<String> cArea;
+    
+    private List<String> eArea;
+    
-    public List<String> getNames() {
+    
+    public List<String> getcArea() {
+		return cArea;
+	}
+
+	public void setcArea(List<String> cArea) {
+		this.cArea = cArea;
+	}
+
+	public List<String> geteArea() {
+		return eArea;
+	}
+
+	public void seteArea(List<String> eArea) {
+		this.eArea = eArea;
+	}
+
+	public List<String> getNames() {
 		return names;
 	}
@@ -88,20 +88,33 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
 		JSONArray earthList = redisCache.getCacheObject("earthSitesList");
 		JSONArray construList = redisCache.getCacheObject("constructionList");
-		for(Object obj:earthList){
-			JSONObject jsonObject = (JSONObject) obj;
-			if(eLish.indexOf(jsonObject.getString("id")) > -1 || eArea.indexOf(jsonObject.getString("areaCode"))> -10){
-				names.add(jsonObject.getString("name"));
+		if(cArea.size() > 0){
+			
+			caseOffline.setcArea(cArea);
+			
+		}else{
+			
+			for(Object obj:construList){
+				JSONObject jsonObject = (JSONObject) obj;
+				if(cLish.indexOf(jsonObject.getString("id")) > -1){
+					names.add(jsonObject.getString("name"));
+				}
 			}
+			
 		}
-		for(Object obj:construList){
-			JSONObject jsonObject = (JSONObject) obj;
-			if(cLish.indexOf(jsonObject.getString("id")) > -1 || cArea.indexOf(jsonObject.getString("areaCode"))> -1){
-				names.add(jsonObject.getString("name"));
+		if(eArea.size() > 0){
+			caseOffline.seteArea(eArea);
+		}else{
+			for(Object obj:earthList){
+				JSONObject jsonObject = (JSONObject) obj;
+				if(eLish.indexOf(jsonObject.getString("id")) > -1){
+					names.add(jsonObject.getString("name"));
+				}
 			}
 		}
-		if(names.size() == 0){
+		
+		if(names.size() == 0 && cArea.size() == 0 && eArea.size() == 0){
 			return list;
 		}else{
 			caseOffline.setNames(names);
@@ -47,14 +47,17 @@ public class ViolationCaseFile extends BaseEntity
     private String violationType;
     /** 违规等级 */
+    @Excel(name = "违规等级")
     private String violationGrade;
     /** 企业名称 */
+    @Excel(name = "企业名称")
     private String companyName;
     /** 违规描述 */
+    @Excel(name = "违规描述")
     private String describe;
     /** 推送对象 */
@@ -69,12 +72,14 @@ public class ViolationCaseFile extends BaseEntity
     private Integer status;
     /** 接收人 */
+    @Excel(name = "接收人")
     private String receive;
     /** 接收状态 */
     private Integer receiveStatus;
     /** 阅览人 */
+    @Excel(name = "发送人")
     private String readBy;
     /** 阅览时间 */
@@ -31,9 +31,90 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="place != null  and place != ''"> and place = #{place}</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="objectId != null  and objectId != ''"> and object_id = #{objectId}</if>
+            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+            <if test="season != null"> and create_time BETWEEN ${season}</if>
         </where>
     </select>
+        <select id="getTables" parameterType="SupervisionTrack" resultType="java.util.HashMap">
+        
+            select * from (select  type,count(*) as 'count' from supervision_track 
+            	 <where>  
+		            <if test="place != null  and place != ''"> and place = #{place}</if>
+		            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+		            <if test="season != null"> and create_time BETWEEN ${season}</if>
+		        </where>
+            GROUP BY type) a
+			left JOIN (
+			select type,count(*) as 'status0' from supervision_track 
+				<where>  
+					status = 0 
+		            <if test="place != null  and place != ''"> and place = #{place}</if>
+		            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+		            <if test="season != null"> and create_time BETWEEN ${season}</if>
+		        </where>
+			 GROUP BY type) b
+			on b.type = a.type
+			left JOIN (
+			select type,count(*) as 'status1' from supervision_track 
+				
+				<where>  
+					status = 1 
+		            <if test="place != null  and place != ''"> and place = #{place}</if>
+		            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+		            <if test="season != null"> and create_time BETWEEN ${season}</if>
+		        </where>
+		        
+		        GROUP BY type) c
+			on c.type = a.type
+			left JOIN (
+			select type,count(*) as 'status2' from supervision_track 
+				<where>  
+					status = 2 
+		            <if test="place != null  and place != ''"> and place = #{place}</if>
+		            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+		            <if test="season != null"> and create_time BETWEEN ${season}</if>
+		        </where>
+		         GROUP BY type) d
+			on c.type = d.type
+			left JOIN (
+			select type,count(*) as 'status3' from supervision_track 
+				<where>  
+					status = 3 
+		            <if test="place != null  and place != ''"> and place = #{place}</if>
+		            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+		            <if test="season != null"> and create_time BETWEEN ${season}</if>
+		        </where>
+		         GROUP BY type) e
+			on b.type = a.type
+			left JOIN (
+			select type,count(*) as 'status4' from supervision_track 
+				<where>  
+					status = 4 
+		            <if test="place != null  and place != ''"> and place = #{place}</if>
+		            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+		            <if test="season != null"> and create_time BETWEEN ${season}</if>
+		        </where>
+		         GROUP BY type) f
+			on c.type = a.type
+			left JOIN (
+			select type,count(*) as 'status5' from supervision_track 
+				<where>  
+					status = 5 
+		            <if test="place != null  and place != ''"> and place = #{place}</if>
+		            <if test="year != null "> and DATE_FORMAT(create_time ,"%Y") = #{year}</if>
+		            <if test="season != null"> and create_time BETWEEN ${season}</if>
+		        </where>
+		         GROUP BY type) g
+			on c.type = d.type
+        
+    </select>
+    
+    
+
+    
+    
+    
     <select id="selectSupervisionTrackById" parameterType="Long" resultMap="SupervisionTrackResult">
         <include refid="selectSupervisionTrackVo"/>
         where id = #{id}
@@ -78,6 +159,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </trim>
         where id = #{id}
     </update>
+    
+    <select id="getAllDate" resultType="java.util.HashMap">
+        select DATE_FORMAT(create_time , "%Y") as 'year',DATE_FORMAT(create_time , "%Y-%m") as 'month' from supervision_track GROUP BY DATE_FORMAT(create_time , "%Y-%m");
+    </select>
+    
     <delete id="deleteSupervisionTrackById" parameterType="Long">
         delete from supervision_track where id = #{id}
@@ -37,12 +37,41 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="place != null  and place != ''"> and place = #{place}</if>
             <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
-            <if test="names != null "> 
+            <if test="names != null and names.size() > 0"> 
             	and site_name in 
 			        <foreach item="name" collection="names" open="(" separator="," close=")">
 			            #{name}
 			        </foreach>
 			</if>
+			 <if test="cArea != null and cArea.size() > 0 and eArea != null and eArea.size() > 0"> 
+            	and 1 = 1 and ((place in 
+			        <foreach item="name" collection="cArea" open="(" separator="," close=")">
+			            #{name}
+			        </foreach>
+			         and site_type = 0)
+	            	or (place in 
+				        <foreach item="name" collection="eArea" open="(" separator="," close=")">
+				            #{name}
+				        </foreach>
+				        and site_type = 1
+				        )
+				)
+			</if>
+			 <if test="cArea != null and cArea.size() > 0 and (eArea == null or eArea.size() == 0)"> 
+            	and place in 
+			        <foreach item="name" collection="cArea" open="(" separator="," close=")">
+			            #{name}
+			        </foreach>
+			         and site_type = 0
+	            	
+			</if>
+			<if test="eArea != null and eArea.size() > 0 and (cArea == null or cArea.size() == 0)"> 
+            	and place in 
+			        <foreach item="name" collection="cArea" open="(" separator="," close=")">
+			            #{name}
+			        </foreach>
+			         and site_type = 1
+			</if>
             <if test="createTime != null "> and create_time > #{createTime}</if>
         </where>