|
|
|
@ -261,52 +261,52 @@ public class NettyServer { |
|
|
|
logger.warn("######## 非法的消息不予处理, 客户: {}, 命令: {}, 消息体 ########\n{}", binaryModel.id, command, xml); |
|
|
|
} |
|
|
|
break; |
|
|
|
case PushType.patrolDeviceState: |
|
|
|
case PushType.patrolDeviceState:// insert into basedata_mont_patdevstadata |
|
|
|
// json = downXml2Json.PatrolDeviceStateControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, PatrolDeviceStateControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端设备状态数据 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.patrolDeviceRunning: |
|
|
|
case PushType.patrolDeviceRunning:// insert into basedata_mont_patdevrundata |
|
|
|
// json = downXml2Json.PatrolDeviceRunningControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, PatrolDeviceRuningControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端设备运行数据 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.nestState: |
|
|
|
case PushType.nestState:// insert into basedata_mont_neststadata |
|
|
|
// json = downXml2Json.NestStateControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, NestStateControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端机巢状态数据 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.nestRunning: |
|
|
|
case PushType.nestRunning:// insert into basedata_mont_nestrundata |
|
|
|
// json = downXml2Json.NestRunningControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, NestRuningControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端机巢运行数据 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.location: |
|
|
|
case PushType.location:// insert into basedata_mont_patdevcoord |
|
|
|
// json = downXml2Json.LocationControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, LocationControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端设备坐标 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.route: |
|
|
|
case PushType.route:// insert into basedata_mont_patdevpatroute |
|
|
|
// json = downXml2Json.RouteControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, RouteControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端设备路线 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.alarm: |
|
|
|
case PushType.alarm:// insert into basedata_mont_patdevalmabn |
|
|
|
// json = down.AlarmControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, AlarmControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端设备异常告警 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.environment: |
|
|
|
case PushType.environment:// insert into basedata_mont_evndata |
|
|
|
// json = downXml2Json.EnvironmentControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, EnvironmentControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端设备上报环境数据 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.taskState: |
|
|
|
case PushType.taskState:// insert into basedata_mont_taskstadata and patrol_task_status |
|
|
|
// json = downXml2Json.TaskStateControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, TaskStateControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端设备任务状态 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
break; |
|
|
|
case PushType.result: |
|
|
|
case PushType.result:// insert into basedata_mont_taskresult and patrol_task_result_main |
|
|
|
// json = downXml2Json.TaskResultControlXml2Json(xml); |
|
|
|
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, xml, TaskResultControl.class); |
|
|
|
logger.info("######## 会话: {}, 客户: {}, 客户端巡视结果 ########", binaryModel.uuid, binaryModel.id); |
|
|
|
@ -320,6 +320,7 @@ public class NettyServer { |
|
|
|
JSONObject jsonObject = JSONObject.parseObject(json); |
|
|
|
jsonObject.put("uuid", binaryModel.uuid); |
|
|
|
json = jsonObject.toJSONString(); |
|
|
|
// send to BasedataMontDataMqAcceptHandle |
|
|
|
rabbitTemplate.convertAndSend(Constant.EX_CHANGE_NAME, Constant.ROUTING_KEY_NAME, json); |
|
|
|
String receiveCode = root.element("ReceiveCode").getText(); |
|
|
|
feedbackToDevice(binaryModel.uuid, receiveCode, sendCode); |
|
|
|
|