zh

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

@@ -52,6 +52,7 @@ public class ReferenceGroupController {
         @Schema(title = "封面地址")
         private String coverUrl;
     }
+
     @Operation(summary = "新增分组")
     @PostMapping("/add")
     @adminTokenValid
@@ -67,6 +68,7 @@ public class ReferenceGroupController {
         @Schema(title = "分组id")
         private Integer id;
     }
+
     @Operation(summary = "删除分组")
     @PostMapping("/del")
     @adminTokenValid
@@ -85,6 +87,7 @@ public class ReferenceGroupController {
         @Schema(title = "封面地址")
         private String coverUrl;
     }
+
     @Operation(summary = "更新分组")
     @PostMapping("/upd")
     @adminTokenValid
@@ -95,13 +98,28 @@ public class ReferenceGroupController {
         return MybatisPlusUtil.sqlResult(referenceGroupService.update(referenceGroup, updateWrapper), "修改");
     }
 
+    @Data
+    static class RGDParam {
+        @NotNull(message = "id不能为空")
+        @Min(value = 1, message = "id最小值为1")
+        @Schema(title = "分组id")
+        private Integer id;
+    }
+
+    @Operation(summary = "分组详情")
+    @PostMapping("/detail")
+    @adminTokenValid
+    public Result list(@Validated @RequestBody RGDParam param) {
+        return Result.success(referenceGroupService.getById(param.getId()));
+    }
+
     @Operation(summary = "分组列表")
     @PostMapping("/list")
     @adminTokenValid
     public Result list(@RequestBody(required = false) @Parameter(hidden = true) JSONObject obj) {
         QueryWrapper<ReferenceGroup> qw = new QueryWrapper<>();
-        qw.orderByAsc("sortWeight").orderByDesc("updateAt","creatAt");
-        return Result.success(referenceGroupService.pageMaps(MybatisPlusUtil.SetPage(obj),qw));
+        qw.orderByAsc("sortWeight").orderByDesc("updateAt", "creatAt");
+        return Result.success(referenceGroupService.pageMaps(MybatisPlusUtil.SetPage(obj), qw));
     }
 
     @Data
@@ -120,13 +138,13 @@ public class ReferenceGroupController {
     @PostMapping("/updSort")
     @adminTokenValid
     public Result updSort(@Validated @RequestBody TagController.UpdBSParam param) {
-       ReferenceGroup referenceGroup = referenceGroupService.getById(param.getId());
+        ReferenceGroup referenceGroup = referenceGroupService.getById(param.getId());
         int origin = referenceGroup.getSortWeight();
         int current = param.getSortWeight();
-        if(origin==current){
-            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"权重无变化");
+        if (origin == current) {
+            return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "权重无变化");
         }
-        referenceGroupService.updSort(origin,current,origin>current);
+        referenceGroupService.updSort(origin, current, origin > current);
         return Result.success("修改完成");
     }
 }

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

@@ -0,0 +1,81 @@
+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.annotation.tokenValid;
+import com.zh.project0512.model.User;
+import com.zh.project0512.service.IQywxDepartmentService;
+import com.zh.project0512.service.IUserService;
+import com.zh.project0512.utils.CoderUtil;
+import com.zh.project0512.utils.JwtUtil;
+import com.zh.project0512.utils.MybatisPlusUtil;
+import com.zh.project0512.utils.WeChatUtil;
+import com.zh.project0512.utils.result.HttpStatusEnum;
+import com.zh.project0512.utils.result.Result;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author zh
+ * @since 2022-05-18
+ */
+@Tag(name = "成员管理")
+@RestController
+@RequestMapping("/manage/user")
+public class UserController {
+
+    @Autowired
+    private IUserService userService;
+
+    @Autowired
+    private IQywxDepartmentService qywxDepartmentService;
+
+    @Data
+    static class UParam {
+        private Integer pageNum;
+        private Integer pageSize;
+        @Schema(title = "人员名称")
+        private String name;
+        @Schema(title = "部门名称")
+        private String department;
+    }
+
+    @Operation(summary = "成员列表")
+    @PostMapping("/list")
+    @adminTokenValid
+    public Result addTag(@Validated @RequestBody UParam param) {
+        QueryWrapper<User> qw = new QueryWrapper<>();
+        qw
+            .and(param.getDepartment() !=null,q -> q.like( "t2.name",param.getDepartment())
+            .or(o -> o.like( "t3.name",param.getDepartment())))
+            .like(param.getName() !=null, "t1.name",param.getName());
+        return Result.success(userService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(),param.getPageSize()),qw));
+    }
+
+    @Operation(summary = "部门列表")
+    @PostMapping("/department")
+    @adminTokenValid
+    public Result department(@RequestBody JSONObject obj) {
+        return Result.success(qywxDepartmentService.list(MybatisPlusUtil.SetPage(obj)));
+    }
+
+}

