liyudong/simulation-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.hivekion.com:3000/liyudong/simulation-backend

Browse Source
This commit is contained in:
李玉东 2025-09-20 18:21:24 +08:00
commit aef2cb7771
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/hivekion/statistic/service/impl/ScenarioServiceImpl.java
View File

@ -20,6 +20,7 @@ import com.hivekion.supplier.service.ISupplierRequestService;
import com.hivekion.supplier.service.SuppliesDictService; import com.hivekion.supplier.service.SuppliesDictService;
import com.hivekion.team.entity.Teaminfo; import com.hivekion.team.entity.Teaminfo;
import com.hivekion.team.service.ITeaminfoService; import com.hivekion.team.service.ITeaminfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -29,6 +30,7 @@ import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Component("WebsocketScenarioService") @Component("WebsocketScenarioService")
@Slf4j
public class ScenarioServiceImpl implements ScenarioService { public class ScenarioServiceImpl implements ScenarioService {
@Resource @Resource
@ -65,6 +67,14 @@ public class ScenarioServiceImpl implements ScenarioService {
scenarioInfo.getTeam().setTeamName(map.get(resource.getResourceId()).getName()); scenarioInfo.getTeam().setTeamName(map.get(resource.getResourceId()).getName());
} }
} }
try {
scenarioInfo.getTeam().setType(resourceInstance.getType());
scenarioInfo.getTeam().setLat(resourceInstance.getLat());
scenarioInfo.getTeam().setLng(resourceInstance.getLng());
}catch (Exception ex){
log.error("============={}==========================",resourceId);
ex.printStackTrace();
}
//获取关联的组织机构信息 //获取关联的组织机构信息
ScenarioOrgPost post = new ScenarioOrgPost(); ScenarioOrgPost post = new ScenarioOrgPost();
post.setResourceId(resourceId); post.setResourceId(resourceId);
@ -123,10 +133,6 @@ public class ScenarioServiceImpl implements ScenarioService {
suppliers = new ArrayList<>(); suppliers = new ArrayList<>();
} }
scenarioInfo.getTeam().setType(resourceInstance.getType());
scenarioInfo.getTeam().setLat(resourceInstance.getLat());
scenarioInfo.getTeam().setLng(resourceInstance.getLng());
ScenarioTask scenarioTask = new ScenarioTask(); ScenarioTask scenarioTask = new ScenarioTask();
scenarioTask.setScenarioId(scenarioId); scenarioTask.setScenarioId(scenarioId);
scenarioTask.setRoomId(roomId); scenarioTask.setRoomId(roomId);