Commit 9bb1742a authored by chenhao's avatar chenhao

提交消息发送的代码

parent abfcd8ba
...@@ -25,7 +25,7 @@ public class AlertCallePowerTransferRo implements Serializable{ ...@@ -25,7 +25,7 @@ public class AlertCallePowerTransferRo implements Serializable{
* *
* </pre> * </pre>
*/ */
private static final long serialVersionUID = 9053208791780047768L; private static final long serialVersionUID = 4681455545767986333L;
/** /**
* 通用属性 * 通用属性
......
...@@ -23,7 +23,7 @@ public class PushMessageWebAndAppRo implements Serializable { ...@@ -23,7 +23,7 @@ public class PushMessageWebAndAppRo implements Serializable {
/** /**
* *
*/ */
private static final long serialVersionUID = 7088367773637834235L; private static final long serialVersionUID = -8083389507633759711L;
@Label(value = "类别") @Label(value = "类别")
private Integer category; private Integer category;
......
...@@ -8,9 +8,6 @@ import java.util.Map; ...@@ -8,9 +8,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStageEnums;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttException;
...@@ -39,6 +36,8 @@ import com.yeejoin.amos.boot.module.common.api.entity.FireTeam; ...@@ -39,6 +36,8 @@ import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient; import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper; import com.yeejoin.amos.boot.module.common.api.mapper.DynamicFormInstanceMapper;
import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyCarServiceImpl; import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyCarServiceImpl;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledObjsDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto; import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto; import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCarCountDto;
import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto; import com.yeejoin.amos.boot.module.jcs.api.dto.PowerCompanyCountDto;
...@@ -151,14 +150,14 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe ...@@ -151,14 +150,14 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr(); Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
// 获取任务派发模板 // 获取任务派发模板
Template template = templateService // Template template = templateService
.getOne(new QueryWrapper<Template>().eq("type_code", "LLDP").eq("format", false)); // .getOne(new QueryWrapper<Template>().eq("type_code", "LLDP").eq("format", false));
String content = template.getContent(); // String content = template.getContent();
Map<String, String> definitions = new HashMap<>(); // Map<String, String> definitions = new HashMap<>();
// initDefinitions(definitions, alertCalled, powerTransferDto); // // initDefinitions(definitions, alertCalled, powerTransferDto);
//
// 创建力量调派单位 // // 创建力量调派单位
createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content, alertCalled); // createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content, alertCalled);
// 封装调派任务的集合,以便于实现任务规则校验 // 封装调派任务的集合,以便于实现任务规则校验
try { try {
......
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