sdk添加常见人

src/main/java/com/fdkankan/manage/entity/CameraVersion.java

@@ -91,5 +91,7 @@ public class CameraVersion implements Serializable {
     @TableField("min_version")
     private String minVersion;
 
+    @TableField("sys_user_id")
+    private Long sysUserId;
 
 }

src/main/java/com/fdkankan/manage/entity/SpaceSdk.java

@@ -98,5 +98,6 @@ public class SpaceSdk implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
-
+    @TableField("sys_user_id")
+    private Long sysUserId;
 }

src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,13 +13,20 @@ import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.validation.ValidationUtils;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.SpaceSdk;
+import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.CameraVersion;
 import com.fdkankan.manage.mapper.ICameraVersionMapper;
 import com.fdkankan.manage.service.ICameraVersionService;
 import com.fdkankan.manage.vo.request.CameraVersionParam;
+import com.fdkankan.manage.vo.response.CameraVersionVo;
+import com.fdkankan.manage.vo.response.SpaceSdkVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -26,6 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
@@ -50,6 +59,8 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
     private String prefixAli;
     @Resource
     private MangerUploadToOssUtil mangeUploadToOssUtil;
+    @Autowired
+    ISysUserService sysUserService;
 
     @Override
     public void addAndUpload(MultipartFile file, String version, String description, String minVersion, Integer type) throws IOException {
@@ -103,6 +114,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         versionEntity.setMinVersion(minVersion);
         versionEntity.setStatus("I");
         versionEntity.setFileMd5(FileMd5Util.getFileMD5(new File(filePath)));
+        versionEntity.setSysUserId(Long.valueOf(StpUtil.getLoginId().toString()));
         this.save(versionEntity);
         // 删除本地文件
         FileUtils.deleteFile(filePath);
@@ -131,7 +143,25 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         }
         queryWrapper.orderByDesc(CameraVersion::getCreateTime);
         Page<CameraVersion> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), queryWrapper);
-        return PageInfo.PageInfo(page);
+
+        List<CameraVersionVo> voList = new ArrayList<>();
+        for (CameraVersion record : page.getRecords()) {
+            CameraVersionVo vo = new CameraVersionVo();
+            BeanUtils.copyProperties(record,vo);
+            if(record.getSysUserId() !=null){
+                SysUser user = sysUserService.getById(record.getSysUserId());
+                if(user != null){
+                    vo.setCreateName(user.getNickName());
+                }
+            }
+            voList.add(vo);
+        }
+
+        Page<CameraVersionVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
+        voPage.setRecords(voList);
+        voPage.setTotal(page.getTotal());
+
+        return PageInfo.PageInfo(voPage);
     }
 
     @Override

src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -64,9 +64,10 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
     }
 
     @Override
-    public ResultData invoiceRegister(
+    public synchronized ResultData  invoiceRegister(
         Long userId, Long id, String invoiceNum,
         String shipNum, MultipartFile file) throws IOException {
+
         Invoice invoice = this.getById(id);
         if(Objects.isNull(invoice)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_9001);

src/main/java/com/fdkankan/manage/service/impl/SpaceSdkServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -10,21 +11,27 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.manage.entity.SysUser;
+import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.util.MangerUploadToOssUtil;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.fdkankan.manage.mapper.ISpaceSdkMapper;
 import com.fdkankan.manage.service.ISpaceSdkService;
 import com.fdkankan.manage.vo.request.SpaceSdkParam;
+import com.fdkankan.manage.vo.response.SpaceSdkVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -42,6 +49,8 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
 
     @Autowired
     private MangerUploadToOssUtil mangeUploadToOssUtil;
+    @Autowired
+    ISysUserService sysUserService;
 
     @Value("${oss.prefix.ali}")
     private String prefixAli;
@@ -101,6 +110,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         managerSdkEntity.setPlatformType(platformType.toString());
         managerSdkEntity.setFileUrl(url);
         managerSdkEntity.setFileName(fullFileName);
+        managerSdkEntity.setSysUserId(Long.valueOf(StpUtil.getLoginId().toString()));
         this.save(managerSdkEntity);
         if(isTop == 1){
             this.updateTopFBySdkId(managerSdkEntity.getId());//取消所有置顶
@@ -170,7 +180,24 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         queryWrapper.orderByDesc(SpaceSdk::getIsTop);
         queryWrapper.orderByDesc(SpaceSdk::getPublishTime);
         Page<SpaceSdk> page = this.page(new Page<>(param.getPageNum(),param.getPageSize()), queryWrapper);
-        return PageInfo.PageInfo(page);
+
+        List<SpaceSdkVo> voList = new ArrayList<>();
+        for (SpaceSdk record : page.getRecords()) {
+            SpaceSdkVo vo = new SpaceSdkVo();
+            BeanUtils.copyProperties(record,vo);
+            if(record.getSysUserId() !=null){
+                SysUser user = sysUserService.getById(record.getSysUserId());
+                if(user != null){
+                    vo.setCreateName(user.getNickName());
+                }
+            }
+            voList.add(vo);
+        }
+
+        Page<SpaceSdkVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
+        voPage.setRecords(voList);
+        voPage.setTotal(page.getTotal());
+        return PageInfo.PageInfo(voPage);
     }
 
     private void updateBySdkId(Long id, Integer status) {

src/main/java/com/fdkankan/manage/vo/response/CameraVersionVo.java

@@ -0,0 +1,9 @@
+package com.fdkankan.manage.vo.response;
+
+import com.fdkankan.manage.entity.CameraVersion;
+import lombok.Data;
+
+@Data
+public class CameraVersionVo extends CameraVersion {
+    private String createName;
+}

src/main/java/com/fdkankan/manage/vo/response/SpaceSdkVo.java

@@ -0,0 +1,10 @@
+package com.fdkankan.manage.vo.response;
+
+import com.fdkankan.manage.entity.SpaceSdk;
+import lombok.Data;
+
+@Data
+public class SpaceSdkVo extends SpaceSdk {
+
+    private String createName;
+}