|
@@ -106,9 +106,6 @@ public class SysAdminSetController {
|
|
|
@RequestMapping(value = "/menu/custom/list", method = RequestMethod.POST)
|
|
|
public Result customList() {
|
|
|
List<PrivilegeDto> customPrivilegeList = sysPrivilegeService.addCustomList();
|
|
|
-// SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST);
|
|
|
-// Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
|
|
|
-// return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList, Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", "))));
|
|
|
return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList));
|
|
|
}
|
|
|
|
|
@@ -179,30 +176,6 @@ public class SysAdminSetController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-// List<SysConfig> sysConfigList = new ArrayList<>();
|
|
|
-// SysConfig sysConfig = commonCacheService.addSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST);
|
|
|
-// if (Objects.isNull(sysConfig)) {
|
|
|
-// sysConfig = new SysConfig(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST, "pdf格式清单", Arrays.asList(tSchoolPrivilegeParam.getPdfSize()).toString());
|
|
|
-// } else {
|
|
|
-// if (Objects.nonNull(tSchoolPrivilegeParam.getPdfSize()) && tSchoolPrivilegeParam.getPdfSize().length > 0) {
|
|
|
-// sysConfig.setConfigValue(Arrays.asList(tSchoolPrivilegeParam.getPdfSize()).toString());
|
|
|
-// } else {
|
|
|
-// sysConfig.setConfigValue(null);
|
|
|
-// }
|
|
|
-// }
|
|
|
-// sysConfigList.add(sysConfig);
|
|
|
-//
|
|
|
-// SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
|
|
|
-// if (Objects.isNull(sysConfigAccount)) {
|
|
|
-// sysConfigAccount = new SysConfig(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY, "用户/密码模式是否开启短信验证", String.valueOf(tSchoolPrivilegeParam.isAccountSmsVerify()));
|
|
|
-// } else {
|
|
|
-// sysConfigAccount.setConfigValue(String.valueOf(tSchoolPrivilegeParam.isAccountSmsVerify()));
|
|
|
-// }
|
|
|
-// sysConfigList.add(sysConfigAccount);
|
|
|
-//
|
|
|
-// sysConfigService.saveOrUpdateBatch(sysConfigList);
|
|
|
-// commonCacheService.removeSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.PDF_SIZE_LIST);
|
|
|
-// commonCacheService.removeSysConfigCache(tSchoolPrivilegeParam.getSchoolId(), SystemConstant.ACCOUNT_SMS_VERIFY);
|
|
|
return ResultUtil.ok(true);
|
|
|
}
|
|
|
|
|
@@ -212,9 +185,6 @@ public class SysAdminSetController {
|
|
|
public Result getRolePrivileges(@ApiParam(value = "学校id ", required = true) @RequestParam Long schoolId) {
|
|
|
List<TSchoolPrivilege> tSchoolPrivilegeList = tSchoolPrivilegeService.findBySchoolId(schoolId);
|
|
|
List<String> privilegeIdList = tSchoolPrivilegeList.stream().map(s -> String.valueOf(s.getPrivilegeId())).collect(Collectors.toList());
|
|
|
-// SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.PDF_SIZE_LIST);
|
|
|
-// SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(schoolId, SystemConstant.ACCOUNT_SMS_VERIFY);
|
|
|
-// return ResultUtil.ok(new TSchoolPrivilegeResult(schoolId, privilegeIdList, Objects.nonNull(sysConfig) ? Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", ")) : null, Objects.nonNull(sysConfigAccount) ? Boolean.valueOf(sysConfigAccount.getConfigValue()) : false));
|
|
|
return ResultUtil.ok(new SysAdminSetResult(schoolId, CollectionUtils.isEmpty(privilegeIdList) ? new ArrayList<>() : privilegeIdList));
|
|
|
}
|
|
|
}
|