bug 3532

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AlertSubmittedController.java

@@ -262,26 +262,6 @@ public class AlertSubmittedController extends BaseController {
         return ResponseHelper.buildResponse(schedulingContent);
     }
 
-    /**
-     * 获取警情续报内容
-     *
-     * @return 返回结果
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "/alert_submitted/ddd", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取警情续报内容和模板", notes = "获取警情续报内容和模板")
-    public ResponseModel<Object> getAlertSubmittedContentDD() {
-        try {
-            AlertCalledFormDto alertCalledFormDto = (AlertCalledFormDto)alertCalledService.selectAlertCalledByIdNoRedis(1455815417061728258L);
-
-            alertSubmittedService.generateMob(alertCalledFormDto.getAlertCalled());
-        }  catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return ResponseHelper.buildResponse(null);
-    }
 
     private String getTaskInformation(String content, Map<String, String> definitions) {
         int size = definitions.size();

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

@@ -206,6 +206,7 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                     definitions.put("$callTime", DateUtils.dateTimeToDateString(alertCalled.getCallTime()));
                     definitions.put("$replaceContent",replaceContent);
                     definitions.put("$address",alertCalled.getAddress());
+                    definitions.put("$recDate",DateUtils.dateTimeToDateString(alertCalled.getRecDate()));
                     String content = getTaskInformation( template.getRichContent(),definitions);
 
                     alertSubmittedExtDto.setSubmissionContentValue(JSONObject.parseObject(alertSubmittedExtDto.getSubmissionContent()));
@@ -848,14 +849,19 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
         }
     }
     void handleFunc(AlertCalledPowerInfoDto dto,Map<String, Object> map) {
-        dto.setCarName(map.get("carName").toString());
+        if (map.containsKey("carName")) {
+            dto.setCarName(map.get("carName").toString());
+        }
+
         dto.setStation(map.get("companyName").toString());
         // 随车人员
-        List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(map.get("id").toString()));
-        if(!ValidationUtil.isEmpty(powerDataOne)) {
-            dto.setPersonNum(String.valueOf(powerDataOne.size()));
-        } else {
-            dto.setPersonNum("0");
+        if (map.containsKey("id")) {
+            List<PowerData> powerDataOne = powerTransferMapper.getPowerDataOne(Long.valueOf(map.get("id").toString()));
+            if (!ValidationUtil.isEmpty(powerDataOne)) {
+                dto.setPersonNum(String.valueOf(powerDataOne.size()));
+            } else {
+                dto.setPersonNum("0");
+            }
         }
     }
 

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

@@ -187,16 +187,16 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
         }
         if (fullTimeList.size() > 0) {
             ruleAlertCalledService.powerTransferCalledRule(fullTimeList, powerTransferDto.getAlertCalledId(),
-                    FireBrigadeTypeEnum.专职消防队.getKey());
+                    FireBrigadeTypeEnum.专职消防队.getKey(), powerTransferDto.getCompanyName());
         }
         if (medicalTeamList.size() > 0) {
             ruleAlertCalledService.powerTransferCalledRule(medicalTeamList, powerTransferDto.getAlertCalledId(),
-                    FireBrigadeTypeEnum.医疗救援队.getKey());
+                    FireBrigadeTypeEnum.医疗救援队.getKey(), powerTransferDto.getCompanyName());
 
         }
         if (monitorTeamList.size() > 0) {
             ruleAlertCalledService.powerTransferCalledRule(monitorTeamList, powerTransferDto.getAlertCalledId(),
-                    FireBrigadeTypeEnum.监控大队.getKey());
+                    FireBrigadeTypeEnum.监控大队.getKey(), powerTransferDto.getCompanyName());
 
         }
     }

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

@@ -73,7 +73,7 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
             PowerTransferCompany company = powerTransferCompanyService.getById(id);
 
             list.stream().forEach(e->{
-                dto.setReceiveName(dto.getReceiveName() == null ? "".concat(e.getReceiveName() == null ? "" : e.getReceiveName()) : dto.getReceiveName().concat("/").concat(e.getReceiveName() == null ? "" : e.getReceiveName()) );
+                dto.setReceiveName(dto.getReceiveName() == null ? "".concat(e.getReceiveName() == null ? "" : e.getReceiveName()) : "".equals(e.getReceiveName()) ?  "".concat(e.getReceiveName()) : dto.getReceiveName().concat("/").concat(e.getReceiveName() == null ? "" : e.getReceiveName()) );
                 dto.setSendTime(e.getSendTime());
                 dto.setSendContent(e.getSendContent());
                 dto.setRecUserName(e.getRecUserName());
@@ -92,10 +92,12 @@ public class PowerrTransferLogServiceImpl extends BaseService<PowerrTransferLogD
             PowerrTransferLogDto dto = new PowerrTransferLogDto();
             queryWrapper.eq(PowerrTransferLog::getResourceId,id);
             PowerrTransferLog powerrTransferLog = this.getOne(queryWrapper);
-            PowerTransferCompanyResources resources = powerTransferCompanyResourcesService.getById(id);
-            PowerTransferCompany byId = powerTransferCompanyService.getById(resources.getPowerTransferCompanyId());
-            powerrTransferLog.setSendContent(byId.getTaskInformation());
-            Bean.toPo(powerrTransferLog,dto);
+            if(null != powerrTransferLog) {
+                PowerTransferCompanyResources resources = powerTransferCompanyResourcesService.getById(id);
+                PowerTransferCompany byId = powerTransferCompanyService.getById(resources.getPowerTransferCompanyId());
+                powerrTransferLog.setSendContent(byId.getTaskInformation());
+                Bean.toPo(powerrTransferLog,dto);
+            }
             return dto;
         }
 

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

@@ -235,7 +235,7 @@ public class RuleAlertCalledService {
 		return replaceContent;
 	}
 
-	public boolean powerTransferCalledRule(Set<PowerTransferCompanyDto> i, Long alertCalledId, String type) throws Exception {
+	public boolean powerTransferCalledRule(Set<PowerTransferCompanyDto> i, Long alertCalledId, String type,String companyName) throws Exception {
 		if (ValidationUtil.isEmpty(alertCalledId)) {
 			throw new BadRequest("参数校验失败.");
 		}
@@ -255,7 +255,7 @@ public class RuleAlertCalledService {
 		alertCallePowerTransferRo.setAddress(alertCalled.getAddress());
 		alertCallePowerTransferRo.setAlertType(alertCalled.getAlertType());
 		alertCallePowerTransferRo.setAlertTypeCode(alertCalled.getAlertTypeCode());
-		alertCallePowerTransferRo.setCompanyName(alertCalled.getCompanyName());
+		alertCallePowerTransferRo.setCompanyName(companyName);
 		alertCallePowerTransferRo.setTrappedNum(Integer.toString(alertCalled.getTrappedNum()));
 		alertCallePowerTransferRo.setCasualtiesNum(Integer.toString(alertCalled.getCasualtiesNum()));
 		alertCallePowerTransferRo.setContactPhone(alertCalled.getContactPhone());