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

任务相关

Browse Source
This commit is contained in:
李玉东 2025-09-20 22:06:03 +08:00
parent ff809b56ee
commit 5f7684698e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/hivekion/baseData/controller/ScenarioController.java
View File

@ -190,10 +190,10 @@ public class ScenarioController extends BaseController {
* @param type 类型 * @param type 类型
* @return 资源信息 * @return 资源信息
*/ */
@GetMapping("/resources/{type}") @GetMapping("/resources/{type}/{teamType}")
public ResponseData<List<ScenarioResource>> getResources( public ResponseData<List<ScenarioResource>> getResources(
@PathVariable("type") Integer type) { @PathVariable("type") Integer type,@PathVariable("teamType") Integer teamType) {
Map<String, String> iconMap = iconService.iconMap(); Map<String, String> iconMap = iconService.iconMap();
switch (type) { switch (type) {
case 1: case 1:
@ -210,10 +210,10 @@ public class ScenarioController extends BaseController {
convertEntityToResource(type, tblEntityService.selectAllChild(3), iconMap)); convertEntityToResource(type, tblEntityService.selectAllChild(3), iconMap));
case 5: case 5:
return ResponseData.success( return ResponseData.success(
covertTeamInfoToResource(type, iTeaminfoService.queryByType(0), iconMap)); covertTeamInfoToResource(type, iTeaminfoService.queryByType(0,teamType), iconMap));
case 6: case 6:
return ResponseData.success( return ResponseData.success(
covertTeamInfoToResource(type, iTeaminfoService.queryByType(1), iconMap)); covertTeamInfoToResource(type, iTeaminfoService.queryByType(1,teamType), iconMap));
case 7: case 7:
return ResponseData.success( return ResponseData.success(
covertBuildInfoToResource(type,iResourceService.listAllBuildResourceByType(7),iconMap)); covertBuildInfoToResource(type,iResourceService.listAllBuildResourceByType(7),iconMap));

2
src/main/java/com/hivekion/team/service/ITeaminfoService.java
View File

@ -17,6 +17,6 @@ public interface ITeaminfoService extends IService<Teaminfo> {
List<Teaminfo> list(Teaminfo teaminfo); List<Teaminfo> list(Teaminfo teaminfo);
Long count(Teaminfo teaminfo); Long count(Teaminfo teaminfo);
List<Teaminfo> queryByType(Integer type); List<Teaminfo> queryByType(Integer type,Integer teamType);
Map<Integer,Teaminfo> teamInfoMap(); Map<Integer,Teaminfo> teamInfoMap();
} }

3
src/main/java/com/hivekion/team/service/impl/TeaminfoServiceImpl.java
View File

@ -33,9 +33,10 @@ public class TeaminfoServiceImpl extends ServiceImpl<TeaminfoMapper, Teaminfo> i
} }
@Override @Override
public List<Teaminfo> queryByType(Integer type) { public List<Teaminfo> queryByType(Integer type, Integer teamType) {
QueryWrapper<Teaminfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<Teaminfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", type); queryWrapper.eq("type", type);
queryWrapper.eq("team_type", teamType == null ? 0 : teamType);
queryWrapper.orderByAsc("id"); queryWrapper.orderByAsc("id");
return this.list(queryWrapper); return this.list(queryWrapper);
} }