码头调度接口

赵超
air-admin/src/main/java/com/air/controller/SysUserController.java
air-admin/src/main/java/com/air/util/HttpUtil.java
air-admin/src/main/webapp/WEB-INF/admin/carEdit.html
air-api/src/main/java/com/teplot/air/controller/CarController.java
air-kit/src/main/java/com/air/led/LedKit.java
air-model/src/main/java/com/air/model/AirPort.java
air-model/src/main/resources/config.properties
--- a/air-admin/src/main/java/com/air/controller/SysUserController.java
查看文件 @8016c0a
+++ b/air-admin/src/main/java/com/air/controller/SysUserController.java
查看文件 @8016c0a
@@ -11,6 +11,7 @@ import com.air.model.SysMenu;
 import com.air.model.SysRole;
 import com.air.model.SysRoleType;
 import com.air.model.SysUser;
+import com.air.util.HttpUtil;
 import com.google.gson.Gson;
 import com.jfinal.aop.Clear;
 import com.jfinal.kit.HashKit;
@@ -20,6 +21,7 @@ import com.jfinal.plugin.activerecord.Page;
 import com.teplot.common.Encrypt;
 import com.teplot.common.Response;
+
 /**
  * Depiction:后台用户管理
  * <p>
@@ -92,7 +94,7 @@ public class SysUserController extends AbsController {
 		String SAMLResponse = getPara("SAMLResponse");
 		String providerId = getPara("providerId");
 		String param = "SAMLResponse=" + SAMLResponse + "&providerId=" + providerId;
-		String json = HttpKit.post(url, param);
+		String json = HttpUtil.sendData(url, SAMLResponse, providerId);
 		Gson gson = new Gson();
 		Kv map = gson.fromJson(json, Kv.class);
 		if (map != null) {
--- a/air-admin/src/main/java/com/air/util/HttpUtil.java 0 → 100644
查看文件 @8016c0a
+++ b/air-admin/src/main/java/com/air/util/HttpUtil.java 0 → 100644
查看文件 @8016c0a
+package com.air.util;
+
+import okhttp3.FormBody;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import org.omg.CORBA.Request;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sun.net.www.protocol.http.HttpURLConnection;
+import sun.rmi.runtime.Log;
+
+import javax.xml.ws.Response;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.Map;
+
+/**
+ * Created by XYH on 2019/1/22.
+ */
+public class HttpUtil {
+    static Logger logger = LoggerFactory.getLogger(HttpUtil.class);
+    public static String sendData(String url, String SAMLResponse,String providerId) {
+        StringBuilder str = new StringBuilder();
+        BufferedReader bf = null;
+        OutputStreamWriter writer = null;
+        String param= null;
+        String param2=null;
+        try {
+            param = "SAMLResponse="+ URLEncoder.encode(SAMLResponse,"UTF-8")+"&"+"providerId="+providerId;
+
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        try {
+            URL Url = new URL(url);
+            HttpURLConnection conn = (HttpURLConnection) Url.openConnection();
+            conn.setDoInput(true);
+            conn.setDoOutput(true);
+            //conn.setRequestProperty("X-Rrquested-With", "XMLHttpRequest");
+            //conn.setRequestProperty("Connection", "keep-alive");
+            //conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+            conn.setRequestMethod("POST");
+            conn.connect();
+            StringBuffer params = new StringBuffer();
+            //表单参数与get形式一样
+            //params.append("SAMLResponse").append("=").append(SAMLResponse).append("&")
+                   // .append("providerId").append("=").append(providerId);
+            writer = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            writer.write(param);
+            writer.flush();
+            bf = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            String inputLine = null;
+            while ((inputLine = bf.readLine()) != null) {
+                str.append(inputLine);
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                writer.close();
+                bf.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return str.toString();
+    }
+
+}
--- a/air-admin/src/main/webapp/WEB-INF/admin/carEdit.html
查看文件 @8016c0a
+++ b/air-admin/src/main/webapp/WEB-INF/admin/carEdit.html
查看文件 @8016c0a
@@ -2,6 +2,7 @@
 <html lang="zh">
 #@header()
+<script type="text/javascript" src="#(contextPath)/js/portCarEdit.js?ver=#(version)"></script>
 <body>
 	<div>
 		<ol class="breadcrumb">
@@ -69,8 +70,8 @@
 						<tr id="leftPortTr" style="display:none;width: 100%;">
 							<td>码头</td>
-							<td><select id="leftList" class="input-small m-wrap" tabindex="1" style="width: 160px;"
-									name="car.portNo"  required>
+							<td><select id="leftList" class="input-small m-wrap" tabindex="2" style="width: 160px;"
+									name="car.portNo" >
 									<option value="">选择离港码头</option>
 									#for(port : leftList)
 									<option value="#(port.portNo)"
@@ -83,8 +84,7 @@
 									#end									
 								</select>
 							</td>
-						</tr>
-						
+						</tr> 
 						<tr>
 							<td>特殊</td>
 							<td colspan="2">
@@ -104,9 +104,6 @@
 			</form>
 		</div>
 	</div>
-
-<script type="text/javascript" src="#(contextPath)/js/portCarEdit.js?ver=#(version)"></script>
-
 	<script type="text/javascript">
 		#if(flag)
 			showTip('#(flag)');
--- a/air-api/src/main/java/com/teplot/air/controller/CarController.java
查看文件 @8016c0a
+++ b/air-api/src/main/java/com/teplot/air/controller/CarController.java
查看文件 @8016c0a
@@ -66,7 +66,7 @@ public class CarController extends AbsController {
 		Map<String, Object> maps = new HashMap<String, Object>();
 		maps.put("carNo", carNo);
 		maps.put("stationArea", stationArea);
-		AirPortCar car = AirPortCar.dao.searchFirst(maps);
+		AirPortCar car = AirPortCar.dao.searchFirst1(maps);
 		AirPort port = AirPort.dao.free(car.getStationArea(), car.getIsPickup());
 		if (port == null) {
 			return false;
@@ -92,7 +92,8 @@ public class CarController extends AbsController {
 		Map<String, Object> maps = new HashMap<String, Object>();
 		maps.put("carNo", carNo);
 		maps.put("stationArea", stationArea);
-		AirPortCar car = AirPortCar.dao.searchFirst(maps);
+		AirPortCar.dao.update(carNo);
+		AirPortCar car = AirPortCar.dao.searchFirst1(maps);
 		car.setStatus(AirPortCarStatus.LEFT.ordinal());
 		car.setLeaveTime(new Date());
 		if (car.update()) {
@@ -107,22 +108,22 @@ public class CarController extends AbsController {
 		String gateTypeCode = getPara("stationCode");
 		StationGateType gateType = new StationGateType(gateTypeCode);
 		Log.getLog(getClass()).error("gateType-->" + gateType.toString());
-
 		String stationArea = gateType.getAreaCode();// 货站区域代码
 		String carNo = getPara("carNo");// 车牌号
-		
+		Boolean isPickup = getParaToBoolean("isPickup");
+		System.out.println(isPickup);
 		if (StrKit.notBlank(carNo)) {
 			carNo = carNo.toUpperCase();
 		}
-		
 		GateType type = gateType.getType();// 0 进场；1 出场；
-
 		Response ret = new Response(CODE_FAILURE);
 		if (!StrKit.isBlank(stationArea)) {
 			if (!StrKit.isBlank(carNo)) {
 				if (type != GateType.ERROR) {
-					ret = dealCar(stationArea, carNo, type);
+					ret = dealCar(stationArea, carNo, type, isPickup);
+
 				} else {
+
 					ret.setMsg("无法判断进出场类型");
 				}
 			} else {
@@ -137,55 +138,88 @@ public class CarController extends AbsController {
 	/**
 	 * 处理卡口数据
 	 * 
-	 * @param stationArea
-	 *            货站区域代码
-	 * @param carNo
-	 *            车牌号
-	 * @param type
-	 *            进出场类型 {@link GateType}
+	 * @param stationArea 货站区域代码
+	 * @param carNo       车牌号
+	 * @param type        进出场类型 {@link GateType}
 	 */
-	private Response dealCar(String stationArea, String carNo, GateType type) {
+	private Response dealCar(String stationArea, String carNo, GateType type, boolean isPickup) {
 		Response ret = new Response(CODE_FAILURE);
 		Map<String, Object> maps = new HashMap<String, Object>();
 		maps.put("carNo", carNo);
 		maps.put("stationArea", stationArea);
-		AirPortCar old = AirPortCar.dao.searchFirst(maps);
+		AirPortCar old = AirPortCar.dao.searchFirst1(maps);
+		System.out.println(old);
 		if (old != null) {
 			AirPortCarStatus status = AirPortCarStatus.valueOf(old.getStatus());
-			if (AirPortCarStatus.APPLY == status && type == GateType.JIN) {
-				// 待进场状态，可进场
-				old.setStatus(AirPortCarStatus.ENTER.ordinal());
-				if (enter(carNo, stationArea)) {
-					// 进场成功
-					ret = new Response(CODE_SUCCESS);
-					ret.setMsg("进场成功");
-					old = AirPortCar.dao.searchFirst(maps);
-					LedKit.sendBigLedScreen(LedKit.bigLedText(old.getPortNo(), old.getIsPickup(), carNo, stationArea),
-							stationArea);
-					LedKit.nextCar(stationArea, old.getPortNo(), old.getIsPickup());
-				} else {
-					ret.setMsg("进场失败");
-				}
-			} else if (AirPortCarStatus.ENTER == status && type == GateType.CHU) {
-				// 已进场状态，可出场
-				if (exit(carNo, stationArea)) {
-					// 成功出场
-					ret = new Response(CODE_SUCCESS);
-					ret.setMsg("出场成功");
-					LedKit.nextCar(stationArea, old.getPortNo(), old.getIsPickup());
+			// 查询最近一条数据状态如果是进场状态 
+			if (AirPortCarStatus.ENTER == status && type == GateType.JIN) {
+				ret.setMsg("无法重复进场");
+			//查询最近插入的数据离场出去判断离场
+			}else if(AirPortCarStatus.LEFT == status && type == GateType.CHU){
+				ret.setMsg("无法重复出场");
+			}else{
+				//如果已经来过车辆  重新输入 
+			   //如果是进场插入最新的数据  并改变数值
+				if (AirPortCarStatus.LEFT == status && type == GateType.JIN) {
+					AirPortCar model = new AirPortCar();
+					System.out.println(isPickup);
+					model.setIsPickup(isPickup);
+					model.setCarNo(carNo);
+					model.setStationArea(stationArea);
+					if (model.save()) {
+					} else {
+						ret.setMsg("数据录入错误");
+					}
+				} 
+				//重新赋值新的的值
+				old = AirPortCar.dao.searchFirst1(maps);
+				status = AirPortCarStatus.valueOf(old.getStatus());
+				if (AirPortCarStatus.APPLY == status && type == GateType.JIN) {
+					// 待进场状态，可进场
+					old.setStatus(AirPortCarStatus.ENTER.ordinal());
+					if (enter(carNo, stationArea)) {
+						// 进场成功
+						ret = new Response(CODE_SUCCESS);
+						ret.setMsg("进场成功");
+						old = AirPortCar.dao.searchFirst1(maps);
+						LedKit.sendBigLedScreen(
+						LedKit.bigLedText(old.getPortNo(), old.getIsPickup(), carNo, stationArea), stationArea);
+						LedKit.nextCar(stationArea, old.getPortNo(), old.getIsPickup());
+					} else {
+						ret.setMsg("进场失败");
+					}
+				} else if (AirPortCarStatus.ENTER == status && type == GateType.CHU) {
+					// 已进场状态，可出场
+					if (exit(carNo, stationArea)) {
+						// 成功出场
+						ret = new Response(CODE_SUCCESS);
+						ret.setMsg("出场成功");
+						LedKit.nextCar(stationArea, old.getPortNo(), old.getIsPickup());
+					} else {
+						// 出场失败
+						ret.setMsg("出场失败");
+					}
+				} 
+				LedKit.recovery();
+
+			}
+
+		} else {
+			//如果为空插入数据
+			if (type == GateType.JIN) {
+				AirPortCar model = new AirPortCar();
+				System.out.println(isPickup);
+				model.setIsPickup(isPickup);
+				model.setCarNo(carNo);
+				model.setStationArea(stationArea);
+				if (model.save()) {
+					ret = dealCar(stationArea, carNo, type, isPickup);
 				} else {
-					// 出场失败
-					ret.setMsg("出场失败");
+					ret.setMsg("数据录入错误");
 				}
-			} else {
-				ret.setMsg("无法重复出场或者进场");
+			}else {
+				ret.setMsg("本车未曾进站");
 			}
-			
-			LedKit.recovery();
-			
-		} else {
-			// 货代没有提前录入进场数据，无法分配码头
-			ret.setMsg("货代没有提前录入进场数据，无法分配码头");
 		}
 		return ret;
--- a/air-kit/src/main/java/com/air/led/LedKit.java
查看文件 @8016c0a
+++ b/air-kit/src/main/java/com/air/led/LedKit.java
查看文件 @8016c0a
 package com.air.led;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+import com.jfinal.log.Log;
 import com.air.model.AirPortCar;
 import com.air.model.AirPortCarStatus;
 import com.jfinal.kit.HttpKit;
+import com.jfinal.log.Log;
 import com.jfinal.plugin.activerecord.Db;
 /**
@@ -20,7 +22,7 @@ import com.jfinal.plugin.activerecord.Db;
  * 
  */
 public class LedKit {
-	final static String LED_API = "http://10.50.3.66:21890/LEDAPI.ashx";
+	final static String LED_API = "http://10.50.3.66:8080/LEDAPI.ashx";
 	final static String APP_KEY = "93FCC7C01F0E410EACC0A1692BD1B7A1";
 	public LedKit() {
@@ -43,17 +45,16 @@ public class LedKit {
 		String sql = "select * from " + AirPortCar.dao.table();
 		sql += " where stationArea='" + stationArea + "'";
-		sql += " and isPickup='" + isPickUp + "'";
+		sql += " and isPickup=" + isPickUp + "";
 		sql += " and status=" + AirPortCarStatus.ENTER.ordinal();
 		sql += " and portNo=" + port;
-		String orderBy = " order by updateTime asc";
+		String orderBy = " order by ID asc";
 		sql += orderBy;
 		AirPortCar model = AirPortCar.dao.findFirst(sql);
 		String carNo = "空闲";
 		if (model != null) {
 			carNo = model.getCarNo();
 		}
-
 		LedKit.senPortLedScreen(carNo, stationArea, port, isPickUp);
 	}
@@ -72,13 +73,15 @@ public class LedKit {
 		try {
 			final Map<String, String> queryParas = new HashMap<String, String>();
 			queryParas.put("appkey", APP_KEY);
-
+            System.out.println(msg+stationArea+portNo+isPickUp);
 			LedJson led = new LedJson(Led.getLed(portNo, isPickUp), 1, msg);
 			queryParas.put("jsonValues", led.toString());
-
+            System.out.println(queryParas);
 			new Thread() {
 				public void run() {
-					HttpKit.get(LED_API, queryParas);
+					String msg=  HttpKit.get(LED_API, queryParas);
+					System.out.println(msg);
+					
 				}
 			}.start();
 		} catch (Exception e) {
--- a/air-model/src/main/java/com/air/model/AirPort.java
查看文件 @8016c0a
+++ b/air-model/src/main/java/com/air/model/AirPort.java
查看文件 @8016c0a
@@ -43,7 +43,7 @@ public class AirPort extends BaseAirPort<AirPort> {
 	public AirPort free(String stationArea, boolean isArrival) {
 		String sql = "select * from " + table();
 		sql += " where stationArea='" + stationArea + "'";
-		sql += " and isArrival='" + isArrival + "'";
+		sql += " and isArrival=" + isArrival + "";
 		String orderBy = " order by waitCount asc";
 		sql += orderBy;
@@ -51,7 +51,21 @@ public class AirPort extends BaseAirPort<AirPort> {
 		return AirPort.dao.findFirst(sql);
 	}
-
+	/**
+	 * 查询某个货站最空闲的码头（没有进港业务（即提货）
+	 * 
+	 * @param stationArea
+	 *        货站的区域代码
+	 * @return
+	 */
+	public AirPort freetwo(String stationArea) {
+		String sql = "select * from " + table();
+		sql += " where stationArea='" + stationArea + "'";
+		String orderBy = " order by waitCount asc";
+		sql += orderBy;
+		Log.getLog(getClass()).error("sql-->" + sql);
+		return AirPort.dao.findFirst(sql);
+	}
 	public boolean enter(String stationArea, boolean isArrival, int portNo) {
 		Map<String, Object> maps = new HashMap<String, Object>();
 		maps.put("stationArea", stationArea);
@@ -71,7 +85,7 @@ public class AirPort extends BaseAirPort<AirPort> {
 		maps.put("stationArea", stationArea);
 		maps.put("isArrival", isArrival);
 		maps.put("portNo", portNo);
-		AirPort model = AirPort.dao.searchFirst(maps);
+		AirPort model = AirPort.dao.searchFirst1(maps);
 		if (model != null) {
 			int count = model.getWaitCount() - 1;
 			if (count < 0) {
--- a/air-model/src/main/resources/config.properties
查看文件 @8016c0a
+++ b/air-model/src/main/resources/config.properties
查看文件 @8016c0a
@@ -3,8 +3,8 @@
 #jdbc.user=root
 #jdbc.password=William2018!@#
-jdbc.url = jdbc:mysql://127.0.0.7:3306/cgowds?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useUnicode=true&useSSL=false
-jdbc.user=root
+jdbc.url = jdbc:mysql://localhost:3306/cgowds?characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useUnicode=true&useSSL=false
+jdbc.user=wds
 jdbc.password=vmvnv1v2
 #about case