src/main/java/com/zh/project0512/controller/manage/VideoController.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.zh.project0512.annotation.adminTokenValid;
 import com.zh.project0512.annotation.tokenValid;
 import com.zh.project0512.model.Video;
 import com.zh.project0512.service.IUserService;
@@ -35,7 +36,7 @@ import java.time.LocalDateTime;
  * @since 2022-05-18
  */
 @RestController
-@RequestMapping("/video")
+@RequestMapping("/manage/video")
 @Tag(name = "视频")
 public class VideoController {
     @Autowired
@@ -43,4 +44,32 @@ public class VideoController {
     @Autowired
     private IUserService userService;
 
+    @Data
+    static class VParam {
+        private Integer pageNum;
+        private Integer pageSize;
+        @Schema(title = "视频状态", description = "1待审核；2审核通过；3审核拒绝")
+        @NotNull(message = "视频状态不能为空")
+        @Min(value = 1, message = "视频状态范围：1待审核；2审核通过；3审核拒绝")
+        @Max(value = 3, message = "视频状态范围：1待审核；2审核通过；3审核拒绝")
+        private Integer status;
+        @Schema(title = "申请人名称")
+        private String providerName;
+        @Schema(title = "部门id")
+        private Integer departmentId;
+        @Schema(title = "任务标题")
+        private String taskTitle;
+    }
+
+    @Operation(summary = "审核视频列表")
+    @PostMapping("/list")
+    @adminTokenValid
+    public Result list(@Validated @RequestBody VParam param) {
+        QueryWrapper<Video> qw = new QueryWrapper<>();
+        qw.eq("t1.status",param.getStatus());
+        qw.like(param.providerName != null, "t2.name", param.getProviderName());
+        qw.eq(param.getDepartmentId()!=null,"t3.departmentId",param.getDepartmentId());
+        qw.like(param.getTaskTitle()!=null, "t4.title",param.getTaskTitle());
+        return Result.success(videoService.pageList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageNum()),qw));
+    }
 }

src/main/java/com/zh/project0512/mapper/QywxDepartmentMapper.java

@@ -1,9 +1,11 @@
 package com.zh.project0512.mapper;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zh.project0512.model.QywxDepartment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -25,4 +27,7 @@ public interface QywxDepartmentMapper extends BaseMapper<QywxDepartment> {
         "</foreach> \n"+
         "</script>")
     void updateAll(List<Map> list);
+    @Select("SELECT t1.*,t2.name as parentDepartment from qywxDepartment as t1 " +
+        "LEFT JOIN qywxDepartment as t2 on t1.parentid = t2.departmentId ORDER BY departmentId")
+    List<Map> list(IPage iPage);
 }

src/main/java/com/zh/project0512/mapper/UserMapper.java

@@ -1,11 +1,16 @@
 package com.zh.project0512.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zh.project0512.model.Reference;
 import com.zh.project0512.model.User;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +25,12 @@ public interface UserMapper extends BaseMapper<User> {
     User selByOpenid(@Param("openid") String openid);
     @Select("UPDATE user set token=#{token},lastLoginAt=#{time} where openid=#{openid}")
     void updByOpenid(String openid, String token, LocalDateTime time);
+    @Select("SELECT t1.name,t1.tel,t1.avatar,t1.main_department,t1.sub_department,t1.creatAt,t1.updateAt,t1.lastLoginAt" +
+        ",t2.name as main_departmentName,t3.name as sub_departmentName " +
+        "from user as t1 " +
+        "left join qywxDepartment as t2 on t1.main_department = t2.departmentId " +
+        "left join qywxDepartment as t3 on t1.sub_department = t3.departmentId " +
+        "${ew.customSqlSegment} " +
+        "ORDER BY lastLoginAt DESC,updateAt DESC,creatAt DESC")
+    IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<User> queryWrapper);
 }

src/main/java/com/zh/project0512/mapper/VideoMapper.java

