考级资讯

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeNews.java

@@ -89,6 +89,10 @@ public class DegreeNews implements Serializable {
     @TableField(value = "video_cover_image_")
     private String videoCoverImage;
 
+    @ApiModelProperty("修改人")
+    @TableField(value = "operator_id_")
+    private Integer operatorId;
+
     @ApiModelProperty("更新时间")
     @TableField(value = "update_time_")
     private Date updateTime;

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/DegreeNewsVo.java

@@ -67,6 +67,12 @@ public class DegreeNewsVo{
     @ApiModelProperty("视频封面")
     private String videoCoverImage;
 
+    @ApiModelProperty("操作人")
+    private Integer operatorId;
+
+    @ApiModelProperty("操作人")
+    private String operatorName;
+
     @ApiModelProperty("更新时间")
     private Date updateTime;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/DegreeNewsServiceImpl.java

@@ -3,7 +3,11 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.vo.DegreeNewsVo;
+import com.ym.mec.util.collection.MapUtil;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
 import com.ym.mec.biz.dal.entity.DegreeNews;
@@ -11,6 +15,10 @@ import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
 import com.ym.mec.biz.dal.mapper.DegreeNewsMapper;
 import com.ym.mec.biz.service.DegreeNewsService;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 考级资讯表
  * 2023-04-10 10:24:25
@@ -19,6 +27,9 @@ import com.ym.mec.biz.service.DegreeNewsService;
 @Service
 public class DegreeNewsServiceImpl extends ServiceImpl<DegreeNewsMapper, DegreeNews> implements DegreeNewsService {
 
+    @Autowired
+    private TeacherDao teacherDao;
+
 	/**
      * 查询详情
      * @param id 详情ID
@@ -38,8 +49,15 @@ public class DegreeNewsServiceImpl extends ServiceImpl<DegreeNewsMapper, DegreeN
      */
     @Override
     public IPage<DegreeNewsVo> selectPage(IPage<DegreeNewsVo> page, DegreeNewsWrapper.DegreeNewsQuery query) {
-        
-        return page.setRecords(baseMapper.selectPage(page, query));
+        List<DegreeNewsVo> degreeNewsVos = baseMapper.selectPage(page, query);
+        if(CollectionUtils.isNotEmpty(degreeNewsVos)){
+            List<Integer> operatorIds = degreeNewsVos.stream().map(e -> e.getOperatorId()).distinct().collect(Collectors.toList());
+            Map<Integer, String> nameIdMap = MapUtil.convertIntegerMap(teacherDao.queryNameByIdList(operatorIds));
+            for (DegreeNewsVo vo : degreeNewsVos) {
+                vo.setOperatorName(nameIdMap.get(vo.getOperatorId()));
+            }
+        }
+        return page.setRecords(degreeNewsVos);
     }
 	
     /**

mec-web/src/main/java/com/ym/mec/web/controller/degree/DegreeNewsController.java

@@ -6,6 +6,7 @@ import com.microsvc.toolkit.common.response.template.R;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.vo.DegreeNewsVo;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -36,6 +37,8 @@ public class DegreeNewsController extends BaseController {
 
     @Autowired
     private DegreeNewsService degreeNewsService;
+    @Autowired
+    private SysUserService sysUserService;
 
 	@ApiOperation(value = "详情", notes = "考级资讯表-根据详情ID查询单条, 传入id")
     @PreAuthorize("@pcs.hasPermissions('degreeNews/detail')")
@@ -61,7 +64,7 @@ public class DegreeNewsController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('degreeNews/save')")
 	@PostMapping("/save")
 	public HttpResponseResult<JSONObject> add(@Validated @RequestBody DegreeNews degreeNews) {
-        
+        degreeNews.setOperatorId(sysUserService.getUserId());
         // 新增数据
         degreeNewsService.save(degreeNews);
         
@@ -72,7 +75,7 @@ public class DegreeNewsController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('degreeNews/update')")
 	@PostMapping("/update")
 	public HttpResponseResult<JSONObject> update(@Validated @RequestBody DegreeNews degreeNews) {
-        
+        degreeNews.setOperatorId(sysUserService.getUserId());
         // 更新数据
         degreeNewsService.updateById(degreeNews);