diff --git a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 28a62973..40fb3e64 100644 --- a/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot-master/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -138,7 +138,7 @@ public class ShiroConfig { //filterChainDefinitionMap.put("/test/jeecgDemo/html", "anon"); //模板页面 //filterChainDefinitionMap.put("/test/jeecgDemo/redis/**", "anon"); //redis测试 filterChainDefinitionMap.put("/comp/bigScreen/**", "anon");//比赛大屏 - filterChainDefinitionMap.put("/admin/inde/**", "anon");//比赛大屏 + filterChainDefinitionMap.put("/admin/inde/inde", "anon");//比赛大屏 //websocket排除 filterChainDefinitionMap.put("/websocket/**", "anon");//系统通知和公告 diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompController.java index 03117523..2fa28b2b 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/controller/AnnconalCompController.java @@ -1,11 +1,13 @@ package org.jeecg.modules.demo.annualCompIntface.controller; +import io.lettuce.core.ScriptOutputType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect; import org.jeecg.modules.demo.annualCompIntface.service.AnnconalCompService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; @Api(tags = "组委会首页") @@ -31,4 +34,12 @@ public class AnnconalCompController Map result = annconalCompService.inde(); return Result.ok(result); } + + @ApiOperation(value = "管理员首页", notes = "管理员首页") + @GetMapping(value = "/studentindex") + public Result studentindex(HttpServletRequest req) { + List result = annconalCompService.studentindex(); + System.out.println(result); + return Result.ok(result); + } } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompService.java index 1e62e6c3..c39bbbfe 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompService.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompService.java @@ -1,7 +1,13 @@ package org.jeecg.modules.demo.annualCompIntface.service; +import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect; + +import java.util.List; import java.util.Map; public interface AnnconalCompService { Map inde(); + + + List studentindex(); } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompServiceImpl.java index c39bc6bb..4267e69f 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompIntface/service/AnnconalCompServiceImpl.java @@ -3,6 +3,10 @@ package org.jeecg.modules.demo.annualCompIntface.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation; +import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluationCollect; +import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationCollectService; +import org.jeecg.modules.demo.abilityEvaluation.service.IPersonalAbilityEvaluationService; import org.jeecg.modules.demo.annual.entity.Annual; import org.jeecg.modules.demo.annual.service.IAnnualService; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; @@ -41,6 +45,8 @@ public class AnnconalCompServiceImpl implements AnnconalCompService{ @Autowired private IAnnualCompetitionProjectRegistrationService annualCompetitionProjectRegistrationService; + @Autowired + private IPersonalAbilityEvaluationCollectService personalAbilityEvaluationService; @Override @@ -112,4 +118,12 @@ public class AnnconalCompServiceImpl implements AnnconalCompService{ return resultMap; } + @Override + public List studentindex() { + LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal(); + String username=user.getUsername(); + List personalAbilityEvaluations = personalAbilityEvaluationService.list(new LambdaQueryWrapper().in(PersonalAbilityEvaluationCollect::getWorkOn, "2340330327")); + return personalAbilityEvaluations; + } + } diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/IAnnualCompPointService.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/IAnnualCompPointService.java index 0216ba83..978f4dd8 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/IAnnualCompPointService.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualCompPoint/service/IAnnualCompPointService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.demo.annualCompPoint.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.demo.abilityEvaluation.entity.PersonalAbilityEvaluation; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/controller/CompSystemBigScreenController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/controller/CompSystemBigScreenController.java index 5ee24a31..7bc851cf 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/controller/CompSystemBigScreenController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/controller/CompSystemBigScreenController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; /** @@ -44,4 +45,12 @@ public class CompSystemBigScreenController /*extends JeecgController*/ { return Result.ok(result); } + //学生的首页 + @GetMapping(value = "/studentindex") + public Result studentindex(){ + + return Result.OK("qwq"); + } + + } diff --git a/jeecgboot-vue3-master/src/views/dashboard/Analysis/components/BdcTabCard.vue b/jeecgboot-vue3-master/src/views/dashboard/Analysis/components/BdcTabCard.vue index 7502ac85..e16bf291 100644 --- a/jeecgboot-vue3-master/src/views/dashboard/Analysis/components/BdcTabCard.vue +++ b/jeecgboot-vue3-master/src/views/dashboard/Analysis/components/BdcTabCard.vue @@ -2,50 +2,12 @@
- - + - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -54,10 +16,10 @@