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

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/PowerTransferMapper.xml

@@ -30,7 +30,7 @@
                        left join jc_power_transfer pt on ptc.power_transfer_id = pt.sequence_nbr
                        right join jc_power_transfer_company_resources ptcr
                                   on ptcr.power_transfer_company_id = ptc.sequence_nbr
-              where pt.alert_called_id = '63453543'
+              where pt.alert_called_id = #{alertCalledId}
                 and ptc.is_distribution_agencies = 0) r
         group by company_name, type, rec_date
         having rec_date = (select rec_date from jc_power_transfer_company_resources order by rec_date desc limit 1)

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

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,11 +53,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 	 * @return
 	 */
     @Transactional
-	 public AlertCalledVo createAlertCalled(AlertCalledVo alertCalledVo) throws Exception { 
-	   	 
+	 public AlertCalledVo createAlertCalled(AlertCalledVo alertCalledVo)  {
+		try {
    	    // 警情基本信息
          AlertCalled alertCalled = alertCalledVo.getAlertCalled();
-        
+			alertCalled.setCallTime(new Date());
          // 判断是否归并警情
          if (alertCalled.getFatherAlert() != null) {
              // 警情归并，设置当前警情状态为结束。
@@ -92,6 +93,9 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
          eSAlertCalledService.saveAlertCalledToES(alertCalled);
          
 		 return alertCalledVo;
+		} catch (Exception e) {
+			throw new RuntimeException("报送失败，系统异常!");
+		}
 	 }
 		 
 		 

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

@@ -215,9 +215,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto,Ale
             Template template = templateService.getOne(new QueryWrapper<Template>().eq("type_code",
                     dataDictionary.getCode()));
             List<PowerTransferCompanyVo> lastPowerTransferCompany;
-            powerTransferService.getLastPowerTransferCompany(alertCalledId);
             if ("警情续报".equals(template.getType()) && (lastPowerTransferCompany =
                     powerTransferService.getLastPowerTransferCompany(alertCalledId)).size() > 0) {
+                map.put("businessType",template.getType());
                 // 获取力量调派内容
                 StringBuilder companyNames = new StringBuilder();
                 StringBuilder resourcesInfo = new StringBuilder();