diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java
index 025b21b..831342a 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsConfigurationVO.java
@@ -30,6 +30,9 @@ public class CsConfigurationVO extends BaseEntity {
@ApiModelProperty(value = "组态项目名称")
private String name;
+ @ApiModelProperty(value = "操作人")
+ private String operater;
+
/**
* 状态 0:删除 1:正常
*/
diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java
index 4ab5e35..48b2f41 100644
--- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java
+++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/CsPageVO.java
@@ -41,6 +41,8 @@ public class CsPageVO {
*/
@ApiModelProperty(value="组态页面名称")
private String name;
+ @ApiModelProperty(value = "操作人")
+ private String operater;
/**
* 组态页面文件路径
diff --git a/cs-harmonic/cs-harmonic-boot/pom.xml b/cs-harmonic/cs-harmonic-boot/pom.xml
index e6e740f..1e0b6de 100644
--- a/cs-harmonic/cs-harmonic-boot/pom.xml
+++ b/cs-harmonic/cs-harmonic-boot/pom.xml
@@ -74,6 +74,12 @@
1.0.0
compile
+
+ com.njcn
+ user-api
+ 1.0.0
+ compile
+
com.njcn
common-influxDB
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java
index 04bd7a2..f58cee3 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsConfigurationServiceImpl.java
@@ -12,14 +12,19 @@ import com.njcn.harmonic.pojo.po.CsConfigurationPO;
import com.njcn.harmonic.pojo.vo.CsConfigurationVO;
import com.njcn.harmonic.service.CsConfigurationService;
import com.njcn.oss.utils.FileStorageUtil;
+import com.njcn.user.api.UserFeignClient;
+import com.njcn.user.pojo.po.User;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -35,6 +40,8 @@ import java.util.stream.Collectors;
public class CsConfigurationServiceImpl extends ServiceImpl implements CsConfigurationService{
private final FileStorageUtil fileStorageUtil;
+ private final UserFeignClient userFeignClient;
+
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean add(CsConfigurationParm csConfigurationParm) {
@@ -65,9 +72,20 @@ public class CsConfigurationServiceImpl extends ServiceImpl csConfigurationPOPage = this.getBaseMapper().selectPage(temppage, query);
+ List collect1 = csConfigurationPOPage.getRecords().stream().map(CsConfigurationPO::getCreateBy).collect(Collectors.toList());
+ Map collect2;
+ if(!CollectionUtils.isEmpty(collect1)){
+ List data = userFeignClient.getUserByIdList(collect1).getData();
+ collect2 = data.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2));
+
+ } else {
+ collect2 = new HashMap<>();
+ }
+
List collect = csConfigurationPOPage.getRecords().stream().map(page -> {
CsConfigurationVO csDevModelPageVO = new CsConfigurationVO();
BeanUtils.copyProperties(page, csDevModelPageVO);
+ csDevModelPageVO.setOperater(collect2.get(csDevModelPageVO.getCreateBy()));
return csDevModelPageVO;
}).collect(Collectors.toList());
returnpage.setRecords(collect);
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java
index 6ce5242..3c11486 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CsPagePOServiceImpl.java
@@ -13,18 +13,23 @@ import com.njcn.harmonic.pojo.po.CsPagePO;
import com.njcn.harmonic.pojo.vo.CsPageVO;
import com.njcn.harmonic.service.CsPagePOService;
import com.njcn.oss.utils.FileStorageUtil;
+import com.njcn.user.api.UserFeignClient;
+import com.njcn.user.pojo.po.User;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
*
@@ -39,6 +44,8 @@ import java.util.stream.Collectors;
public class CsPagePOServiceImpl extends ServiceImpl implements CsPagePOService{
private final FileStorageUtil fileStorageUtil;
private final CsConfigurationMapper csConfigurationMapper;
+ private final UserFeignClient userFeignClient;
+
@Override
@Transactional(rollbackFor = {Exception.class})
public CsPageVO add(CsPageParm csPageParm) {
@@ -91,6 +98,15 @@ public class CsPagePOServiceImpl extends ServiceImpl i
orderByDesc(CsPagePO.COL_CREATE_TIME);
IPage pageData = this.page(new Page<>(csPageParam.getPageNum(), csPageParam.getPageSize()), queryWrapper);
+ List collect1 = pageData.getRecords().stream().map(CsPagePO::getCreateBy).collect(Collectors.toList());
+ Map collect2;
+ if(!CollectionUtils.isEmpty(collect1)){
+ List data = userFeignClient.getUserByIdList(collect1).getData();
+ collect2 = data.stream().collect(Collectors.toMap(User::getId, User::getName, (e1, e2) -> e1 + "," + e2));
+
+ } else {
+ collect2 = new HashMap<>();
+ }
List collect = pageData.getRecords().stream().map(temp -> {
CsPageVO csPageVO = new CsPageVO();
CsConfigurationPO csConfigurationPO = csConfigurationMapper.selectById(temp.getPid());
@@ -102,6 +118,7 @@ public class CsPagePOServiceImpl extends ServiceImpl i
.lines()
.collect(Collectors.joining("\n"));
csPageVO.setPath(text);
+ csPageVO.setOperater(collect2.get(csPageVO.getCreateBy()));
return csPageVO;
}).collect(Collectors.toList());
returnpage.setRecords(collect);