diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index 811e4c3..7fe69f8 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -178,7 +178,7 @@ public class UtilsController { return Result.success(a); } -// public static void main(String[] args) { + public static void main(String[] args) { // String url ="9.20 tRK:/ 男人第一天上班就被当成修电脑的,谁知他竟然是总经理%好剧推荐 %全集解说%幸福一家人%关于爱情%宅家dou剧 %持续关注持续精彩 https://v.kuaishou.com/Yh4DwM9/ 复制此链接,打开Dou音搜索,直接观看视频!"; // Pattern p = Pattern.compile("((https://)+\\S*\\s)",Pattern.CASE_INSENSITIVE); // @@ -188,5 +188,43 @@ public class UtilsController { // System.out.println(a); // int b = StringUtils.countOccurrencesOf(a,"https://v.douyin"); // System.out.println(b); -// } +// +// List list1 = new ArrayList(); +// list1.add("1"); +// list1.add("2"); +// list1.add("3"); +// list1.add("5"); +// list1.add("6"); +// List list2 = new ArrayList(); +// list2.add("2"); +// list2.add("3"); +// list2.add("7"); +// list2.add("8"); +//// 交集 +// List intersection = list1.stream().filter(item -> list2.contains(item)).collect(toList()); +// System.out.println("---交集 intersection---"); +// intersection.parallelStream().forEach(System.out :: println); +//// 差集 (list1 - list2) +// List reduce1 = list1.stream().filter(item -> !list2.contains(item)).collect(toList()); +// System.out.println("---差集 reduce1 (list1 - list2)---"); +// reduce1.parallelStream().forEach(System.out :: println); +//// 差集 (list2 - list1) +// List reduce2 = list2.stream().filter(item -> !list1.contains(item)).collect(toList()); +// System.out.println("---差集 reduce2 (list2 - list1)---"); +// reduce2.parallelStream().forEach(System.out :: println); +//// 并集 +// List listAll = list1.parallelStream().collect(toList()); +// List listAll2 = list2.parallelStream().collect(toList()); +// listAll.addAll(listAll2); +// System.out.println("---并集 listAll---"); +// listAll.parallelStream().forEachOrdered(System.out :: println); +//// 去重并集 +// List listAllDistinct = listAll.stream().distinct().collect(toList()); +// System.out.println("---得到去重并集 listAllDistinct---"); +// listAllDistinct.parallelStream().forEachOrdered(System.out :: println); +// System.out.println("---原来的List1---"); +// list1.parallelStream().forEachOrdered(System.out :: println); +// System.out.println("---原来的List2---"); +// list2.parallelStream().forEachOrdered(System.out :: println); + } } diff --git a/src/main/java/com/zh/project0512/controller/manage/AdminController.java b/src/main/java/com/zh/project0512/controller/manage/AdminController.java index f1a49ae..a874c9e 100644 --- a/src/main/java/com/zh/project0512/controller/manage/AdminController.java +++ b/src/main/java/com/zh/project0512/controller/manage/AdminController.java @@ -90,7 +90,7 @@ public class AdminController { @Operation(summary = "添加") @PostMapping("register") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "25") + @AdminCheckAuthorityAnnotation(jurisdictionId = "125") public Result register(@Validated @RequestBody registerParam param) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("name", param.getName()); diff --git a/src/main/java/com/zh/project0512/controller/manage/AdminJurisdictionController.java b/src/main/java/com/zh/project0512/controller/manage/AdminJurisdictionController.java index 2f616fb..e9a11ad 100644 --- a/src/main/java/com/zh/project0512/controller/manage/AdminJurisdictionController.java +++ b/src/main/java/com/zh/project0512/controller/manage/AdminJurisdictionController.java @@ -37,7 +37,7 @@ public class AdminJurisdictionController { */ @Operation(summary = "操作角色权限") @PostMapping("/operationRoleJurisdiction") - @AdminCheckAuthorityAnnotation(jurisdictionId = "30") + @AdminCheckAuthorityAnnotation(jurisdictionId = "130") public Result operationRoleJurisdiction(@Validated @RequestBody OperationRoleJurisdictionDTO operationRoleJurisdictionDTO){ if (userJurisdictionService.operationRoleJurisdiction(operationRoleJurisdictionDTO)){ return Result.success("操作角色权限","操作成功"); diff --git a/src/main/java/com/zh/project0512/controller/manage/AdminRoleController.java b/src/main/java/com/zh/project0512/controller/manage/AdminRoleController.java index f882ce6..1391c84 100644 --- a/src/main/java/com/zh/project0512/controller/manage/AdminRoleController.java +++ b/src/main/java/com/zh/project0512/controller/manage/AdminRoleController.java @@ -49,7 +49,7 @@ public class AdminRoleController { */ @Operation(summary = "添加角色") @PostMapping("/insert") - @AdminCheckAuthorityAnnotation(jurisdictionId = "28") + @AdminCheckAuthorityAnnotation(jurisdictionId = "128") public Result insert(@Validated @RequestBody AdminRoleInsertDTO adminRoleInsertDTO){ if (userRoleService.insert(adminRoleInsertDTO)){ return Result.success("添加用户角色","操作成功"); @@ -65,7 +65,7 @@ public class AdminRoleController { */ @Operation(summary = "修改角色") @PostMapping("/update") - @AdminCheckAuthorityAnnotation(jurisdictionId = "29") + @AdminCheckAuthorityAnnotation(jurisdictionId = "129") public Result update(@Validated @RequestBody AdminRoleUpdateDTO adminRoleUpdateDTO){ if (userRoleService.update(adminRoleUpdateDTO)){ return Result.success("修改用户角色","操作成功"); diff --git a/src/main/java/com/zh/project0512/controller/manage/BrandController.java b/src/main/java/com/zh/project0512/controller/manage/BrandController.java index 678e872..c7053df 100644 --- a/src/main/java/com/zh/project0512/controller/manage/BrandController.java +++ b/src/main/java/com/zh/project0512/controller/manage/BrandController.java @@ -53,7 +53,7 @@ public class BrandController { @Operation(summary = "新增品牌") @PostMapping("/add") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "20") + @AdminCheckAuthorityAnnotation(jurisdictionId = "120") public Result add(@Validated @RequestBody AddBParam param) { brandService.addBrand(new Brand().setName(param.getName()).setCreatAt(LocalDateTime.now())); return Result.success("添加完成"); @@ -70,7 +70,7 @@ public class BrandController { @Operation(summary = "删除品牌(软删除)") @PostMapping("/del") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "21") + @AdminCheckAuthorityAnnotation(jurisdictionId = "121") public Result del(@Validated @RequestBody DelBParam param) { return MybatisPlusUtil.sqlResult(brandService.update(new UpdateWrapper().eq("id", param.getId()).set("sortWeight",0).set("isDeleted", 1)), "删除"); } @@ -89,6 +89,7 @@ public class BrandController { @Operation(summary = "更新品牌") @PostMapping("/upd") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "131") public Result upd(@Validated @RequestBody UpdBParam param) { return MybatisPlusUtil.sqlResult(brandService.updateById(new Brand().setId(param.getId()).setName(param.getName()).setUpdateAt(LocalDateTime.now())), "修改"); } @@ -117,6 +118,7 @@ public class BrandController { @Operation(summary = "修改品牌排序") @PostMapping("/updSort") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "132") public Result updSort(@Validated @RequestBody UpdBSParam param) { Brand brand = brandService.getById(param.getId()); if(brand.getIsDeleted() == 1){ diff --git a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java index 3f6323d..5bbe158 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java @@ -79,7 +79,7 @@ public class ReferenceController { @Operation(summary = "添加素材", description = "可根据文件不同同时上传多个素材") @PostMapping("/add") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "7") + @AdminCheckAuthorityAnnotation(jurisdictionId = "107") public Result add(@Validated @RequestBody AddRParam param) { List list = param.getFileUrlList(); List l = new ArrayList<>(); @@ -143,6 +143,7 @@ public class ReferenceController { @Operation(summary = "素材新增标签") @PostMapping("/addTag") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "108") public Result addTag(@Validated @RequestBody AddTagParam param) { if (null != referenceTagService.getMap(Wrappers.query().lambda().eq(ReferenceTag::getReferenceId, param.getId()).eq(ReferenceTag::getTagId, param.getTagId()))) { return Result.success("数据已存在"); @@ -166,6 +167,7 @@ public class ReferenceController { @Operation(summary = "素材新增品牌") @PostMapping("/addBrand") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "108") public Result addBrand(@Validated @RequestBody AddBrandParam param) { if (null != referenceBrandService.getMap(Wrappers.query().lambda().eq(ReferenceBrand::getReferenceId, param.getId()).eq(ReferenceBrand::getBrandId, param.getBrandId()))) { return Result.success("数据已存在"); @@ -184,6 +186,7 @@ public class ReferenceController { @Operation(summary = "删除素材(软删除)") @PostMapping("/del") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "109") public Result del(@Validated @RequestBody DelRParam param) { return MybatisPlusUtil.sqlResult(referenceService.update(new UpdateWrapper().in("id", param.getIdList()).set("isDeleted", 1)), "删除"); @@ -204,6 +207,7 @@ public class ReferenceController { @Operation(summary = "素材删除标签") @PostMapping("/delTag") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "108") public Result delTag(@Validated @RequestBody DelTagParam param) { return MybatisPlusUtil.sqlResult(referenceTagService.remove(Wrappers.query().lambda().eq(ReferenceTag::getReferenceId, param.getId()).eq(ReferenceTag::getTagId, param.getTagId())), "删除"); } @@ -223,7 +227,7 @@ public class ReferenceController { @Operation(summary = "素材删除品牌") @PostMapping("/delBrand") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "9") + @AdminCheckAuthorityAnnotation(jurisdictionId = "108") public Result delBrand(@Validated @RequestBody DelBrandParam param) { return MybatisPlusUtil.sqlResult(referenceBrandService.remove(Wrappers.query().lambda().eq(ReferenceBrand::getReferenceId, param.getId()).eq(ReferenceBrand::getBrandId, param.getBrandId())), "删除"); } @@ -247,7 +251,7 @@ public class ReferenceController { @Operation(summary = "更新素材") @PostMapping("/upd") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "8") + @AdminCheckAuthorityAnnotation(jurisdictionId = "108") public Result upd(@Validated @RequestBody UpdRParam param) { int id = param.getId(); Reference reference = new Reference().setTitle(param.getTitle()).setFileUrl(param.getFileUrl()).setCoverUrl(param.getCoverUrl()).setUpdateAt(LocalDateTime.now()); diff --git a/src/main/java/com/zh/project0512/controller/manage/ReferenceGroupController.java b/src/main/java/com/zh/project0512/controller/manage/ReferenceGroupController.java index 2f223e3..b7e7f6c 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceGroupController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceGroupController.java @@ -57,7 +57,7 @@ public class ReferenceGroupController { @Operation(summary = "新增分组") @PostMapping("/add") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "10") + @AdminCheckAuthorityAnnotation(jurisdictionId = "110") public Result add(@Validated @RequestBody AddRGParam param) { referenceGroupService.addReferenceGroup(new ReferenceGroup().setName(param.getName()).setCoverUrl(param.getCoverUrl()).setCreatAt(LocalDateTime.now())); return Result.success("添加完成!"); @@ -74,7 +74,7 @@ public class ReferenceGroupController { @Operation(summary = "删除分组") @PostMapping("/del") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "12") + @AdminCheckAuthorityAnnotation(jurisdictionId = "112") public Result del(@Validated @RequestBody DelRGParam param) { return MybatisPlusUtil.sqlResult(referenceGroupService.removeById(param.getId()), "删除"); } @@ -94,7 +94,7 @@ public class ReferenceGroupController { @Operation(summary = "更新分组") @PostMapping("/upd") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "11") + @AdminCheckAuthorityAnnotation(jurisdictionId = "111") public Result upd(@Validated @RequestBody UpdRGParam param) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", param.getId()); @@ -141,6 +141,7 @@ public class ReferenceGroupController { @Operation(summary = "修改标签排序") @PostMapping("/updSort") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "133") public Result updSort(@Validated @RequestBody TagController.UpdBSParam param) { ReferenceGroup referenceGroup = referenceGroupService.getById(param.getId()); int origin = referenceGroup.getSortWeight(); diff --git a/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java b/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java index 2d008b6..4722835 100644 --- a/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java +++ b/src/main/java/com/zh/project0512/controller/manage/RewardRuleTemplateController.java @@ -69,7 +69,7 @@ public class RewardRuleTemplateController { @PostMapping("/add") @AdminTokenValid @Transactional - @AdminCheckAuthorityAnnotation(jurisdictionId = "22") + @AdminCheckAuthorityAnnotation(jurisdictionId = "122") public Result add(@Validated @RequestBody AddRRTParam param) { List rr = Arrays.asList(param.getRewardRuleList()); rr.sort(Comparator.comparing(RewardRule::getLimitNum)); @@ -92,7 +92,7 @@ public class RewardRuleTemplateController { @Operation(summary = "删除模版") @PostMapping("/del") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "24") + @AdminCheckAuthorityAnnotation(jurisdictionId = "124") public Result del(@Validated @RequestBody DelRRTParam param) { return MybatisPlusUtil.sqlResult(rewardRuleTemplateService.removeById(param.getId()), "删除"); } @@ -111,7 +111,7 @@ public class RewardRuleTemplateController { @Operation(summary = "更新模版") @PostMapping("/upd") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "23") + @AdminCheckAuthorityAnnotation(jurisdictionId = "123") public Result upd(@Validated @RequestBody UpdRRTParam param) { return MybatisPlusUtil.sqlResult(rewardRuleTemplateService.updateById(new RewardRuleTemplate().setId(param.getId()).setTitle(param.getTitle()).setUpdateAt(LocalDateTime.now())), "修改"); } @@ -128,6 +128,7 @@ public class RewardRuleTemplateController { @PostMapping("/setDefault") @AdminTokenValid @Transactional + @AdminCheckAuthorityAnnotation(jurisdictionId = "123") public Result setDefault(@Validated @RequestBody DefRRTParam param) { rewardRuleTemplateService.setDefault(param.getId()); return Result.success("修改完成"); diff --git a/src/main/java/com/zh/project0512/controller/manage/TagController.java b/src/main/java/com/zh/project0512/controller/manage/TagController.java index 8116453..71a473d 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TagController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TagController.java @@ -53,7 +53,7 @@ public class TagController { @Operation(summary = "创建标签") @PostMapping("/add") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "20") + @AdminCheckAuthorityAnnotation(jurisdictionId = "120") public Result add(@Validated @RequestBody AddTagParam param) { tagService.addTag(new Tag().setTitle(param.getTitle()).setCreatAt(LocalDateTime.now())); return Result.success("添加完成"); @@ -70,7 +70,7 @@ public class TagController { @Operation(summary = "删除标签(软删除)") @PostMapping("/del") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "21") + @AdminCheckAuthorityAnnotation(jurisdictionId = "121") public Result del(@Validated @RequestBody DelTagParam param) { return MybatisPlusUtil.sqlResult(tagService.update(new UpdateWrapper().eq("id", param.getId()).set("sortWeight",0).set("isDeleted", 1)), "删除"); } @@ -89,6 +89,7 @@ public class TagController { @Operation(summary = "更新标签名称") @PostMapping("/upd") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "131") public Result upd(@Validated @RequestBody UpdTagParam param) { return MybatisPlusUtil.sqlResult(tagService.updateById(new Tag().setId(param.getId()).setTitle(param.getTitle()).setUpdateAt(LocalDateTime.now())), "修改"); } @@ -117,6 +118,7 @@ public class TagController { @Operation(summary = "修改标签排序") @PostMapping("/updSort") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "132") public Result updSort(@Validated @RequestBody UpdBSParam param) { Tag tag = tagService.getById(param.getId()); if(tag.getIsDeleted() == 1){ diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index c726a0d..e57e278 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -89,7 +89,7 @@ public class TaskController { @Operation(summary = "新增") @PostMapping("/add") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "2") + @AdminCheckAuthorityAnnotation(jurisdictionId = "102") @Transactional public Result add(@Validated(TaskValidGroup1.class) @RequestBody Task task) { if (LocalDateTime.now().isAfter(task.getStart())) { @@ -190,7 +190,7 @@ public class TaskController { @Operation(summary = "新增任务标签") @PostMapping("/addTag") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "2") + @AdminCheckAuthorityAnnotation(jurisdictionId = "144") public Result addTag(@Validated @RequestBody AddTaskTagParam param) { Integer taskId = param.getId(); Integer tagId = param.getTagId(); @@ -216,6 +216,7 @@ public class TaskController { @Operation(summary = "新增任务品牌") @PostMapping("/addBrand") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "144") public Result addBrand(@Validated @RequestBody AddTaskBrandParam param) { Integer taskId = param.getId(); Integer brandId = param.getBrandId(); @@ -241,6 +242,7 @@ public class TaskController { @Operation(summary = "删除任务标签") @PostMapping("/delTag") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "144") public Result delTag(@Validated @RequestBody DelTaskTagParam param) { return MybatisPlusUtil.sqlResult(taskTagService.remove(Wrappers.query().lambda().eq(TaskTag::getTaskId, param.getId()).eq(TaskTag::getTagId, param.getTagId())), "删除"); } @@ -260,6 +262,7 @@ public class TaskController { @Operation(summary = "删除任务品牌") @PostMapping("/delBrand") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "144") public Result delBrand(@Validated @RequestBody DelTaskBrandParam param) { return MybatisPlusUtil.sqlResult(taskBrandService.remove(Wrappers.query().lambda().eq(TaskBrand::getTaskId, param.getId()).eq(TaskBrand::getBrandId, param.getBrandId())), "删除"); } @@ -279,6 +282,7 @@ public class TaskController { @Operation(summary = "新增任务素材") @PostMapping("/addReference") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "144") public Result addBrand(@Validated @RequestBody AddTaskReferenceParam param) { Integer taskId = param.getId(); Integer referenceId = param.getReferenceId(); @@ -304,6 +308,7 @@ public class TaskController { @Operation(summary = "删除任务素材") @PostMapping("/delReference") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "144") public Result delTag(@Validated @RequestBody DelTaskReferenceParam param) { return MybatisPlusUtil.sqlResult(taskReferenceService.remove(Wrappers.query().lambda().eq(TaskReference::getTaskId, param.getId()).eq(TaskReference::getReferenceId, param.getReferenceId())), "删除"); } @@ -315,6 +320,12 @@ public class TaskController { if (LocalDateTime.now().isAfter(task.getStart())) { task.setStatus(1); } + int id = task.getId(); + List tagList = task.getTagList(); +// List tagList = taskTagService.selByTaskId(id); +// if (tagList != null && tagList.size() > 0) { +// taskTagService.addGroup(tagList, id); +// } task.setUpdateAt(LocalDateTime.now()); return MybatisPlusUtil.sqlResult(taskService.updateById(task), "修改"); } @@ -330,7 +341,7 @@ public class TaskController { @PostMapping("/del") @AdminTokenValid @Transactional - @AdminCheckAuthorityAnnotation(jurisdictionId = "3") + @AdminCheckAuthorityAnnotation(jurisdictionId = "103") public Result del(@Validated @RequestBody DetTaskParam param) { UpdateWrapper ew = new UpdateWrapper<>(); ew.eq("status", 1).eq("id", param.getId()) diff --git a/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java b/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java index 52fd801..d78c08b 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java @@ -57,7 +57,7 @@ public class TeachingRefeController { @Operation(summary = "创建") @PostMapping("/add") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "15") + @AdminCheckAuthorityAnnotation(jurisdictionId = "115") public Result add(@Validated @RequestBody AddTCRParam param) { String fileUrl = param.getFileUrl(); if (fileUrl.lastIndexOf(".") == -1) { @@ -79,7 +79,7 @@ public class TeachingRefeController { @Operation(summary = "删除(软删除)") @PostMapping("/del") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "17") + @AdminCheckAuthorityAnnotation(jurisdictionId = "117") public Result del(@Validated @RequestBody DelTCRParam param) { return MybatisPlusUtil.sqlResult(teachingRefeService.update(new UpdateWrapper().eq("id", param.getId()).set("sortWeight",0).set("isDeleted", 1)), "删除"); } @@ -99,7 +99,7 @@ public class TeachingRefeController { @Operation(summary = "更新教程") @PostMapping("/upd") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "16") + @AdminCheckAuthorityAnnotation(jurisdictionId = "116") public Result upd(@Validated @RequestBody UpdTCRParam param) { UpdateWrapper up = new UpdateWrapper<>(); up.eq("id", param.getId()) @@ -145,6 +145,7 @@ public class TeachingRefeController { @Operation(summary = "修改排序") @PostMapping("/updSort") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "145") public Result updSort(@Validated @RequestBody UpdTRSParam param) { TeachingRefe teachingRefe = teachingRefeService.getById(param.getId()); if(teachingRefe.getIsDeleted() == 1){ diff --git a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java index e2768d1..bcf24c3 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java @@ -70,7 +70,7 @@ public class TopicActivityController { @PostMapping("/add") @Transactional @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "4") + @AdminCheckAuthorityAnnotation(jurisdictionId = "104") public Result add(@Validated @RequestBody AddTopicParam param) { TopicActivity topicActivity = new TopicActivity() .setTitle(param.getTitle()) @@ -101,7 +101,7 @@ public class TopicActivityController { @Operation(summary = "删除动态") @PostMapping("/del") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "5") + @AdminCheckAuthorityAnnotation(jurisdictionId = "106") public Result del(@Validated @RequestBody DelTopicParam param) { return MybatisPlusUtil.sqlResult(topicActivityService.removeById(param.getId()), "删除"); } @@ -129,6 +129,7 @@ public class TopicActivityController { @Operation(summary = "更新动态内容") @PostMapping("/upd") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "105") public Result upd(@Validated @RequestBody UpdTopicParam param) { UpdateWrapper qw = new UpdateWrapper<>(); qw.eq("id", param.getId()) @@ -199,6 +200,7 @@ public class TopicActivityController { @Operation(summary = "修改动态是否首页显示") @PostMapping("/showAtIndex") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "105") public Result showAtIndex(@Validated @RequestBody showAtIndexParam param) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", param.getId()).set("showAtIndex", param.getShowAtIndex()); @@ -220,6 +222,7 @@ public class TopicActivityController { @Operation(summary = "修改品牌排序") @PostMapping("/updSort") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "146") public Result updSort(@Validated @RequestBody UpdTAParam param) { TopicActivity topicActivity = topicActivityService.getById(param.getId()); int origin = topicActivity.getSortWeight(); diff --git a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java index 66a71f4..722eb00 100644 --- a/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java +++ b/src/main/java/com/zh/project0512/controller/manage/UserAccountController.java @@ -146,7 +146,7 @@ public class UserAccountController { @Operation(summary = "关联账号审核") @PostMapping("/valid") @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "14") + @AdminCheckAuthorityAnnotation(jurisdictionId = "114") @Transactional public Result valid(@Validated @RequestBody PassUAParam param) { UserAccount ua = userAccountService.getById(param.getId()); diff --git a/src/main/java/com/zh/project0512/controller/manage/UserController.java b/src/main/java/com/zh/project0512/controller/manage/UserController.java index 1b7389a..d56f197 100644 --- a/src/main/java/com/zh/project0512/controller/manage/UserController.java +++ b/src/main/java/com/zh/project0512/controller/manage/UserController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation; import com.zh.project0512.annotation.AdminTokenValid; import com.zh.project0512.model.*; import com.zh.project0512.service.*; @@ -169,6 +170,7 @@ public class UserController { @PostMapping("/pointsTran") @Transactional @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "147") public Result pointsTran(@Validated @RequestBody PTParam param) { UserPointsRecords userPointsRecords = new UserPointsRecords(); Integer userId = param.getUserId(); @@ -223,6 +225,7 @@ public class UserController { @Operation(summary = "新增部门级别") @PostMapping("/addDepartmentGroup") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "118") public Result addDepartmentGroup(@Validated @RequestBody AddDGParam param) { return Result.success(qywxDepartmentGroupService.save(new QywxDepartmentGroup().setName(param.getName()).setCreatAt(LocalDateTime.now()))); } @@ -246,6 +249,7 @@ public class UserController { @Operation(summary = "部门级别删除") @PostMapping("/delDepartmentGroup") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "119") public Result delDepartmentGroup(@Validated @RequestBody DelDGParam param) { return MybatisPlusUtil.sqlResult(qywxDepartmentGroupService.removeById(param.getId()), "删除"); } @@ -264,6 +268,7 @@ public class UserController { @Operation(summary = "部门级别重命名") @PostMapping("/renameDepartmentGroup") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "148") public Result departmentGroup(@Validated @RequestBody UpdDGParam param) { UpdateWrapper up = new UpdateWrapper<>(); up.eq("id", param.getId()).set("name", param.getName()).set("updateAt", LocalDateTime.now()); @@ -284,6 +289,7 @@ public class UserController { @Operation(summary = "部门级别添加部门", description = "批量添加部门id") @PostMapping("/departmentGroupAdd") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "148") public Result departmentGroupAdd(@Validated @RequestBody dgAddParam param) { qywxDepartmentGroupLinkService.groupAddDepartment(param.getId(), param.getDepartmentIdList(), LocalDateTime.now()); return Result.success("添加完成"); @@ -306,6 +312,7 @@ public class UserController { @Operation(summary = "部门级别删除部门", description = "批量删除部门id") @PostMapping("/departmentGroupDel") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "148") public Result departmentGroupDel(@Validated @RequestBody dgAddParam param) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("groupId", param.getId()); diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoController.java b/src/main/java/com/zh/project0512/controller/manage/VideoController.java index bcb414b..9f976ac 100644 --- a/src/main/java/com/zh/project0512/controller/manage/VideoController.java +++ b/src/main/java/com/zh/project0512/controller/manage/VideoController.java @@ -188,7 +188,7 @@ public class VideoController { @PostMapping("/valid") @Transactional @AdminTokenValid - @AdminCheckAuthorityAnnotation(jurisdictionId = "13") + @AdminCheckAuthorityAnnotation(jurisdictionId = "113") public Result valid(@Validated @RequestBody VVParam param) { int id = param.getId(); Video video = videoService.getById(id); diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoEffectSettingController.java b/src/main/java/com/zh/project0512/controller/manage/VideoEffectSettingController.java index 94eafb3..2ce79f4 100644 --- a/src/main/java/com/zh/project0512/controller/manage/VideoEffectSettingController.java +++ b/src/main/java/com/zh/project0512/controller/manage/VideoEffectSettingController.java @@ -2,6 +2,7 @@ package com.zh.project0512.controller.manage; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation; import com.zh.project0512.annotation.AdminTokenValid; import com.zh.project0512.model.VideoEffectSetting; import com.zh.project0512.service.IVideoEffectSettingService; @@ -58,6 +59,7 @@ public class VideoEffectSettingController { @Operation(summary = "设置系数", description = "整数") @PostMapping("/upd") @AdminTokenValid + @AdminCheckAuthorityAnnotation(jurisdictionId = "149") public Result upd(@Validated @RequestBody UpdVESParam param) { UpdateWrapper up = new UpdateWrapper<>(); up.eq("paramName", param.getParamName()).set("effectTimes", param.getEffectTimes()); diff --git a/src/main/java/com/zh/project0512/utils/RegexUtil.java b/src/main/java/com/zh/project0512/utils/RegexUtil.java index bbede01..7ab5fe3 100644 --- a/src/main/java/com/zh/project0512/utils/RegexUtil.java +++ b/src/main/java/com/zh/project0512/utils/RegexUtil.java @@ -4,6 +4,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class RegexUtil { + + // 截取字符串中https部分 public String httpReg(String url) { Pattern p = Pattern.compile("((https://)+\\S*\\s)", Pattern.CASE_INSENSITIVE); Matcher m = p.matcher(url);