Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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);
+            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);
+           createPowerTransferCompany(powerTransferDto, powerTransferSequenceNbr, definitions, content);
             
             //封装调派任务的集合，以便于实现任务规则校验
             try {
-				packagePowerTransferDetail(powerTransferDto);
+			//	packagePowerTransferDetail(powerTransferDto);
 			} catch (Exception e) {
 				log.error("调用规则失败：PowerTransferServiceImpl。createPowerTransfer（）");
 			}