@@ -1,11 +1,18 @@
 package com.zh.project0512.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zh.project0512.model.User;
 import com.zh.project0512.model.Video;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -20,4 +27,12 @@ public interface VideoMapper extends BaseMapper<Video> {
         " set video.status = 1 \n" +
         "WHERE video.status = 0")
     void updStatusWhenTaskEnd(String now);
+    @Select("SELECT t1.*,t2.name as providerName,t3.name as departmentName,t4.title as taskTitle\n" +
+        "  from video as t1\n" +
+        "LEFT JOIN user as t2 on t2.id = t1.userId\n" +
+        "LEFT JOIN qywxDepartment as t3 on t3.departmentId = t2.main_department\n" +
+        "LEFT JOIN task as t4 on t4.id = t1.taskId " +
+        "${ew.customSqlSegment} " +
+        "ORDER BY updateAt DESC,creatAt DESC")
+    IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper);
 }

src/main/java/com/zh/project0512/model/Video.java

@@ -57,6 +57,11 @@ public class Video extends Model {
     @TableField("taskId")
     private Integer taskId;
 
+    /**
+     * 视频审核状态：0待任务结束；1待审核；2审核通过；3审核拒绝
+     */
+    @TableField("status")
+    private Integer status;
     /**
      * 播放次数
      */

src/main/java/com/zh/project0512/service/IQywxDepartmentService.java

@@ -2,6 +2,7 @@ package com.zh.project0512.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zh.project0512.model.QywxDepartment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,4 +19,5 @@ import java.util.Map;
  */
 public interface IQywxDepartmentService extends IService<QywxDepartment> {
     void updateAll(List<Map> list);
+    List<Map> list(IPage iPage);
 }

src/main/java/com/zh/project0512/service/IUserService.java

@@ -1,10 +1,15 @@
 package com.zh.project0512.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zh.project0512.model.Reference;
 import com.zh.project0512.model.User;
+import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +22,5 @@ import java.util.List;
 public interface IUserService extends IService<User> {
     public User selByOpenid(String openid);
     public void updByOpenid(String openid, String token, LocalDateTime time);
+    IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<User> queryWrapper);
 }

src/main/java/com/zh/project0512/service/IVideoService.java

@@ -1,10 +1,16 @@
 package com.zh.project0512.service;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zh.project0512.model.User;
 import com.zh.project0512.model.Video;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,4 +22,5 @@ import java.time.LocalDateTime;
  */
 public interface IVideoService extends IService<Video> {
     void updStatusWhenTaskEnd(String now);
+    IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper);
 }

src/main/java/com/zh/project0512/serviceImpl/QywxDepartmentServiceImpl.java

@@ -2,6 +2,7 @@ package com.zh.project0512.serviceImpl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zh.project0512.model.QywxDepartment;
 import com.zh.project0512.mapper.QywxDepartmentMapper;
 import com.zh.project0512.service.IQywxDepartmentService;
@@ -28,4 +29,7 @@ public class QywxDepartmentServiceImpl extends ServiceImpl<QywxDepartmentMapper,
     public void updateAll(List<Map> list) {
         qywxDepartmentMapper.updateAll(list);
     }
+    public List<Map> list(IPage iPage){
+        return qywxDepartmentMapper.list(iPage);
+    }
 }

src/main/java/com/zh/project0512/serviceImpl/UserServiceImpl.java

@@ -1,13 +1,19 @@
 package com.zh.project0512.serviceImpl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zh.project0512.mapper.UserMapper;
+import com.zh.project0512.model.Reference;
 import com.zh.project0512.model.User;
 import com.zh.project0512.service.IUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +35,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     public void updByOpenid(String openid, String token, LocalDateTime time) {
         userMapper.updByOpenid(openid, token, time);
     }
+    public IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<User> queryWrapper){
+        return userMapper.pageList(iPage,queryWrapper);
+    }
 }

src/main/java/com/zh/project0512/serviceImpl/VideoServiceImpl.java

@@ -1,14 +1,20 @@
 package com.zh.project0512.serviceImpl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zh.project0512.model.User;
 import com.zh.project0512.model.Video;
 import com.zh.project0512.mapper.VideoMapper;
 import com.zh.project0512.service.IVideoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -25,4 +31,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
     public void updStatusWhenTaskEnd(String now){
         videoMapper.updStatusWhenTaskEnd(now);
     }
+    public IPage<Map> pageList(IPage iPage, @Param("ew") Wrapper<Video> queryWrapper){
+        return videoMapper.pageList(iPage, queryWrapper);
+    }
 }