zh

src/main/java/com/zh/project0512/controller/manage/AdminJurisdictionController.java

@@ -21,9 +21,9 @@ import javax.annotation.Resource;
 
 
 /**
- * 用户权限
+ * 角色权限
  */
-@Tag(name = "用户权限")
+@Tag(name = "角色权限")
 @RestController
 @RequestMapping("/manage/userJurisdiction")
 public class AdminJurisdictionController {

src/main/java/com/zh/project0512/controller/manage/AdminRoleController.java

@@ -21,9 +21,9 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 
 /**
- * 用户角色
+ * 管理账号角色
  */
-@Tag(name = "用户角色")
+@Tag(name = "管理账号角色")
 @RestController
 @RequestMapping("/manage/userRole")
 public class AdminRoleController {
@@ -36,7 +36,7 @@ public class AdminRoleController {
      * @param adminRoleListDTO 用户角色 list DTO
      * @return 用户角色
      */
-    @Operation(summary = "查询用户角色")
+    @Operation(summary = "查询角色")
     @PostMapping("/list")
     public ResultPageInfo<AdminRoleListVo> list(@Validated @RequestBody AdminRoleListDTO adminRoleListDTO){
         return ResultPageInfo.success(userRoleService.list(adminRoleListDTO));
@@ -44,10 +44,10 @@ public class AdminRoleController {
 
     /**
      * 添加用户角色
-     * @param adminRoleInsertDTO 用户角色添加
+     * @param adminRoleInsertDTO 角色添加
      * @return 操作信息
      */
-    @Operation(summary = "添加用户角色")
+    @Operation(summary = "添加角色")
     @PostMapping("/insert")
     @AdminCheckAuthorityAnnotation(jurisdictionId = "28")
     public Result<String> insert(@Validated @RequestBody AdminRoleInsertDTO adminRoleInsertDTO){
@@ -60,10 +60,10 @@ public class AdminRoleController {
 
     /**
      * 修改用户角色
-     * @param adminRoleUpdateDTO 用户角色 update DTO
+     * @param adminRoleUpdateDTO 角色 update DTO
      * @return 操作信息
      */
-    @Operation(summary = "修改用户角色")
+    @Operation(summary = "修改角色")
     @PostMapping("/update")
     @AdminCheckAuthorityAnnotation(jurisdictionId = "29")
     public Result<String> update(@Validated @RequestBody AdminRoleUpdateDTO adminRoleUpdateDTO){

src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java

@@ -126,7 +126,7 @@ public class TeachingRefeController {
     @AdminTokenValid
     public Result list(@Validated @RequestBody listTCRParam param) {
         QueryWrapper<TeachingRefe> qw = new QueryWrapper<>();
-        qw.eq("isDeleted",0).orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle());
+        qw.eq("isDeleted",0).orderByAsc("sortWeight").orderByDesc("updateAt", "creatAt").like(param.getTitle() != null, "title", param.getTitle());
         return Result.success(teachingRefeService.pageMaps(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));
     }
 

src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java

@@ -59,7 +59,7 @@ public class TopicActivityController {
         private Integer duration;
         @Schema(title = "封面")
         private String cover;
-        @Schema(title = "是否首页显示",description = "0否；1是")
+        @Schema(title = "是否首页显示", description = "0否；1是")
         private Integer showAtIndex;
     }
 
@@ -70,7 +70,7 @@ public class TopicActivityController {
     public Result add(@Validated @RequestBody AddTopicParam param) {
         TopicActivity topicActivity = new TopicActivity().setTitle(param.getTitle()).setSubtitle(param.getSubtitle())
             .setType(param.getType()).setContent(param.getContent()).setDuration(param.getDuration()).setCover(param.getCover()).setCreatAt(LocalDateTime.now());
-        if(param.getShowAtIndex() !=null && param.getShowAtIndex() == 1){
+        if (param.getShowAtIndex() != null && param.getShowAtIndex() == 1) {
             topicActivity.setShowAtIndex(1);
         }
         topicActivityService.save(topicActivity);
@@ -101,31 +101,55 @@ public class TopicActivityController {
         private Integer id;
         @Schema(title = "标题")
         private String title;
+        @Schema(title = "副标题")
+        private String subtitle;
         @Schema(title = "内容")
         private String content;
         @Schema(title = "类型", description = "1视频；2图片；3文章")
         private Integer type;
         @Schema(title = "封面")
         private String cover;
+        @Schema(title = "时长", description = "视频文件请上传时长")
+        private Integer duration;
     }
 
     @Operation(summary = "更新动态内容")
     @PostMapping("/upd")
     @AdminTokenValid
     public Result upd(@Validated @RequestBody UpdTopicParam param) {
-        return MybatisPlusUtil.sqlResult(topicActivityService.updateById(new TopicActivity().setId(param.getId()).setTitle(param.getTitle()).setType(param.getType()).setCover(param.getCover()).setContent(param.getContent()).setUpdateAt(LocalDateTime.now())), "修改");
+        UpdateWrapper<TopicActivity> qw = new UpdateWrapper<>();
+        qw.eq("id", param.getId())
+            .set(param.getTitle() != null, "title", param.getTitle())
+            .set(param.getSubtitle() != null, "title", param.getSubtitle())
+            .set(param.getType() != null, "title", param.getType())
+            .set(param.getCover() != null, "title", param.getCover())
+            .set(param.getDuration() != null, "title", param.getDuration())
+            .set(param.getContent() != null, "title", param.getContent())
+            .set("updateAt", LocalDateTime.now());
+        return MybatisPlusUtil.sqlResult(topicActivityService.update(qw), "修改");
+    }
+
+    @Data
+    static class ListTopicParam {
+        private Integer pageNum;
+        private Integer pageSize;
+        @Schema(title = "标题")
+        private String keyword;
+        @Schema(title = "是否为首页展示", description = "1:是，2否")
+        private Boolean showAtIndex;
     }
 
     @Operation(summary = "动态列表")
     @PostMapping("/list")
     @AdminTokenValid
-    public Result list(@RequestBody(required = false) JSONObject obj) {
+    public Result list(@Validated @RequestBody ListTopicParam param) {
         QueryWrapper<TopicActivity> qw = new QueryWrapper<>();
-        qw.orderByDesc("updateAt","creatAt");
+        qw.like(param.getKeyword() != null, "title", param.getKeyword());
-        if(obj.getBoolean("showAtIndex") !=null && obj.getBoolean("showAtIndex") == true){
+        qw.orderByDesc("updateAt", "creatAt");
-            qw.eq("showAtIndex",1);
+        if (param.getShowAtIndex() != null && param.getShowAtIndex() == true) {
+            qw.eq("showAtIndex", 1);
         }
-        return Result.success(topicActivityService.pageMaps(MybatisPlusUtil.SetPage(obj),qw));
+        return Result.success(topicActivityService.pageMaps(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));
     }
 
     @Data
@@ -140,7 +164,7 @@ public class TopicActivityController {
     @PostMapping("/detail")
     @AdminTokenValid
     public Result detail(@Validated @RequestBody TaskController.DetTaskParam param) {
-        int id =param.getId();
+        int id = param.getId();
         TopicActivity topicActivity = topicActivityService.getById(id);
         return topicActivity != null ? Result.success(topicActivity) : Result.fail(HttpStatusEnum.NOT_FOUND);
     }
@@ -154,7 +178,7 @@ public class TopicActivityController {
         @NotNull(message = "showAtIndex不能为空")
         @Min(value = 0, message = "取值是：0否；1是")
         @Max(value = 1, message = "取值是：0否；1是")
-        @Schema(title = "是否首页显示",description = "0否；1是")
+        @Schema(title = "是否首页显示", description = "0否；1是")
         private Integer showAtIndex;
     }
 
@@ -163,8 +187,8 @@ public class TopicActivityController {
     @AdminTokenValid
     public Result showAtIndex(@Validated @RequestBody showAtIndexParam param) {
         UpdateWrapper<TopicActivity> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", param.getId()).set("showAtIndex",param.getShowAtIndex());
+        updateWrapper.eq("id", param.getId()).set("showAtIndex", param.getShowAtIndex());
-        return MybatisPlusUtil.sqlResult(topicActivityService.update(updateWrapper),"编辑");
+        return MybatisPlusUtil.sqlResult(topicActivityService.update(updateWrapper), "编辑");
     }
 
 }

src/main/java/com/zh/project0512/controller/manage/UserAccountController.java

@@ -82,7 +82,7 @@ public class UserAccountController {
     public Result list(@Validated @RequestBody ListUAParam param) {
         QueryWrapper<UserAccount> qw = new QueryWrapper<>();
         qw.eq(param.getStatus() != null, "t1.status", param.getStatus());
-        qw.eq(param.getName() != null, "t2.name", param.getName());
+        qw.like(param.getName() != null, "t2.name", param.getName());
         qw.eq(param.getDepartmentId() != null, "t3.departmentId", param.getDepartmentId());
         qw.orderByDesc("updateAt", "creatAt");
         return Result.success(userAccountService.listAll(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), qw));