From 4e40c024449e3b7ca1236dab26726aa22b548e8c Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Thu, 16 Jun 2022 14:29:03 +0800 Subject: [PATCH] zh --- .../controller/manage/BrandController.java | 8 +++- .../controller/manage/TagController.java | 3 ++ .../manage/TeachingRefeController.java | 39 ++++++++++++++++--- .../controller/wxApp/BrandUController.java | 2 +- .../controller/wxApp/TagUController.java | 3 +- .../zh/project0512/mapper/BrandMapper.java | 6 +-- .../com/zh/project0512/mapper/TagMapper.java | 2 +- .../mapper/TeachingRefeMapper.java | 17 +++++++- .../service/ITeachingRefeService.java | 3 +- .../serviceImpl/TeachingRefeServiceImpl.java | 12 +++++- 10 files changed, 79 insertions(+), 16 deletions(-) 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 3df6f9b..1f7cb0d 100644 --- a/src/main/java/com/zh/project0512/controller/manage/BrandController.java +++ b/src/main/java/com/zh/project0512/controller/manage/BrandController.java @@ -3,6 +3,7 @@ package com.zh.project0512.controller.manage; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zh.project0512.annotation.adminTokenValid; import com.zh.project0512.model.Brand; import com.zh.project0512.service.IBrandService; @@ -64,11 +65,11 @@ public class BrandController { private Integer id; } - @Operation(summary = "删除品牌") + @Operation(summary = "删除品牌(软删除)") @PostMapping("/del") @adminTokenValid public Result del(@Validated @RequestBody DelBParam param) { - return MybatisPlusUtil.sqlResult(brandService.removeById(param.getId()), "删除"); + return MybatisPlusUtil.sqlResult(brandService.update(new UpdateWrapper().eq("id", param.getId()).set("sortWeight",0).set("isDeleted", 1)), "删除"); } @Data @@ -115,6 +116,9 @@ public class BrandController { @adminTokenValid public Result updSort(@Validated @RequestBody UpdBSParam param) { Brand brand = brandService.getById(param.getId()); + if(brand.getIsDeleted() == 1){ + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"该品牌已被删除"); + } int origin = brand.getSortWeight(); int current = param.getSortWeight(); if(origin==current){ 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 3f383e7..5ea79a2 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TagController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TagController.java @@ -117,6 +117,9 @@ public class TagController { @adminTokenValid public Result updSort(@Validated @RequestBody UpdBSParam param) { Tag tag = tagService.getById(param.getId()); + if(tag.getIsDeleted() == 1){ + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"该标签已被删除"); + } int origin = tag.getSortWeight(); int current = param.getSortWeight(); if (origin == current) { 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 0d0e00f..cf337bf 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java @@ -61,7 +61,7 @@ public class TeachingRefeController { if (fileUrl.lastIndexOf(".") == -1) { return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "文件错误"); } - teachingRefeService.save(new TeachingRefe().setFileUrl(fileUrl).setType(FileTypeUtil.getcontentTypeNum(fileUrl.substring(fileUrl.lastIndexOf(".")))) + teachingRefeService.addTeachingRefe(new TeachingRefe().setFileUrl(fileUrl).setType(FileTypeUtil.getcontentTypeNum(fileUrl.substring(fileUrl.lastIndexOf(".")))) .setTitle(param.getTitle()).setCreatAt(LocalDateTime.now())); return Result.success("添加完成"); } @@ -74,11 +74,11 @@ public class TeachingRefeController { private Integer id; } - @Operation(summary = "删除") + @Operation(summary = "删除(软删除)") @PostMapping("/del") @adminTokenValid public Result del(@Validated @RequestBody DelTCRParam param) { - return MybatisPlusUtil.sqlResult(teachingRefeService.removeById(param.getId()), "删除"); + return MybatisPlusUtil.sqlResult(teachingRefeService.update(new UpdateWrapper().eq("id", param.getId()).set("sortWeight",0).set("isDeleted", 1)), "删除"); } @Data @@ -93,7 +93,7 @@ public class TeachingRefeController { private String fileUrl; } - @Operation(summary = "更新标签名称") + @Operation(summary = "更新教程") @PostMapping("/upd") @adminTokenValid public Result upd(@Validated @RequestBody UpdTCRParam param) { @@ -122,8 +122,37 @@ public class TeachingRefeController { @adminTokenValid public Result list(@Validated @RequestBody listTCRParam param) { QueryWrapper qw = new QueryWrapper<>(); - qw.orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle()); + qw.eq("isDeleted",0).orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle()); return Result.success(teachingRefeService.pageMaps(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw)); } + @Data + static class UpdTRSParam { + @NotNull(message = "id不能为空") + @Min(value = 1, message = "id最小值为1") + @Schema(title = "教程id") + private Integer id; + @NotNull(message = "排序权重不能为空") + @Min(value = 1, message = "排序权重最小值为1") + @Schema(title = "排序权重:数字越小排序靠前") + private Integer sortWeight; + } + + @Operation(summary = "修改排序") + @PostMapping("/updSort") + @adminTokenValid + public Result updSort(@Validated @RequestBody UpdTRSParam param) { + TeachingRefe teachingRefe = teachingRefeService.getById(param.getId()); + if(teachingRefe.getIsDeleted() == 1){ + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"该标签已被删除"); + } + int origin = teachingRefe.getSortWeight(); + int current = param.getSortWeight(); + if (origin == current) { + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "权重无变化"); + } + teachingRefeService.updSort(origin, current, origin > current); + return Result.success("修改完成"); + } + } diff --git a/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.java b/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.java index 100e3be..21957f2 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/BrandUController.java @@ -42,7 +42,7 @@ public class BrandUController { @PostMapping("/list") public Result list(@RequestBody(required = false) @Parameter(hidden = true) JSONObject obj) { QueryWrapper qw = new QueryWrapper<>(); - qw.orderByAsc("sortWeight").orderByDesc("updateAt","creatAt"); + qw.eq("isDeleted",0).orderByAsc("sortWeight").orderByDesc("updateAt","creatAt"); return Result.success(brandService.pageMaps(MybatisPlusUtil.SetPage(obj),qw)); } } diff --git a/src/main/java/com/zh/project0512/controller/wxApp/TagUController.java b/src/main/java/com/zh/project0512/controller/wxApp/TagUController.java index 8cb629a..cb2b760 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/TagUController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/TagUController.java @@ -33,6 +33,7 @@ import java.time.LocalDateTime; @RestController @RequestMapping("/wxApp/tag") +@io.swagger.v3.oas.annotations.tags.Tag(name = "标签") public class TagUController { @Autowired private ITagService tagService; @@ -41,7 +42,7 @@ public class TagUController { @PostMapping("/list") public Result list(@RequestBody(required = false) JSONObject obj) { QueryWrapper qw = new QueryWrapper<>(); - qw.orderByAsc("sortWeight").orderByDesc("updateAt","creatAt"); + qw.eq("isDeleted",0).orderByAsc("sortWeight").orderByDesc("updateAt","creatAt"); return Result.success(tagService.pageMaps(MybatisPlusUtil.SetPage(obj),qw)); } } diff --git a/src/main/java/com/zh/project0512/mapper/BrandMapper.java b/src/main/java/com/zh/project0512/mapper/BrandMapper.java index fc77cf9..6f44d58 100644 --- a/src/main/java/com/zh/project0512/mapper/BrandMapper.java +++ b/src/main/java/com/zh/project0512/mapper/BrandMapper.java @@ -13,16 +13,16 @@ import org.apache.ibatis.annotations.Update; * @since 2022-05-26 */ public interface BrandMapper extends BaseMapper { - @Update("update brand set sortWeight = sortWeight + 1;\n" + + @Update("update brand set sortWeight = sortWeight + 1 where sortWeight <> 0;;\n" + "insert into brand ( name, creatAt,sortWeight) VALUES ( #{name}, #{creatAt},1 );") void addBrand(Brand brand); @Update("") diff --git a/src/main/java/com/zh/project0512/mapper/TagMapper.java b/src/main/java/com/zh/project0512/mapper/TagMapper.java index 34d6a7b..80f9774 100644 --- a/src/main/java/com/zh/project0512/mapper/TagMapper.java +++ b/src/main/java/com/zh/project0512/mapper/TagMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Update; * @since 2022-05-22 */ public interface TagMapper extends BaseMapper { - @Update("update tag set sortWeight = sortWeight + 1;\n" + + @Update("update tag set sortWeight = sortWeight + 1 where sortWeight <> 0;\n" + "insert into tag ( title, creatAt,sortWeight) VALUES ( #{title}, #{creatAt},1 );") void addTag(Tag tag); @Update("") + void updSort(int origin, int current, boolean originHigherCurrent); } diff --git a/src/main/java/com/zh/project0512/service/ITeachingRefeService.java b/src/main/java/com/zh/project0512/service/ITeachingRefeService.java index 9fc6b63..bd2e89d 100644 --- a/src/main/java/com/zh/project0512/service/ITeachingRefeService.java +++ b/src/main/java/com/zh/project0512/service/ITeachingRefeService.java @@ -12,5 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @since 2022-06-14 */ public interface ITeachingRefeService extends IService { - + void addTeachingRefe(TeachingRefe teachingRefe); + void updSort(int origin, int current, boolean originHigherCurrent); } diff --git a/src/main/java/com/zh/project0512/serviceImpl/TeachingRefeServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/TeachingRefeServiceImpl.java index ae4bd76..d29955b 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/TeachingRefeServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/TeachingRefeServiceImpl.java @@ -1,9 +1,12 @@ package com.zh.project0512.serviceImpl; +import com.zh.project0512.mapper.TagMapper; +import com.zh.project0512.model.Tag; import com.zh.project0512.model.TeachingRefe; import com.zh.project0512.mapper.TeachingRefeMapper; import com.zh.project0512.service.ITeachingRefeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -16,5 +19,12 @@ import org.springframework.stereotype.Service; */ @Service public class TeachingRefeServiceImpl extends ServiceImpl implements ITeachingRefeService { - + @Autowired + private TeachingRefeMapper teachingRefeMapper; + public void addTeachingRefe(TeachingRefe teachingRefe){ + teachingRefeMapper.addTeachingRefe(teachingRefe); + } + public void updSort(int origin, int current, boolean originHigherCurrent) { + teachingRefeMapper.updSort(origin, current, originHigherCurrent); + } }