Merge branch 'branch_0808' of http://192.168.1.195:9998/ZTEITS-Developers/zteits…

…-bcp-portal.git into branch_0808

Merge branch 'branch_0808' of http://192.168.1.195:9998/ZTEITS-Developers/zteits…
…-bcp-portal.git into branch_0808
王富生
2 parents b80f019d 44e14831
Showing 3 changed files with 146 additions and 23 deletions
src/main/java/com/zteits/irain/portal/vo/fangle/BerthStateRequest.java
src/main/java/com/zteits/irain/portal/vo/fangle/EqpHeartBeatRequest.java
src/main/java/com/zteits/irain/portal/web/fangle/FangleEqpController.java
+package com.zteits.irain.portal.vo.fangle;
+
+import com.zteits.clouds.api.apibase.bean.BaseRequest;
+
+public class BerthStateRequest extends BaseRequest{
+
+	private static final long serialVersionUID = 1L;
+	
+    /**记录编号*/
+    private String log_id;
+
+    /**泊位编码*/
+    private String berthcode;
+
+    /**状态变更时间*/
+    private String changetime;
+    
+    /**泊位状态*/
+    private String berthstatus;
+
+    /**电量*/
+    private String electricity;
+    
+    /**电压值*/
+    private String voltage;
+
+	public String getLog_id() {
+		return log_id;
+	}
+
+	public void setLog_id(String log_id) {
+		this.log_id = log_id;
+	}
+
+	public String getBerthcode() {
+		return berthcode;
+	}
+
+	public void setBerthcode(String berthcode) {
+		this.berthcode = berthcode;
+	}
+
+	public String getChangetime() {
+		return changetime;
+	}
+
+	public void setChangetime(String changetime) {
+		this.changetime = changetime;
+	}
+
+	public String getBerthstatus() {
+		return berthstatus;
+	}
+
+	public void setBerthstatus(String berthstatus) {
+		this.berthstatus = berthstatus;
+	}
+
+	public String getElectricity() {
+		return electricity;
+	}
+
+	public void setElectricity(String electricity) {
+		this.electricity = electricity;
+	}
+
+	public String getVoltage() {
+		return voltage;
+	}
+
+	public void setVoltage(String voltage) {
+		this.voltage = voltage;
+	}
+
+	@Override
+	public String toString() {
+		return "BerthStateRequest [log_id=" + log_id + ", berthcode=" + berthcode + ", changetime=" + changetime
+				+ ", berthstatus=" + berthstatus + ", electricity=" + electricity + ", voltage=" + voltage + "]";
+	}
+    
+    
+}
+package com.zteits.irain.portal.vo.fangle;
+
+import com.zteits.clouds.api.apibase.bean.BaseRequest;
+
+public class EqpHeartBeatRequest extends BaseRequest{
+
+	private static final long serialVersionUID = 1L;
+	
+    /**设备类型*/
+    private String EquipmentType;
+
+    /**设备编号*/
+    private String EquipmentCode;
+
+    /**设备状态*/
+    private String EquipmentStatus;
+    
+    /**推送时间*/
+    private String PushTime;
+
+	public String getEquipmentType() {
+		return EquipmentType;
+	}
+
+	public void setEquipmentType(String equipmentType) {
+		EquipmentType = equipmentType;
+	}
+
+	public String getEquipmentCode() {
+		return EquipmentCode;
+	}
+
+	public void setEquipmentCode(String equipmentCode) {
+		EquipmentCode = equipmentCode;
+	}
+
+	public String getEquipmentStatus() {
+		return EquipmentStatus;
+	}
+
+	public void setEquipmentStatus(String equipmentStatus) {
+		EquipmentStatus = equipmentStatus;
+	}
+
+	public String getPushTime() {
+		return PushTime;
+	}
+
+	public void setPushTime(String pushTime) {
+		PushTime = pushTime;
+	}
+
+	@Override
+	public String toString() {
+		return "EqpHeartBeatRequest [EquipmentType=" + EquipmentType + ", EquipmentCode=" + EquipmentCode
+				+ ", EquipmentStatus=" + EquipmentStatus + ", PushTime=" + PushTime + "]";
+	}
+
+    
+}
@@ -3,9 +3,7 @@ package com.zteits.irain.portal.web.fangle;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,35 +13,18 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.clouds.common.utils.ExceptionUtil;
 import com.clouds.common.web.BizController;
 import com.zteits.clouds.api.apibase.bean.BaseInfo;
 import com.zteits.clouds.api.apibase.bean.BizResult;
-import com.zteits.clouds.api.apibase.constants.ErrorType;
-import com.zteits.clouds.api.apibase.exception.BizException;
-import com.zteits.clouds.api.dto.park.param.BerthStateRequest;
-import com.zteits.clouds.api.dto.park.param.EqpHeartBeatRequest;
 import com.zteits.clouds.api.dto.park.param.EqpLogRequest;
-import com.zteits.clouds.api.dto.park.param.InParkingRequest;
-import com.zteits.clouds.api.dto.park.param.OutParkingRequest;
-import com.zteits.clouds.api.dto.park.param.InterfaceLogSaveRequest;
 import com.zteits.clouds.api.service.park.EqpBerthsService;
-import com.zteits.clouds.api.service.park.InterfaceLogService;
-import com.zteits.irain.portal.common.AESPlus;
-import com.zteits.irain.portal.common.HttpClientTutorial;
-import com.zteits.irain.portal.constant.IRainResultEnum;
-import com.zteits.irain.portal.constant.ParkConstant.InterfaceLog;
-import com.zteits.irain.portal.service.interfaces.inoutparklot.InOutParkLotReportService;
-import com.zteits.irain.portal.service.interfaces.inoutparklot.param.RecordInParkLotRequest;
-import com.zteits.irain.portal.service.interfaces.inoutparklot.param.RecordOutParkLotRequest;
-import com.zteits.irain.portal.vo.irain.IRainResponseVO;
+import com.zteits.irain.portal.vo.fangle.BerthStateRequest;
+import com.zteits.irain.portal.vo.fangle.EqpHeartBeatRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -105,7 +86,7 @@ public class FangleEqpController extends BizController{
 		eqpLogRequest.setElectricity(request.getElectricity());
 		eqpLogRequest.setVoltag(request.getVoltage());
-		BizResult<Map<String, String>> result = eqpBerthsService.synBerthState(eqpLogRequest);
+		BizResult<Map<String, String>> result = eqpBerthsService.synEqpInfo(eqpLogRequest);
 		return result;
 	}
@@ -149,7 +130,7 @@ public class FangleEqpController extends BizController{
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
-		BizResult<Map<String, String>> result = eqpBerthsService.synBerthState(eqpLogRequest);
+		BizResult<Map<String, String>> result = eqpBerthsService.synEqpInfo(eqpLogRequest);
 		return result;
 	}