修改镜屏推送信息

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/AlarmManagementController.java

@@ -19,6 +19,7 @@ import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.AlarmManagementService;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.work.rescue.model.WorkTaskRescue;
import com.ai.bss.work.task.model.common.WorkTask;
@@ -74,7 +75,7 @@ public class AlarmManagementController {
	 */
	@ResponseBody
	@RequestMapping("/assignRescuer")
	public CommonResponse<WorkTaskRescue> assignRescuer(@RequestBody Map<String, String> params,
	public CommonResponse<EntityPosition> assignRescuer(@RequestBody Map<String, String> params,
			HttpServletRequest request) throws Exception {
		if (params == null || StringUtils.isEmpty(params.get("workTaskId"))
				|| StringUtils.isEmpty(params.get("rescuersId"))) {
@@ -112,7 +113,7 @@ public class AlarmManagementController {
		workTaskRescue.setWorkTaskId(params.get("workTaskId"));
		workTaskRescue.setCloseTime(new Date());
		return alarmManagementService.closeRescue(workTaskRescue, params.get("isFalseAlarm"));
		return alarmManagementService.closeRescue(workTaskRescue, params.get("isAssignAlarm"));
	}
	/**
@@ -163,11 +164,14 @@ public class AlarmManagementController {
	*/
	@ResponseBody
	@RequestMapping("/deleteCloseAlarm")
	public CommonResponse<Void> deleteCloseAlarm(@RequestBody Map<String, String> params) throws Exception {
	public  CommonResponse<WorkTaskRescue> deleteCloseAlarm(@RequestBody Map<String, String> params) throws Exception {
		if (params == null || StringUtils.isEmpty(params.get("workTaskId"))) {
			return CommonResponse.fail("500", "删除失败");
		}
		return alarmManagementService.deleteCloseAlarm(params);
		WorkTaskRescue workTaskRescue = new WorkTaskRescue();
        workTaskRescue.setWorkTaskId(params.get("workTaskId"));
		
		return alarmManagementService.deleteCloseAlarm(workTaskRescue);
	}
}

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/impl/AlarmManagementServiceImpl.java

@@ -20,7 +20,9 @@ import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.location.rescue.service.interfaces.AlarmManagementService;
import com.ai.bss.location.rescue.util.DateUtil;
import com.ai.bss.location.rescue.util.EbcConstant;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.position.model.MapAreaBusinessType;
import com.ai.bss.position.repository.EntityPositionRepository;
import com.ai.bss.position.service.api.MapAreaQuery;
import com.ai.bss.work.rescue.model.WorkTaskRescue;
import com.ai.bss.work.rescue.service.api.RescueCommand;
@@ -40,6 +42,9 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
	@Autowired
	private RescueQueryService rescueQueryService;
	
	@Autowired
	private EntityPositionRepository entityPositionRepository;
	@Autowired
	private MapAreaTagQuery mapAreaTagQuery;
@@ -145,9 +150,16 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
	 * @throws Exception
	 */
	@Override
	public CommonResponse<WorkTaskRescue> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception {
	public CommonResponse<EntityPosition> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception {
		CommonRequest<WorkTaskRescue> commonRequest = new CommonRequest<WorkTaskRescue>(workTaskRescue);
		return rescueCommand.assignRescueEmployee(commonRequest);
		
		List<EntityPosition> list = entityPositionRepository.findByEntityId(workTaskRescue.getWorkTaskId());
		if (!CollectionUtils.isEmpty(list)) {
			return CommonResponse.ok(list.get(0));
		}else {
			return CommonResponse.ok(null);
		}
		
	}
	/**
@@ -260,14 +272,14 @@ public class AlarmManagementServiceImpl implements AlarmManagementService {
	/**
	 * 删除历史报警
	 * 
	* @param params
	* @param workTaskRescue
	* @return
	* @throws Exception
	*/
	@Override
	public CommonResponse<Void> deleteCloseAlarm(Map<String, String> params) throws Exception {
		return null;
	public CommonResponse<WorkTaskRescue> deleteCloseAlarm(WorkTaskRescue workTaskRescue) throws Exception {
		CommonRequest<WorkTaskRescue> commonRequest=new CommonRequest(workTaskRescue);
		return rescueCommand.deleteTask(commonRequest);
	}
}

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/interfaces/AlarmManagementService.java

@@ -6,6 +6,7 @@ import java.util.Map;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.components.common.model.PageBean;
import com.ai.bss.position.model.EntityPosition;
import com.ai.bss.work.rescue.model.WorkTaskRescue;
/**
@@ -36,7 +37,7 @@ public interface AlarmManagementService {
	 * @return
	 * @throws Exception
	 */
	CommonResponse<WorkTaskRescue> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception;
	CommonResponse<EntityPosition> assignRescuer(WorkTaskRescue workTaskRescue) throws Exception;
	/**
	 * 关闭救援
@@ -70,10 +71,10 @@ public interface AlarmManagementService {
	/**
	 * 删除历史报警
	 * 
	* @param params
	* @param workTaskRescue
	* @return
	* @throws Exception
	*/
	CommonResponse<Void> deleteCloseAlarm(Map<String, String> params) throws Exception;
	 CommonResponse<WorkTaskRescue> deleteCloseAlarm(WorkTaskRescue workTaskRescue) throws Exception;
}

location-rescue-service/src/main/java/com/ai/bss/location/rescue/service/task/LocationMirrorTask.java

@@ -47,6 +47,7 @@ public class LocationMirrorTask implements EntityPositionChangeHandle {
				resultMap.put("unaggregatedEntityPositionList", new ArrayList<EntityPosition>());
			}
			resultMap.put("currentEntityPosition", commonRequest.getData().getCurrentEntityPosition());
			resultMap.put("countMap", locationManagementService.loadEmployeeStatusCount());
			String msg = JSON.toJSONString(CommonResponse.ok(resultMap));