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/controller/ExcelController.java

@@ -165,7 +165,7 @@ public class ExcelController extends BaseController {
 	 */
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "导出值班模板", notes = "导出值班模板")
-	@PostMapping(value = "/duty_template")
+	@GetMapping (value = "/duty_template")
 	public void dutyCarTemplate(HttpServletResponse response, @RequestParam("beginDate") String beginDate,
 			@RequestParam("endDate") String endDate, ExcelDto excelDto, @RequestParam("ids") String ids) {
 		try {

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,7 +206,10 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
                      */
                     AlertCalledRo alertCalledRo = new AlertCalledRo();
 
-                    String replaceContent = RuleAlertCalledService.init(alertCalledRo,alertCalledVo);
+                    String replaceContent ="";
+                    if(null != alertCalled) {
+                        replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledVo);
+                    }
 
                     Map<String, String> definitions = new HashMap<>();
                     definitions.put("$type",alertCalled.getAlertType());

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

@@ -411,7 +411,10 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
 		 * 构建警情报送规则对象
 		 */
 		AlertCalledRo alertCalledRo = new AlertCalledRo();
-		String replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledObjsDto);
+		String replaceContent ="";
+		if(null != alertCalled) {
+			replaceContent = RuleAlertCalledService.init(alertCalledRo, alertCalledObjsDto);
+		}
 
 		definitions.put("rescueGrid", alertCalled.getAddress());
 		definitions.put("type", alertCalled.getAlertType());