m

youxiw2000
2 parents 4c23c208 946fbbae
Showing 15 changed files with 2733 additions and 1305 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-ui/src/api/unit/dropPointInfo.js
trash-ui/src/views/unit/businessUnit/index.vue
trash-ui/src/views/unit/carInfo/index.vue
trash-ui/src/views/unit/carInfo/info.vue
trash-ui/src/views/unit/disposalSite/index.vue
trash-ui/src/views/unit/driver/index.vue
trash-ui/src/views/unit/dropPointInfo/index.vue
trash-ui/src/views/unit/enterprise/index.vue
trash-unit/src/main/java/com/trash/dropPointInfo/controller/DropPointInfoController.java
trash-unit/src/main/java/com/trash/dropPointInfo/domain/DropPointInfo.java
trash-unit/src/main/java/com/trash/dropPointInfo/mapper/DropPointInfoMapper.java
trash-unit/src/main/java/com/trash/dropPointInfo/service/IDropPointInfoService.java
trash-unit/src/main/java/com/trash/dropPointInfo/service/impl/DropPointInfoServiceImpl.java
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
-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 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.utils.spring.SpringUtils;
-import com.trash.common.utils.util.PostSms;
-import com.trash.common.utils.vo.mt.JsonSmsSend;
-import com.trash.common.utils.vo.mt.Mobile;
-
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-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;
-
-	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/ 留一下...
-	public static String constructionLicenseById = "/api/siteservice/cs/constructionsites/";
-
-	public static String ConstructionList = "/api/siteservice/cs/constructionsites/search";
-	public static String ConstructionLedgerList = "/api/siteservice/cs/constructionsites/ledger/list";
-
-	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;
-		try {
-			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");
-		}
-
-		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");
-		}
-
-		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");
-		}
-
-		return list;
-	}
-
-	public static JSONArray getEarthSitesList(Map map, String token) {
-		JSONArray list = null;
-		Object object = post(EarthSitesList, map, token);
-
-		if (object != null) {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			list = jsonObject.getJSONArray("list");
-		}
-
-		return list;
-	}
-	
-	public static JSONArray getConstructionLedgerList(Map map) {
-		JSONArray list = null;
-		Object object = post(ConstructionLedgerList, map);
-
-		if (object != null) {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			list = jsonObject.getJSONArray("list");
-		}
-
-		return list;
-	}
-
-	public static JSONArray getConstructionList(Map map) {
-		JSONArray list = null;
-		Object object = post(ConstructionList, map);
-
-		if (object != null) {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			list = jsonObject.getJSONArray("list");
-		}
-
-		return list;
-	}
-	
-	public static JSONArray getConstructionLedgerList(Map map, String token) {
-		JSONArray list = null;
-		Object object = post(ConstructionLedgerList, map,token);
-
-		if (object != null) {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			list = jsonObject.getJSONArray("list");
-		}
-
-		return list;
-	}
-
-	public static JSONArray getConstructionList(Map map, String token) {
-		JSONArray list = null;
-		Object object = post(ConstructionList, map, token);
-
-		if (object != null) {
-			JSONObject jsonObject = JSON.parseObject(object.toString());
-			list = jsonObject.getJSONArray("list");
-		}
-
-		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");
-		}
-
-		return turckList;
-	}
-
-	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);
-
-		return object;
-	}
-
-	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);
-		return object;
-	}
-
-	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);
-		return object;
-	}
-
-	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);
-		return object;
-	}
-
-	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);
-
-		return object;
-	}
-
-	public static JSONObject getEarthSitesInfo(String id) {
-		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);
-
-		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) {
-			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) {
-			turckList = JSON.parseObject(object.toString());
-			return turckList;
-		}
-
-		return turckList;
-
-	}
-
-	public static JSONObject getConstructionInfo(String id) {
-		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");
-		}
-
-		return turckList;
-	}
-
-	public static Object updateCompanyList(List<Map> 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());
-		}
-
-		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());
-		}
-
-		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");
-		}
-
-		return turckList;
-	}
-
-	public static Object updateTruckList(List<Map> 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");
-		}
-
-		return turckList;
-	}
-
-	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);
-
-		return object;
-	}
-
-	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);
-
-		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);
-
-		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) {
-			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");
-		}
-
-		return turckList;
-	}
-
-	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());
-		}
-
-		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());
-		}
-
-		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");
-		}
-
-		return turckList;
-	}
-
-	public static Object updateTruckList(List<Map> updateList, String token) {
-		JSONArray turckList = null;
-		Object object = post(UpdateTruckRequestPath, updateList, token);
-
-		return object;
-	}
-
-	// 实现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;
-	}
-
-	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;
-		}
-
-		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 = getOkClient();
-		}
-
-		
-		if (token.contains("durable:")) {
-			token = "Bearer " + token.replaceAll("durable:", "");
-		} 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 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();
-//		}
-		
-//		.sslSocketFactory(createSSLSocketFactory(), x509TrustManager)
-
-		okHttpClient = new OkHttpClient.Builder()
-				.connectTimeout(20, TimeUnit.SECONDS).writeTimeout(20, TimeUnit.SECONDS)
-				.readTimeout(30, TimeUnit.SECONDS).build();
-		
-		return okHttpClient;
-	}
-
-	public static Object get(String url, Map<String, String> obj, String token) {
-		if (okHttpClient == null) {
-
-
-			okHttpClient = getOkClient();
-		}
-
-		if (token.contains("durable:")) {
-			token = "Bearer " + token.replaceAll("durable:", "");
-		} 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;
-	}
-
-	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;
-		}
-
-		return turckList;
-	}
-	
-	
-	public static JSONArray getDriverList() {
-
-		try {
-			Map map = new HashMap<>();
-			Object result = get(DriverListPath, null);
-
-			if (result != null) {
-				JSONObject json = JSON.parseObject(result.toString());
-				return json.getJSONArray("list");
-
-			} else {
-				return null;
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			return null;
-		}
-	}
-
-	public static JSONArray getDriverList(String token) {
-
-		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();
-		}
-
-		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();
-		}
-
-		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();
-		}
-
-		Map map = new HashMap<>();
-
-		map.put("userName", "市渣土管理系统");
-		map.put("password", "mwcfVIiTfWttBJL02O+CGw==");
-		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();
-		}
-
-		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;
-	}
-
-	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();
-		}
-
-		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;
-	}
-
-	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();
-		}
-
-		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;
-	}
-
-	public static JSONObject getUpClass() {
-		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;
-		}
-		return null;
-	}
-	
-
-	public static boolean delayUpCase(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/push/delayApply")
-				.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.getBoolean("success");
-				}
-			} else {
-				return false;
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-		return false;
-	}
-
-	
-	public static boolean deleteUpCase(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/push/rollbackApply")
-				.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.getBoolean("success");
-				}
-			} else {
-				return false;
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-		return false;
-	}
-	
-	
-	
-	public static JSONArray getUpCaseResult() {
-		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/handleResultList")
-				.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 JSONArray getUpCaseState(String url) {
-			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 + url)
-					.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 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;
-		}
-		return null;
-	}
-
-	public static Object getAuth(String token) {
-
-		return get(GETAUTH, null, token.replace("Bearer ", ""));
-	}
-
-	
-	
-	
-
-}
+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 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.utils.spring.SpringUtils;
+import com.trash.common.utils.util.PostSms;
+import com.trash.common.utils.vo.mt.JsonSmsSend;
+import com.trash.common.utils.vo.mt.Mobile;
+
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+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;
+
+	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/ 留一下...
+	public static String constructionLicenseById = "/api/siteservice/cs/constructionsites/";
+
+	public static String ConstructionList = "/api/siteservice/cs/constructionsites/search";
+	public static String ConstructionLedgerList = "/api/siteservice/cs/constructionsites/ledger/list";
+
+	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;
+		try {
+			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");
+		}
+
+		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");
+		}
+
+		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");
+		}
+
+		return list;
+	}
+
+	public static JSONArray getEarthSitesList(Map map, String token) {
+		JSONArray list = null;
+		Object object = post(EarthSitesList, map, token);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		return list;
+	}
+	
+	public static JSONArray getConstructionLedgerList(Map map) {
+		JSONArray list = null;
+		Object object = post(ConstructionLedgerList, map);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		return list;
+	}
+
+	public static JSONArray getConstructionList(Map map) {
+		JSONArray list = null;
+		Object object = post(ConstructionList, map);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		return list;
+	}
+	
+	public static JSONArray getConstructionLedgerList(Map map, String token) {
+		JSONArray list = null;
+		Object object = post(ConstructionLedgerList, map,token);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		return list;
+	}
+
+	public static JSONArray getConstructionList(Map map, String token) {
+		JSONArray list = null;
+		Object object = post(ConstructionList, map, token);
+
+		if (object != null) {
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		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");
+		}
+
+		return turckList;
+	}
+
+	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);
+
+		return object;
+	}
+
+	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);
+		return object;
+	}
+
+	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);
+		return object;
+	}
+
+	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);
+		return object;
+	}
+
+	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);
+
+		return object;
+	}
+
+	public static JSONObject getEarthSitesInfo(String id) {
+		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);
+
+		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) {
+			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) {
+			turckList = JSON.parseObject(object.toString());
+			return turckList;
+		}
+
+		return turckList;
+
+	}
+
+	public static JSONObject getConstructionInfo(String id) {
+		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");
+		}
+
+		return turckList;
+	}
+
+	public static Object updateCompanyList(List<Map> 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());
+		}
+
+		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());
+		}
+
+		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");
+		}
+
+		return turckList;
+	}
+
+	public static Object updateTruckList(List<Map> 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");
+		}
+
+		return turckList;
+	}
+
+	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);
+
+		return object;
+	}
+
+	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);
+
+		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);
+
+		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) {
+			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");
+		}
+
+		return turckList;
+	}
+
+	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());
+		}
+
+		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());
+		}
+
+		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");
+		}
+
+		return turckList;
+	}
+
+	public static Object updateTruckList(List<Map> updateList, String token) {
+		JSONArray turckList = null;
+		Object object = post(UpdateTruckRequestPath, updateList, token);
+
+		return object;
+	}
+
+	// 实现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;
+	}
+
+	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;
+		}
+
+		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 = getOkClient();
+		}
+
+		
+		if (token.contains("durable:")) {
+			token = "Bearer " + token.replaceAll("durable:", "");
+		} 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 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();
+//		}
+		
+//		.sslSocketFactory(createSSLSocketFactory(), x509TrustManager)
+
+		okHttpClient = new OkHttpClient.Builder()
+				.connectTimeout(20, TimeUnit.SECONDS).writeTimeout(20, TimeUnit.SECONDS)
+				.readTimeout(30, TimeUnit.SECONDS).build();
+		
+		return okHttpClient;
+	}
+
+	public static Object get(String url, Map<String, String> obj, String token) {
+		if (okHttpClient == null) {
+
+
+			okHttpClient = getOkClient();
+		}
+		if (token.contains("durable:")) {
+			token = "Bearer " + token.replaceAll("durable:", "");
+		} 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;
+	}
+
+	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;
+		}
+
+		return turckList;
+	}
+	
+	
+	public static JSONArray getDriverList() {
+
+		try {
+			Map map = new HashMap<>();
+			Object result = get(DriverListPath, null);
+
+			if (result != null) {
+				JSONObject json = JSON.parseObject(result.toString());
+				return json.getJSONArray("list");
+
+			} else {
+				return null;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	public static JSONArray getDriverList(String token) {
+
+		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();
+		}
+
+		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();
+		}
+
+		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();
+		}
+
+		Map map = new HashMap<>();
+
+		map.put("userName", "市渣土管理系统");
+		map.put("password", "mwcfVIiTfWttBJL02O+CGw==");
+		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();
+		}
+
+		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;
+	}
+
+	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();
+		}
+
+		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;
+	}
+
+	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();
+		}
+
+		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;
+	}
+
+	public static JSONObject getUpClass() {
+		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;
+		}
+		return null;
+	}
+	
+
+	public static boolean delayUpCase(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/push/delayApply")
+				.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.getBoolean("success");
+				}
+			} else {
+				return false;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+		return false;
+	}
+
+	
+	public static boolean deleteUpCase(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/push/rollbackApply")
+				.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.getBoolean("success");
+				}
+			} else {
+				return false;
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+		return false;
+	}
+	
+	
+	
+	public static JSONArray getUpCaseResult() {
+		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/handleResultList")
+				.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 JSONArray getUpCaseState(String url) {
+			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 + url)
+					.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 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;
+		}
+		return null;
+	}
+
+	public static Object getAuth(String token) {
+
+		return get(GETAUTH, null, token.replace("Bearer ", ""));
+	}
+
+	
+	
+	
+
+}
+import request from '@/utils/request'
+
+// 查询投放点信息管理列表
+export function listDropPointInfo(query) {
+  return request({
+    url: '/unit/dropPointInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询投放点信息管理详细
+export function getDropPointInfo(id) {
+  return request({
+    url: '/unit/dropPointInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增投放点信息管理
+export function addDropPointInfo(data) {
+  return request({
+    url: '/unit/dropPointInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改投放点信息管理
+export function updateDropPointInfo(data) {
+  return request({
+    url: '/unit/dropPointInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除投放点信息管理
+export function delDropPointInfo(id) {
+  return request({
+    url: '/unit/dropPointInfo/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出投放点信息管理
+export function exportDropPointInfo(query) {
+  return request({
+    url: '/unit/dropPointInfo/export',
+    method: 'get',
+    params: query
+  })
+}
 \ No newline at end of file
@@ -264,7 +264,7 @@ export default {
         }).then(function() {
           return exportEnterprise(queryParams);
         }).then(response => {
-          this.download(response.msg);
+          this.download(response.message);
         })
     }
   }
@@ -281,7 +281,7 @@ export default {
         }).then(function() {
           return exportCarInfo(queryParams);
         }).then(response => {
-          this.download(response.msg);
+          this.download(response.message);
         })
     }
   }
@@ -677,6 +677,12 @@ export default {
             });
             return;
           }
+          if(this.drivers.length===0){
+            return this.$message({
+              message: '请选择驾驶员！',
+              type: 'warning'
+            });
+          }
           this.form.drivers = this.drivers.join(",");
           this.roadTransport.forEach(item => {
             if (item.raw != null) {
@@ -290,7 +290,7 @@ export default {
         }).then(function() {
           return exportDisposalSite(queryParams);
         }).then(response => {
-          this.download(response.msg);
+          this.download(response.message);
         })
     }
   }
@@ -258,7 +258,7 @@ export default {
         }).then(function() {
           return exportDriver(queryParams);
         }).then(response => {
-          this.download(response.msg);
+          this.download(response.message);
         })
     }
   }
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
+      <el-form-item label="投放点名称" prop="dropPointName">
+        <el-input
+          v-model="queryParams.dropPointName"
+          placeholder="请输入投放点名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="详细地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入详细地址"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="投放点形式" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择投放点形式" clearable size="small">
+          <el-option label="全部" value=""/>
+          <el-option label="固定" value="固定"/>
+          <el-option label="临时" value="临时"/>
+        </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="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['unit:dropPointInfo:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['unit:dropPointInfo:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['unit:dropPointInfo:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['unit:dropPointInfo:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dropPointInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="投放点名称" align="center" prop="dropPointName"/>
+      <el-table-column label="所属区域" align="center" prop="district"/>
+      <el-table-column label="所属街道" align="center" prop="street"/>
+      <el-table-column label="社区" align="center" prop="community"/>
+      <el-table-column label="详细地址" align="center" prop="address"/>
+      <el-table-column label="投放点形式" align="center" prop="type"/>
+      <el-table-column label="投放点面积(m²)" align="center" prop="area"/>
+      <el-table-column label="投放点容量(m³)" align="center" prop="capacity"/>
+      <el-table-column label="管理单位" align="center" prop="managementUnit"/>
+      <el-table-column label="管理人" align="center" prop="custodian"/>
+      <el-table-column label="管理员电话" align="center" prop="custodianPhone"/>
+      <el-table-column label="投放时间" align="center" prop="dropTime" width="180"/>
+      <el-table-column label="投放点编号" align="center" prop="dropPointNo"/>
+      <el-table-column label="运营单位" align="center" prop="operatingUnit"/>
+      <el-table-column label="运输单位" align="center" prop="transportUnit"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}-{i}-{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['unit:dropPointInfo:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['unit:dropPointInfo:remove']"
+          >删除
+          </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-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="128px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="投放点编号" prop="dropPointNo">
+              <el-input v-model="form.dropPointNo" placeholder="请输入投放点编号" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="投放点名称" prop="dropPointName">
+              <el-input v-model="form.dropPointName" placeholder="请输入投放点名称"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属区域" prop="street">
+              <el-select v-model="form.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets">
+                <el-option v-for="(area,index) in areas" :label="area.name" :value="area.name" :key="index"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属街道" prop="street">
+              <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable>
+                <el-option v-for="(area,index) in streets" :label="area.name" :value="area.name" :key="area.code" @click.native="createDropPointNo(area)"/>
+              </el-select>
+            </el-form-item>
+
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="社区" prop="community">
+              <el-input v-model="form.community" placeholder="请输入社区"/>
+            </el-form-item>
+
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="详细地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入详细地址"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="投放点形式" prop="type">
+              <el-select v-model="form.type" placeholder="请选择投放点形式" style="width: 100%">
+                <el-option label="固定" value="固定"/>
+                <el-option label="临时" value="临时"/>
+              </el-select>
+            </el-form-item>
+
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="投放点面积(m²)" prop="area">
+              <el-input v-model="form.area" placeholder="请输入投放点面积"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="投放点容量(m³)" prop="capacity">
+              <el-input v-model="form.capacity" placeholder="请输入投放点容量"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理单位" prop="managementUnit">
+              <el-input v-model="form.managementUnit" placeholder="请输入管理单位"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="管理人" prop="custodian">
+              <el-input v-model="form.custodian" placeholder="请输入管理人"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理员电话" prop="custodianPhone">
+              <el-input v-model="form.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="投放时间" prop="dropTime">
+              <el-time-select
+                v-model="form.dropTime"
+                style="width: 100%"
+                :picker-options="{
+                    start: '00:00',
+                    step: '00:30',
+                    end: '23:30'
+                  }"
+                placeholder="选择时间">
+              </el-time-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="运营单位" prop="operatingUnit">
+              <el-input v-model="form.operatingUnit" placeholder="请输入运营单位"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="运输单位" prop="transportUnit">
+              <el-input v-model="form.transportUnit" placeholder="请输入运输单位"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
+import {
+  listDropPointInfo,
+  getDropPointInfo,
+  delDropPointInfo,
+  addDropPointInfo,
+  updateDropPointInfo,
+  exportDropPointInfo
+} from "@/api/unit/dropPointInfo";
+import {getAreaList} from "@/api/casefile/remoteServer";
+
+export default {
+  name: "DropPointInfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 投放点信息管理表格数据
+      dropPointInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dropPointName: null,
+        address: null,
+        type: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dropPointName: [
+          {required: true, message: "请输入投放点名称", trigger: "blur"}
+        ],
+        district: [
+          {required: true, message: "请输入所属区域", trigger: "blur"}
+        ],
+        street: [
+          {required: true, message: "请输入所属街道", trigger: "blur"}
+        ],
+        community: [
+          {required: true, message: "请输入社区", trigger: "blur"}
+        ],
+        address: [
+          {required: true, message: "请输入详细地址", trigger: "blur"}
+        ],
+        type: [
+          {required: true, message: "请选择投放点形式", trigger: "change"}
+        ],
+        area: [
+          {required: true, message: "请输入投放点面积", trigger: "blur"},
+          //只能填写数字、小数
+          {pattern: /^[0-9]+(\.[0-9]{1,2})?$/, message: "只能填写数字、小数,限制两位小数", trigger: "blur"}
+        ],
+        capacity: [
+          {required: true, message: "请输入投放点容量", trigger: "blur"},
+          //只能填写数字
+          {pattern: /^[0-9]+(\.[0-9]{1,2})?$/, message: "只能填写数字、小数,限制两位小数", trigger: "blur"}
+        ],
+        managementUnit: [
+          {required: true, message: "请输入管理单位", trigger: "blur"}
+        ],
+        custodian: [
+          {required: true, message: "请输入管理人", trigger: "blur"}
+        ],
+        custodianPhone: [
+          {required: true, message: "请输入管理员电话", trigger: "blur"},
+          {
+            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            message: '手机号格式错误',
+            trigger: 'change'
+          }
+        ],
+        dropTime: [
+          {required: true, message: "请选择投放时间", trigger: "change"}
+        ],
+        operatingUnit: [
+          {required: true, message: "请输入运营单位", trigger: "blur"}
+        ],
+        transportUnit: [
+          {required: true, message: "请输入运输单位", trigger: "blur"}
+        ]
+      },
+      areas: [
+        {
+          name: "芙蓉区",
+          streets: [
+            {code: "F01", name: "湘湖"},
+            {code: "F02", name: "定王台街道"},
+            {code: "F03", name: "韭菜园街道"},
+            {code: "F04", name: "文艺路街道"},
+            {code: "F05", name: "朝阳街道"},
+            {code: "F06", name: "五里牌街道"},
+            {code: "F07", name: "马王堆街道"},
+            {code: "F08", name: "荷花园街道"},
+            {code: "F09", name: "东屯渡街道"},
+            {code: "F10", name: "火星街道"},
+            {code: "F11", name: "东岸街道"},
+            {code: "F12", name: "马坡岭街道"},
+            {code: "F13", name: "东湖街道"}
+          ]
+        },
+        {
+          name: "天心区",
+          streets: [
+            {code: "T01", name: "坡子街街道"},
+            {code: "T02", name: "城南路街道"},
+            {code: "T03", name: "裕南街街道"},
+            {code: "T04", name: "赤岭路街道"},
+            {code: "T05", name: "金盆岭街道"},
+            {code: "T06", name: "新开铺街道"},
+            {code: "T07", name: "文源街道"},
+            {code: "T08", name: "桂花坪街道"},
+            {code: "T09", name: "青园街道"},
+            {code: "T10", name: "黑石铺街道"},
+            {code: "T11", name: "大托铺街道"},
+            {code: "T12", name: "先锋街道"},
+            {code: "T13", name: "南托街道"},
+            {code: "T14", name: "暮云街道"}
+          ]
+        },
+        {
+          name: "开福区",
+          streets: [
+            {code: "K01", name: "望麓园街道"},
+            {code: "K02", name: "清水塘街道"},
+            {code: "K03", name: "湘雅路街道"},
+            {code: "K04", name: "伍家岭街道"},
+            {code: "K05", name: "新河街道"},
+            {code: "K06", name: "东风路街道"},
+            {code: "K07", name: "通泰街街道"},
+            {code: "K08", name: "四方坪街道"},
+            {code: "K09", name: "芙蓉北路街道"},
+            {code: "K10", name: "洪山街道"},
+            {code: "K11", name: "月湖街道"},
+            {code: "K12", name: "浏阳河街道"},
+            {code: "K13", name: "秀峰街道"},
+            {code: "K14", name: "捞刀河街道"},
+            {code: "K15", name: "沙坪街道"},
+            {code: "K16", name: "青竹湖街道"}
+          ]
+        },
+        {
+          name: "雨花区",
+          streets: [
+            {code: "Y01", name: "雨花亭街道"},
+            {code: "Y02", name: "高桥街道"},
+            {code: "Y03", name: "左家塘街道"},
+            {code: "Y04", name: "侯家塘街道"},
+            {code: "Y05", name: "砂子塘街道"},
+            {code: "Y06", name: "东塘街道"},
+            {code: "Y07", name: "圭塘街道"},
+            {code: "Y08", name: "黎托街道"},
+            {code: "Y09", name: "洞井街道"},
+            {code: "Y10", name: "井湾子街道"},
+            {code: "Y11", name: "东山街道"},
+            {code: "Y12", name: "同升街道"},
+            {code: "Y13", name: "跳马镇"}
+          ]
+        },
+        {
+          name: "长沙县",
+          streets: [
+            {code: "C01", name: "星沙街道"},
+            {code: "C02", name: "湘龙街道"},
+            {code: "C03", name: "泉塘街道"},
+            {code: "C04", name: "榔梨街道"}
+          ]
+        },
+        {
+          name: "望城",
+          streets: [
+            {code: "W01", name: "丁字湾街道"},
+            {code: "W02", name: "书堂山街道"},
+            {code: "W03", name: "高塘岭街道"},
+            {code: "W04", name: "喻家坡街道"},
+            {code: "W05", name: "白沙洲街道"},
+            {code: "W06", name: "大泽湖街道"},
+            {code: "W07", name: "月亮岛街道"},
+            {code: "W08", name: "廖家坪街道"}
+          ]
+        },
+        {
+          name: "浏阳",
+          streets: [
+            {code: "L01", name: "淮川街道"},
+            {code: "L02", name: "集里街道"},
+            {code: "L03", name: "荷花街道"},
+            {code: "L04", name: "关口街道"}
+          ]
+        },
+        {
+          name: "宁乡",
+          streets: [
+            {code: "N01", name: "玉潭街道"},
+            {code: "N02", name: "城郊街道"},
+            {code: "N03", name: "历经铺街道"},
+            {code: "N04", name: "白马桥街道"},
+            {code: "N05", name: "煤炭坝镇"},
+            {code: "N06", name: "双凫铺镇"},
+            {code: "N07", name: "双江口镇"},
+            {code: "N08", name: "回龙铺镇"},
+            {code: "N09", name: "夏铎铺镇"},
+            {code: "N10", name: "历经铺镇"}
+          ]
+        },
+        {
+          name: "湘江新区",
+          streets: [
+            {code: "X01", name: "岳麓街道"},
+            {code: "X02", name: "桔子洲街道"},
+            {code: "X03", name: "望月湖街道"},
+            {code: "X04", name: "银盆岭街道"},
+            {code: "X05", name: "观沙岭街道"},
+            {code: "X06", name: "西湖街道"},
+            {code: "X07", name: "望城坡街道"},
+            {code: "X08", name: "望岳街道"},
+            {code: "X09", name: "咸嘉湖街道"},
+            {code: "X10", name: "梅溪湖街道"},
+            {code: "X11", name: "天顶街道"},
+            {code: "X12", name: "坪塘街道"},
+            {code: "X13", name: "洋湖街道"},
+            {code: "X14", name: "含浦街道"},
+            {code: "X15", name: "学士街道"},
+            {code: "X16", name: "莲花镇"},
+            {code: "X17", name: "雨敞坪镇"},
+            {code: "X18", name: "麓谷街道"},
+            {code: "X19", name: "东方红街道"},
+            {code: "X20", name: "白马街道"},
+            {code: "X21", name: "雷锋街道"},
+            {code: "X22", name: "黄金园街道"},
+            {code: "X23", name: "金山桥街道"},
+            {code: "X24", name: "白箬铺镇"}
+          ]
+        }
+      ],
+      streets:[]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    createDropPointNo(area){
+      listDropPointInfo({dropPointNo: area.code}).then(response => {
+        const total = response.total+1;
+        this.form.dropPointNo = area.code+total.toString().padStart(3, '0');
+      });
+    },
+    getStreets(regionName) {
+      this.streets = [];
+      this.form.dropPointNo = null;
+      this.form.street = null;
+      const region = this.areas.find(region => region.name === regionName);
+      this.streets = region.streets;
+    },
+    /** 下载文件 */
+    /** 查询投放点信息管理列表 */
+    getList() {
+      this.loading = true;
+      listDropPointInfo(this.queryParams).then(response => {
+        this.dropPointInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        dropPointName: null,
+        district: null,
+        street: null,
+        community: null,
+        address: null,
+        type: null,
+        area: null,
+        capacity: null,
+        managementUnit: null,
+        custodian: null,
+        custodianPhone: null,
+        dropTime: null,
+        dropPointNo: null,
+        operatingUnit: null,
+        transportUnit: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    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
+      getDropPointInfo(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) {
+            updateDropPointInfo(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDropPointInfo(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 delDropPointInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有投放点信息管理数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportDropPointInfo(queryParams);
+      }).then(response => {
+        this.download(response.message);
+      })
+    }
+  }
+};
+</script>
@@ -264,7 +264,7 @@ export default {
         }).then(function() {
           return exportEnterprise(queryParams);
         }).then(response => {
-          this.download(response.msg);
+          this.download(response.message);
         })
     }
   }
+package com.trash.dropPointInfo.controller;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.trash.common.annotation.Log;
+import com.trash.common.core.controller.BaseController;
+import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.enums.BusinessType;
+import com.trash.dropPointInfo.domain.DropPointInfo;
+import com.trash.dropPointInfo.service.IDropPointInfoService;
+import com.trash.common.utils.poi.ExcelUtil;
+import com.trash.common.core.page.TableDataInfo;
+
+/**
+ * 投放点信息管理Controller
+ * 
+ * @author trash
+ * @date 2024-11-14
+ */
+@RestController
+@RequestMapping("/unit/dropPointInfo")
+public class DropPointInfoController extends BaseController
+{
+    @Autowired
+    private IDropPointInfoService dropPointInfoService;
+
+    /**
+     * 查询投放点信息管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('unit:dropPointInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DropPointInfo dropPointInfo)
+    {
+        startPage();
+        List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoList(dropPointInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出投放点信息管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('unit:dropPointInfo:export')")
+    @Log(title = "投放点信息管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(DropPointInfo dropPointInfo)
+    {
+        List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoList(dropPointInfo);
+        ExcelUtil<DropPointInfo> util = new ExcelUtil<DropPointInfo>(DropPointInfo.class);
+        return util.exportExcel(list, "投放点信息管理");
+    }
+
+    /**
+     * 获取投放点信息管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('unit:dropPointInfo:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(dropPointInfoService.selectDropPointInfoById(id));
+    }
+
+    /**
+     * 新增投放点信息管理
+     */
+    @PreAuthorize("@ss.hasPermi('unit:dropPointInfo:add')")
+    @Log(title = "投放点信息管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DropPointInfo dropPointInfo)
+    {
+        return toAjax(dropPointInfoService.insertDropPointInfo(dropPointInfo));
+    }
+
+    /**
+     * 修改投放点信息管理
+     */
+    @PreAuthorize("@ss.hasPermi('unit:dropPointInfo:edit')")
+    @Log(title = "投放点信息管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DropPointInfo dropPointInfo)
+    {
+        return toAjax(dropPointInfoService.updateDropPointInfo(dropPointInfo));
+    }
+
+    /**
+     * 删除投放点信息管理
+     */
+    @PreAuthorize("@ss.hasPermi('unit:dropPointInfo:remove')")
+    @Log(title = "投放点信息管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(dropPointInfoService.deleteDropPointInfoByIds(ids));
+    }
+}
+package com.trash.dropPointInfo.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.trash.common.annotation.Excel;
+import com.trash.common.core.domain.BaseEntity;
+
+/**
+ * 投放点信息管理对象 drop_point_info
+ * 
+ * @author trash
+ * @date 2024-11-14
+ */
+public class DropPointInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 id */
+    private Long id;
+
+    /** 投放点名称 */
+    @Excel(name = "投放点名称")
+    private String dropPointName;
+
+    /** 所属区域 */
+    @Excel(name = "所属区域")
+    private String district;
+
+    /** 所属街道 */
+    @Excel(name = "所属街道")
+    private String street;
+
+    /** 社区 */
+    @Excel(name = "社区")
+    private String community;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String address;
+
+    /** 投放点形式（固定、临时） */
+    @Excel(name = "投放点形式")
+    private String type;
+
+    /** 投放点面积 */
+    @Excel(name = "投放点面积")
+    private BigDecimal area;
+
+    /** 投放点容量 */
+    @Excel(name = "投放点容量")
+    private BigDecimal capacity;
+
+    /** 管理单位 */
+    @Excel(name = "管理单位")
+    private String managementUnit;
+
+    /** 管理人 */
+    @Excel(name = "管理人")
+    private String custodian;
+
+    /** 管理员电话 */
+    @Excel(name = "管理员电话")
+    private String custodianPhone;
+
+    /** 投放时间 */
+    @Excel(name = "投放时间")
+    private String dropTime;
+
+    /** 投放点编号 */
+    @Excel(name = "投放点编号")
+    private String dropPointNo;
+
+    /** 运营单位 */
+    @Excel(name = "运营单位")
+    private String operatingUnit;
+
+    /** 运输单位 */
+    @Excel(name = "运输单位")
+    private String transportUnit;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setDropPointName(String dropPointName) 
+    {
+        this.dropPointName = dropPointName;
+    }
+
+    public String getDropPointName() 
+    {
+        return dropPointName;
+    }
+    public void setDistrict(String district) 
+    {
+        this.district = district;
+    }
+
+    public String getDistrict() 
+    {
+        return district;
+    }
+    public void setStreet(String street) 
+    {
+        this.street = street;
+    }
+
+    public String getStreet() 
+    {
+        return street;
+    }
+    public void setCommunity(String community) 
+    {
+        this.community = community;
+    }
+
+    public String getCommunity() 
+    {
+        return community;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setArea(BigDecimal area) 
+    {
+        this.area = area;
+    }
+
+    public BigDecimal getArea() 
+    {
+        return area;
+    }
+    public void setCapacity(BigDecimal capacity) 
+    {
+        this.capacity = capacity;
+    }
+
+    public BigDecimal getCapacity() 
+    {
+        return capacity;
+    }
+    public void setManagementUnit(String managementUnit) 
+    {
+        this.managementUnit = managementUnit;
+    }
+
+    public String getManagementUnit() 
+    {
+        return managementUnit;
+    }
+    public void setCustodian(String custodian) 
+    {
+        this.custodian = custodian;
+    }
+
+    public String getCustodian() 
+    {
+        return custodian;
+    }
+    public void setCustodianPhone(String custodianPhone) 
+    {
+        this.custodianPhone = custodianPhone;
+    }
+
+    public String getCustodianPhone() 
+    {
+        return custodianPhone;
+    }
+    public void setDropTime(String dropTime)
+    {
+        this.dropTime = dropTime;
+    }
+
+    public String getDropTime()
+    {
+        return dropTime;
+    }
+    public void setDropPointNo(String dropPointNo) 
+    {
+        this.dropPointNo = dropPointNo;
+    }
+
+    public String getDropPointNo() 
+    {
+        return dropPointNo;
+    }
+    public void setOperatingUnit(String operatingUnit) 
+    {
+        this.operatingUnit = operatingUnit;
+    }
+
+    public String getOperatingUnit() 
+    {
+        return operatingUnit;
+    }
+    public void setTransportUnit(String transportUnit) 
+    {
+        this.transportUnit = transportUnit;
+    }
+
+    public String getTransportUnit() 
+    {
+        return transportUnit;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("dropPointName", getDropPointName())
+            .append("district", getDistrict())
+            .append("street", getStreet())
+            .append("community", getCommunity())
+            .append("address", getAddress())
+            .append("type", getType())
+            .append("area", getArea())
+            .append("capacity", getCapacity())
+            .append("managementUnit", getManagementUnit())
+            .append("custodian", getCustodian())
+            .append("custodianPhone", getCustodianPhone())
+            .append("dropTime", getDropTime())
+            .append("dropPointNo", getDropPointNo())
+            .append("operatingUnit", getOperatingUnit())
+            .append("transportUnit", getTransportUnit())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}
+package com.trash.dropPointInfo.mapper;
+
+import java.util.List;
+import com.trash.dropPointInfo.domain.DropPointInfo;
+
+/**
+ * 投放点信息管理Mapper接口
+ * 
+ * @author trash
+ * @date 2024-11-14
+ */
+public interface DropPointInfoMapper 
+{
+    /**
+     * 查询投放点信息管理
+     * 
+     * @param id 投放点信息管理ID
+     * @return 投放点信息管理
+     */
+        DropPointInfo selectDropPointInfoById(Long id);
+
+    /**
+     * 查询投放点信息管理列表
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 投放点信息管理集合
+     */
+    List<DropPointInfo> selectDropPointInfoList(DropPointInfo dropPointInfo);
+
+    /**
+     * 新增投放点信息管理
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 结果
+     */
+    int insertDropPointInfo(DropPointInfo dropPointInfo);
+
+    /**
+     * 修改投放点信息管理
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 结果
+     */
+    int updateDropPointInfo(DropPointInfo dropPointInfo);
+
+    /**
+     * 删除投放点信息管理
+     * 
+     * @param id 投放点信息管理ID
+     * @return 结果
+     */
+    int deleteDropPointInfoById(Long id);
+
+    /**
+     * 批量删除投放点信息管理
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteDropPointInfoByIds(Long[] ids);
+}
+package com.trash.dropPointInfo.service;
+
+import java.util.List;
+import com.trash.dropPointInfo.domain.DropPointInfo;
+
+/**
+ * 投放点信息管理Service接口
+ * 
+ * @author trash
+ * @date 2024-11-14
+ */
+public interface IDropPointInfoService 
+{
+    /**
+     * 查询投放点信息管理
+     * 
+     * @param id 投放点信息管理ID
+     * @return 投放点信息管理
+     */
+        DropPointInfo selectDropPointInfoById(Long id);
+
+    /**
+     * 查询投放点信息管理列表
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 投放点信息管理集合
+     */
+    List<DropPointInfo> selectDropPointInfoList(DropPointInfo dropPointInfo);
+
+    /**
+     * 新增投放点信息管理
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 结果
+     */
+    int insertDropPointInfo(DropPointInfo dropPointInfo);
+
+    /**
+     * 修改投放点信息管理
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 结果
+     */
+    int updateDropPointInfo(DropPointInfo dropPointInfo);
+
+    /**
+     * 批量删除投放点信息管理
+     * 
+     * @param ids 需要删除的投放点信息管理ID
+     * @return 结果
+     */
+    int deleteDropPointInfoByIds(Long[] ids);
+
+    /**
+     * 删除投放点信息管理信息
+     * 
+     * @param id 投放点信息管理ID
+     * @return 结果
+     */
+    int deleteDropPointInfoById(Long id);
+}
+package com.trash.dropPointInfo.service.impl;
+
+import java.util.List;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.trash.dropPointInfo.mapper.DropPointInfoMapper;
+import com.trash.dropPointInfo.domain.DropPointInfo;
+import com.trash.dropPointInfo.service.IDropPointInfoService;
+
+/**
+ * 投放点信息管理Service业务层处理
+ * 
+ * @author trash
+ * @date 2024-11-14
+ */
+@Service
+public class DropPointInfoServiceImpl implements IDropPointInfoService 
+{
+    @Autowired
+    private DropPointInfoMapper dropPointInfoMapper;
+
+    /**
+     * 查询投放点信息管理
+     * 
+     * @param id 投放点信息管理ID
+     * @return 投放点信息管理
+     */
+    @Override
+    public DropPointInfo selectDropPointInfoById(Long id)
+    {
+        return dropPointInfoMapper.selectDropPointInfoById(id);
+    }
+
+    /**
+     * 查询投放点信息管理列表
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 投放点信息管理
+     */
+    @Override
+    public List<DropPointInfo> selectDropPointInfoList(DropPointInfo dropPointInfo)
+    {
+        return dropPointInfoMapper.selectDropPointInfoList(dropPointInfo);
+    }
+
+    /**
+     * 新增投放点信息管理
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 结果
+     */
+    @Override
+    public int insertDropPointInfo(DropPointInfo dropPointInfo)
+    {
+        dropPointInfo.setCreateTime(DateUtils.getNowDate());
+        dropPointInfo.setCreateBy(SecurityUtils.getUsername());
+        return dropPointInfoMapper.insertDropPointInfo(dropPointInfo);
+    }
+
+    /**
+     * 修改投放点信息管理
+     * 
+     * @param dropPointInfo 投放点信息管理
+     * @return 结果
+     */
+    @Override
+    public int updateDropPointInfo(DropPointInfo dropPointInfo)
+    {
+        dropPointInfo.setUpdateTime(DateUtils.getNowDate());
+        dropPointInfo.setUpdateBy(SecurityUtils.getUsername());
+        return dropPointInfoMapper.updateDropPointInfo(dropPointInfo);
+    }
+
+    /**
+     * 批量删除投放点信息管理
+     * 
+     * @param ids 需要删除的投放点信息管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDropPointInfoByIds(Long[] ids)
+    {
+        return dropPointInfoMapper.deleteDropPointInfoByIds(ids);
+    }
+
+    /**
+     * 删除投放点信息管理信息
+     * 
+     * @param id 投放点信息管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDropPointInfoById(Long id)
+    {
+        return dropPointInfoMapper.deleteDropPointInfoById(id);
+    }
+}
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.dropPointInfo.mapper.DropPointInfoMapper">
+    
+    <resultMap type="DropPointInfo" id="DropPointInfoResult">
+        <result property="id"    column="id"    />
+        <result property="dropPointName"    column="drop_point_name"    />
+        <result property="district"    column="district"    />
+        <result property="street"    column="street"    />
+        <result property="community"    column="community"    />
+        <result property="address"    column="address"    />
+        <result property="type"    column="type"    />
+        <result property="area"    column="area"    />
+        <result property="capacity"    column="capacity"    />
+        <result property="managementUnit"    column="management_unit"    />
+        <result property="custodian"    column="custodian"    />
+        <result property="custodianPhone"    column="custodian_phone"    />
+        <result property="dropTime"    column="drop_time"    />
+        <result property="dropPointNo"    column="drop_point_no"    />
+        <result property="operatingUnit"    column="operating_unit"    />
+        <result property="transportUnit"    column="transport_unit"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+    </resultMap>
+
+    <sql id="selectDropPointInfoVo">
+        select id, drop_point_name, district, street, community, address, type, area, capacity, management_unit, custodian, custodian_phone, drop_time, drop_point_no, operating_unit, transport_unit, create_time, create_by, update_time, update_by from drop_point_info
+    </sql>
+
+    <select id="selectDropPointInfoList" parameterType="DropPointInfo" resultMap="DropPointInfoResult">
+        <include refid="selectDropPointInfoVo"/>
+        <where>  
+            <if test="dropPointName != null  and dropPointName != ''"> and drop_point_name like concat('%', #{dropPointName}, '%')</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+            <if test="dropPointNo != null  and dropPointNo != ''"> and drop_point_no like concat(#{dropPointNo}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectDropPointInfoById" parameterType="Long" resultMap="DropPointInfoResult">
+        <include refid="selectDropPointInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDropPointInfo" parameterType="DropPointInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into drop_point_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="dropPointName != null">drop_point_name,</if>
+            <if test="district != null">district,</if>
+            <if test="street != null">street,</if>
+            <if test="community != null">community,</if>
+            <if test="address != null">address,</if>
+            <if test="type != null">type,</if>
+            <if test="area != null">area,</if>
+            <if test="capacity != null">capacity,</if>
+            <if test="managementUnit != null">management_unit,</if>
+            <if test="custodian != null">custodian,</if>
+            <if test="custodianPhone != null">custodian_phone,</if>
+            <if test="dropTime != null">drop_time,</if>
+            <if test="dropPointNo != null">drop_point_no,</if>
+            <if test="operatingUnit != null">operating_unit,</if>
+            <if test="transportUnit != null">transport_unit,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="dropPointName != null">#{dropPointName},</if>
+            <if test="district != null">#{district},</if>
+            <if test="street != null">#{street},</if>
+            <if test="community != null">#{community},</if>
+            <if test="address != null">#{address},</if>
+            <if test="type != null">#{type},</if>
+            <if test="area != null">#{area},</if>
+            <if test="capacity != null">#{capacity},</if>
+            <if test="managementUnit != null">#{managementUnit},</if>
+            <if test="custodian != null">#{custodian},</if>
+            <if test="custodianPhone != null">#{custodianPhone},</if>
+            <if test="dropTime != null">#{dropTime},</if>
+            <if test="dropPointNo != null">#{dropPointNo},</if>
+            <if test="operatingUnit != null">#{operatingUnit},</if>
+            <if test="transportUnit != null">#{transportUnit},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDropPointInfo" parameterType="DropPointInfo">
+        update drop_point_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="dropPointName != null">drop_point_name = #{dropPointName},</if>
+            <if test="district != null">district = #{district},</if>
+            <if test="street != null">street = #{street},</if>
+            <if test="community != null">community = #{community},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="area != null">area = #{area},</if>
+            <if test="capacity != null">capacity = #{capacity},</if>
+            <if test="managementUnit != null">management_unit = #{managementUnit},</if>
+            <if test="custodian != null">custodian = #{custodian},</if>
+            <if test="custodianPhone != null">custodian_phone = #{custodianPhone},</if>
+            <if test="dropTime != null">drop_time = #{dropTime},</if>
+            <if test="dropPointNo != null">drop_point_no = #{dropPointNo},</if>
+            <if test="operatingUnit != null">operating_unit = #{operatingUnit},</if>
+            <if test="transportUnit != null">transport_unit = #{transportUnit},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDropPointInfoById" parameterType="Long">
+        delete from drop_point_info where id = #{id}
+    </delete>
+
+    <delete id="deleteDropPointInfoByIds" parameterType="String">
+        delete from drop_point_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>
 \ No newline at end of file