Commit 88a83e94 authored by 高建强's avatar 高建强

item:站端到中心级同步修改

parent 8c045a59
package com.yeejoin.amos.patrol.business.bo;
import lombok.Data;
/**
* The persistent class for the p_plan_task database table.
*/
@Data
public class PlanTaskSyncBo extends BasicEntityBo {
/**
* 批次号(该字段暂时无效,取值为表id)
*/
private long batchNo;
/**
* 开始时间
*/
private String beginTime;
/**
* 巡检日期
*/
private String checkDate;
/**
* 结束时间
*/
private String endTime;
/**
* 已完成数量
*/
private int finishNum;
/**
* 完成状态:0-尚未开始;1-正在进行;2-已经结束;3-超时漏检;4-已完成
*/
private int finishStatus;
/**
* 公司Id
*/
private String orgCode;
/**
* 计划编号
*/
private long planId;
/**
* 计划巡检点数
*/
private int pointNum;
/**
* 路线编号
*/
private long routeId;
/**
* 状态:0-有效;1-无效
*/
private int status;
/**
* 可执行人,一个或多个,多个用,隔开
*/
private String userId;
/**
* 是否按排序0-否;1-是
*/
private String inOrder;
/**
* 用户部门
*/
private String userDept;
/**
* 用户姓名
*/
private String userName;
}
\ No newline at end of file
......@@ -3,6 +3,7 @@ package com.yeejoin.amos.patrol.business.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.yeejoin.amos.patrol.business.bo.CheckInputSyncBo;
import com.yeejoin.amos.patrol.business.bo.PlanTaskSyncBo;
import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDao;
import com.yeejoin.amos.patrol.business.dao.repository.IPlanTaskDetailDao;
import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService;
......@@ -11,6 +12,7 @@ import com.yeejoin.amos.patrol.dao.entity.*;
import com.yeejoin.amos.patrol.mqtt.WebMqttComponent;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
......@@ -150,9 +152,10 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
public void planTaskDataSync(PlanTask planTask) {
try {
if (planTask != null) {
String message = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), planTask);
PlanTaskSyncBo planTaskSyncBo = buildPlanTaskBo(planTask);
String message = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), planTaskSyncBo);
webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), JSON.toJSONString(planTask, SerializerFeature.WriteMapNullValue));
webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), JSON.toJSONString(planTaskSyncBo, SerializerFeature.WriteMapNullValue));
}
} catch (Exception e) {
log.error("站端与中心级巡检数据【planTask】同步推送失败-----------" + e.getMessage());
......@@ -164,9 +167,10 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
try {
if (CollectionUtils.isNotEmpty(planTaskList)) {
planTaskList.forEach(x -> {
String message = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), x);
PlanTaskSyncBo planTaskSyncBo = buildPlanTaskBo(x);
String message = buildSyncMessage(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), planTaskSyncBo);
webMqttComponent.publish(PatrolDataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message);
webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), JSON.toJSONString(x, SerializerFeature.WriteMapNullValue));
webMqttComponent.publish(PatrolDataSyncTopicEnum.PLAN_TASK.getTopic(), JSON.toJSONString(planTaskSyncBo, SerializerFeature.WriteMapNullValue));
});
}
} catch (Exception e) {
......@@ -180,4 +184,10 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
map.put("data", object);
return JSON.toJSONString(map, SerializerFeature.WriteMapNullValue);
}
public PlanTaskSyncBo buildPlanTaskBo(PlanTask planTask) {
PlanTaskSyncBo taskSyncBo = new PlanTaskSyncBo();
BeanUtils.copyProperties(planTask, taskSyncBo);
return taskSyncBo;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment