提交代码

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertCallePowerTransferRo.java

@@ -29,7 +29,7 @@ public class AlertCallePowerTransferRo implements Serializable{
 	 * 
 	 * </pre>
 	 */
-	private static final long serialVersionUID = 7091835997817930383L;
+	private static final long serialVersionUID = 4735920511849348360L;
 
 	/**
 	 * 通用属性

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferServiceImpl.java

@@ -147,18 +147,18 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
             Long powerTransferSequenceNbr = powerTransfer.getSequenceNbr();
 
             // 获取任务派发模板
-            Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
-                    alertCalled.getAlertType()).eq("format", false));
-            String content = template.getContent();
-            Map<String, String> definitions = new HashMap<>();
-            initDefinitions(definitions, alertCalled, powerTransferDto);
-
-            // 创建力量调派单位
-           createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
+//            Template template = templateService.getOne(new QueryWrapper<Template>().eq("type",
+//                    alertCalled.getAlertType()).eq("format", false));
+//            String content = template.getContent();
+//            Map<String, String> definitions = new HashMap<>();
+//            initDefinitions(definitions, alertCalled, powerTransferDto);
+//
+//            // 创建力量调派单位
+//           createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
             
             //封装调派任务的集合，以便于实现任务规则校验
             try {
-			//	packagePowerTransferDetail(powerTransferDto);
+				packagePowerTransferDetail(powerTransferDto);
 			} catch (Exception e) {
 				log.error("调用规则失败：PowerTransferServiceImpl。createPowerTransfer（）");
 			}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java

@@ -172,7 +172,7 @@ public class RuleAlertCalledService {
 				}
 			}
 		}
-		if (FireBrigadeTypeEnum.专职消防队.equals(type)) {
+		if (FireBrigadeTypeEnum.专职消防队.getKey().equals(type)) {
 			alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
 			alertCallePowerTransferRo.setPowerTransType(type);
 			StringBuffer stringBuffer = new StringBuffer();
@@ -182,7 +182,7 @@ public class RuleAlertCalledService {
 			stringBuffer.append(" 有无危险爆炸品："+dangerousExplosives);
 			alertCallePowerTransferRo.setContent(stringBuffer.toString());
 			
-		} else if (FireBrigadeTypeEnum.监控大队.equals(type)) {
+		} else if (FireBrigadeTypeEnum.监控大队.getKey().equals(type)) {
 			alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
 			alertCallePowerTransferRo.setPowerTransType(type);
 			StringBuffer stringBuffer = new StringBuffer();
@@ -192,7 +192,7 @@ public class RuleAlertCalledService {
 			stringBuffer.append(" 有无危险爆炸品："+dangerousExplosives);
 			alertCallePowerTransferRo.setContent(stringBuffer.toString());
 			
-		} else if (FireBrigadeTypeEnum.医疗救援队.equals(type)) {
+		} else if (FireBrigadeTypeEnum.医疗救援队.getKey().equals(type)) {
 			alertCallePowerTransferRo.setCompany(new ArrayList<>(i));
 			alertCallePowerTransferRo.setPowerTransType(type);
 			StringBuffer stringBuffer = new StringBuffer();