浏览代码

产品更新提示添加创建人

lyhzzz 2 年之前
父节点
当前提交
ad89bebe83

+ 4 - 1
src/main/java/com/fdkankan/manage/controller/ServiceUpTipController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.controller;
 
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.ServiceUpTip;
@@ -24,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/service/manage/serviceUpTip")
-public class ServiceUpTipController {
+public class ServiceUpTipController extends BaseController{
 
     @Autowired
     IServiceUpTipService serviceUpTipService;
@@ -35,6 +36,7 @@ public class ServiceUpTipController {
         if(param.getType() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+
         return ResultData.ok(serviceUpTipService.pageList(param));
     }
 
@@ -48,6 +50,7 @@ public class ServiceUpTipController {
         }
         param.setCreateTime(null);
         param.setUpdateTime(null);
+        param.setSysUserId(Long.valueOf((String)StpUtil.getLoginId()));
         if(param.getBanStatus() !=null && param.getBanStatus() == 0){
             serviceUpTipService.banOther(param.getType());
         }

+ 6 - 0
src/main/java/com/fdkankan/manage/entity/ServiceUpTip.java

@@ -110,6 +110,12 @@ public class ServiceUpTip implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("sys_user_id")
+    private Long sysUserId;
+
+    @TableField(exist = false)
+    private String createName;
+
 
     @TableField(exist = false)
     private List<String> timeList;

+ 19 - 0
src/main/java/com/fdkankan/manage/service/impl/ServiceUpTipServiceImpl.java

@@ -5,16 +5,22 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.ServiceUpTip;
+import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.mapper.IServiceUpTipMapper;
 import com.fdkankan.manage.service.IServiceUpTipService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.ServiceUPTipParam;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -27,6 +33,9 @@ import java.util.List;
 @Service
 public class ServiceUpTipServiceImpl extends ServiceImpl<IServiceUpTipMapper, ServiceUpTip> implements IServiceUpTipService {
 
+    @Autowired
+    ISysUserService sysUserService;
+
     @Override
     public Object pageList(ServiceUPTipParam param) {
         LambdaQueryWrapper<ServiceUpTip> wrapper = new LambdaQueryWrapper<>();
@@ -37,7 +46,17 @@ public class ServiceUpTipServiceImpl extends ServiceImpl<IServiceUpTipMapper, Se
         wrapper.orderByAsc(ServiceUpTip::getBanStatus);
         wrapper.orderByDesc(ServiceUpTip::getVersion);
         Page<ServiceUpTip> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        Set<Long> sysUserIds = page.getRecords().stream().map(ServiceUpTip::getSysUserId).collect(Collectors.toSet());
+        HashMap<Long, SysUser> sysUserMap = sysUserService.getByIds(sysUserIds);
 
+        for (ServiceUpTip record : page.getRecords()) {
+            if(record.getSysUserId() != null){
+                SysUser sysUser = sysUserMap.get(record.getSysUserId());
+                if(sysUser !=null){
+                    record.setCreateName(sysUser.getNickName());
+                }
+            }
+        }
         return PageInfo.PageInfo(page);
     }