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

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/AlertCalledController.java

@@ -135,6 +135,10 @@ public class AlertCalledController extends BaseController {
 	@Autowired
 	TzsAuthService tzsAuthService;
 
+
+	@Autowired
+	private ElevatorServiceImpl iElevatorService;
+
 	/**
 	 * 新增警情接警填报记录
 	 *
@@ -144,10 +148,17 @@ public class AlertCalledController extends BaseController {
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增警情接警填报记录", notes = "新增警情接警填报记录")
 	public ResponseModel<AlertCalledDto> save(@RequestBody AlertCalledObjsDto alertCalledObjsDto) {
-		if (ValidationUtil.isEmpty(alertCalledObjsDto)
-				|| ValidationUtil.isEmpty(alertCalledObjsDto.getAlertCalledDto())) {
+		if (ValidationUtil.isEmpty(alertCalledObjsDto)) {
 			throw new BadRequest("参数校验失败.");
 		}
+
+		LambdaQueryWrapper<Elevator> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(Elevator::getRescueCode,alertCalledObjsDto.getAlertCalledDto().getDeviceId());
+		Elevator elevator = iElevatorService.getOne(queryWrapper);
+		if(elevator == null) {
+			throw new BadRequest("未找到相关电梯.");
+		}
+
 		ReginParams reginParams = getSelectedOrgInfo();
 		alertCalledObjsDto = iAlertCalledService.createAlertCalled(alertCalledObjsDto, reginParams.getUserModel());
 

amos-boot-system-tzs/src/main/resources/application.properties

-spring.application.name=TZS-kfm
+spring.application.name=TZS
 server.servlet.context-path=/tzs
 server.port=11000
 spring.profiles.active=jd