diff --git a/src/main/java/com/lz/config/ShiroConfig.java b/src/main/java/com/lz/config/ShiroConfig.java index 71c73101..36fedbc9 100644 --- a/src/main/java/com/lz/config/ShiroConfig.java +++ b/src/main/java/com/lz/config/ShiroConfig.java @@ -70,7 +70,7 @@ public class ShiroConfig { filterMap.put("/dtlg/jump", "anon"); filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/updateLuck", "anon"); - filterMap.put("/**", "anon"); + filterMap.put("/**", "oauth2"); shiroFilter.setFilterChainDefinitionMap(filterMap); return shiroFilter; diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index cf35373d..34c3de8e 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -414,6 +414,9 @@ public class ResultRecordController extends AbstractController { if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 resultRecortModelDto.setWeight(null); } + if(resultRecortModelDto.getMaxCount().intValue() == 10000){//不限制数量 + resultRecortModelDto.setMaxCount(null); + } List detailDtos = resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); for (ResultDetailDto dto:detailDtos @@ -577,6 +580,9 @@ public class ResultRecordController extends AbstractController { ) { int index = 0; BigDecimal weight = BigDecimal.ZERO; + if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){ + return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount()); + } for (ResultDetailDto detailDto:model.getDetailDtos() ) {//排序 ResultDetail resultDetail = new ResultDetail(); @@ -618,10 +624,10 @@ public class ResultRecordController extends AbstractController { } //下面不限权重的,计算权重之和是否超标 - if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 + /*if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 && weight.compareTo(model.getWeight()) == 1){ return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%"); - } + }*/ } //下面更新指标记录 if(inserts.size() > 0){