diff --git a/src/main/java/com/zteits/irain/portal/vo/fangle/BerthStateRequest.java b/src/main/java/com/zteits/irain/portal/vo/fangle/BerthStateRequest.java deleted file mode 100644 index e5b8fa9..0000000 --- a/src/main/java/com/zteits/irain/portal/vo/fangle/BerthStateRequest.java +++ /dev/null @@ -1,82 +0,0 @@ -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 + "]"; - } - - -} diff --git a/src/main/java/com/zteits/irain/portal/vo/fangle/EqpHeartBeatRequest.java b/src/main/java/com/zteits/irain/portal/vo/fangle/EqpHeartBeatRequest.java deleted file mode 100644 index cbd5d18..0000000 --- a/src/main/java/com/zteits/irain/portal/vo/fangle/EqpHeartBeatRequest.java +++ /dev/null @@ -1,60 +0,0 @@ -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 + "]"; - } - - -} diff --git a/src/main/java/com/zteits/irain/portal/web/fangle/FangleEqpController.java b/src/main/java/com/zteits/irain/portal/web/fangle/FangleEqpController.java deleted file mode 100644 index 8583f9d..0000000 --- a/src/main/java/com/zteits/irain/portal/web/fangle/FangleEqpController.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.zteits.irain.portal.web.fangle; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -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.RestController; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -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.dto.park.param.EqpLogRequest; -import com.zteits.clouds.api.service.park.EqpBerthsService; -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; - -/** - * Copyright: Copyright (c) 2017 ZTE-ITS - * - * @ClassName: FangleEqpController.java - * @Description:方格尔设备同步 - * @version: v1.0.0 - * @author: wangfei - * @date: 2017年4月20日 下午17:51:45 - * Modification History: - * Date Author Version Description - *---------------------------------------------------------* - * 2017年8月21日 wangfei v1.0.0 创建 - */ -@Api(value="方格尔设备同步",description="方格尔设备同步") -@RestController -@RequestMapping("/fangle") -public class FangleEqpController extends BizController{ - - - private static final Logger logger = LoggerFactory.getLogger(FangleEqpController.class); - @Value("${project.syscode}") - private String sysCode; - @Autowired - private EqpBerthsService eqpBerthsService; - - @ApiOperation("泊位信息同步") - @RequestMapping(value = "/synBerthInfo",method = RequestMethod.POST) - public BizResult> synBerthInfo(@RequestBody String param){ - logger.info("同步入参：" + param); - - JSONObject jsonObject = JSONObject.parseObject(param); - String reqList = jsonObject.getString("pushdata"); - JSONArray jsonArray = JSON.parseArray(reqList); - BerthStateRequest request = JSON.parseObject(jsonArray.getString(0),BerthStateRequest.class); - BaseInfo info = new BaseInfo(); - request.setBaseRequest(info); - request.setSysCode(sysCode); - //数据转换 - EqpLogRequest eqpLogRequest = new EqpLogRequest(); - BeanUtils.copyProperties(request, eqpLogRequest); - eqpLogRequest.setBerthOutNo(request.getBerthcode()); - eqpLogRequest.setEqpType(1);//地磁 - if(request.getBerthstatus().equals("1") || request.getBerthstatus().equals("2")){ - eqpLogRequest.setEqpStatus("1");//设备状态 1-正常 - } - if(request.getBerthstatus().equals("3")){ - eqpLogRequest.setEqpStatus("0");//设备状态 0-故障 - } - if(request.getBerthstatus().equals("2")){ - eqpLogRequest.setBerthState("0");//泊位状态 0-空闲 - } - if(request.getBerthstatus().equals("1")){ - eqpLogRequest.setBerthState("1");//泊位状态 1- 占用 - } - eqpLogRequest.setElectricity(request.getElectricity()); - eqpLogRequest.setVoltag(request.getVoltage()); - - BizResult> result = eqpBerthsService.synEqpInfo(eqpLogRequest); - return result; - } - - @ApiOperation("设备心跳信息同步") - @RequestMapping(value = "/synEqpHeartBeatInfo",method = RequestMethod.POST) - public BizResult> synEqpHeartBeatInfo(@RequestBody String param){ - logger.info("同步入参：" + param); - - JSONObject jsonObject = JSONObject.parseObject(param); - String reqList = jsonObject.getString("pushdata"); - JSONArray jsonArray = JSON.parseArray(reqList); - EqpHeartBeatRequest request = JSON.parseObject(jsonArray.getString(0),EqpHeartBeatRequest.class); - BaseInfo info = new BaseInfo(); - request.setBaseRequest(info); - request.setSysCode(sysCode); - - //数据转换 - EqpLogRequest eqpLogRequest = new EqpLogRequest(); - BeanUtils.copyProperties(request, eqpLogRequest); - eqpLogRequest.setEqpNo(request.getEquipmentCode()); - if(request.getEquipmentType().equals("1")){ - eqpLogRequest.setEqpType(4);//设备类型 4-车检器 - } - if(request.getEquipmentType().equals("2")){ - eqpLogRequest.setEqpType(5);//设备类型 5-网关 - } - if(request.getEquipmentType().equals("3")){ - eqpLogRequest.setEqpType(6);//设备类型 6-中继器 - } - if(request.getEquipmentStatus().equals("1")){ - eqpLogRequest.setEqpStatus("1");//设备状态 1-正常 - } - if(request.getEquipmentStatus().equals("2")){ - eqpLogRequest.setEqpStatus("0");//设备状态 0-故障 - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - Date date; - try { - date = sdf.parse(request.getPushTime()); - eqpLogRequest.setHeartbeatTime(date); - } catch (ParseException e) { - e.printStackTrace(); - } - BizResult> result = eqpBerthsService.synEqpInfo(eqpLogRequest); - return result; - } - -}