|
@@ -7,6 +7,7 @@ import com.qunzhixinxi.hnqz.admin.api.entity.SysCheckChainNodeCheckHistory;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysCheckChainNodeCheckHistoryService;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysCheckChainNodeCheckHistoryService;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysCheckChainNodeService;
|
|
import com.qunzhixinxi.hnqz.admin.service.SysCheckChainNodeService;
|
|
import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
|
|
import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
|
|
|
|
+import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -15,6 +16,7 @@ import java.time.LocalDateTime;
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
import java.util.Collections;
|
|
import java.util.Collections;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
|
+import java.util.LinkedList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
import java.util.function.Function;
|
|
import java.util.function.Function;
|
|
@@ -38,8 +40,7 @@ public class SysCheckChainManager {
|
|
|
|
|
|
public Boolean doCheck(Collection<SysCheckChainNodeCheckHistoryDTO.OnCreate> resources, HnqzUser operator) {
|
|
public Boolean doCheck(Collection<SysCheckChainNodeCheckHistoryDTO.OnCreate> resources, HnqzUser operator) {
|
|
|
|
|
|
-
|
|
|
|
- List<SysCheckChainNodeCheckHistory> collect = resources.stream().map(resource -> {
|
|
|
|
|
|
+ List<SysCheckChainNodeCheckHistory> temp = resources.stream().map(resource -> {
|
|
SysCheckChainNodeCheckHistory history = new SysCheckChainNodeCheckHistory();
|
|
SysCheckChainNodeCheckHistory history = new SysCheckChainNodeCheckHistory();
|
|
history.setNodeId(resource.getNodeId());
|
|
history.setNodeId(resource.getNodeId());
|
|
history.setTargetId(resource.getTargetId());
|
|
history.setTargetId(resource.getTargetId());
|
|
@@ -50,10 +51,30 @@ public class SysCheckChainManager {
|
|
history.setCreateTime(LocalDateTime.now());
|
|
history.setCreateTime(LocalDateTime.now());
|
|
history.setUpdateTime(LocalDateTime.now());
|
|
history.setUpdateTime(LocalDateTime.now());
|
|
return history;
|
|
return history;
|
|
- }).collect(Collectors.toList());
|
|
|
|
-
|
|
|
|
|
|
+ }).collect(Collectors.toCollection(LinkedList::new));
|
|
|
|
+
|
|
|
|
+ List<Integer> roles = SecurityUtils.getRoles();
|
|
|
|
+
|
|
|
|
+ // 事业部总经理
|
|
|
|
+ if (roles.contains(39)) {
|
|
|
|
+ List<SysCheckChainNodeCheckHistory> collect1 = resources.stream().filter(res -> res.getNodeId() == 5).map(r -> {
|
|
|
|
+ SysCheckChainNodeCheckHistory history = new SysCheckChainNodeCheckHistory();
|
|
|
|
+ history.setNodeId(6);
|
|
|
|
+ history.setTargetId(r.getTargetId());
|
|
|
|
+ history.setCheckResult(r.getCheckResult());
|
|
|
|
+ history.setCheckMsg(r.getCheckMessage());
|
|
|
|
+ history.setCreateBy(operator.getUsername());
|
|
|
|
+ history.setUpdateBy(operator.getUsername());
|
|
|
|
+ history.setCreateTime(LocalDateTime.now());
|
|
|
|
+ history.setUpdateTime(LocalDateTime.now());
|
|
|
|
+ return history;
|
|
|
|
+
|
|
|
|
+ }).collect(Collectors.toList());
|
|
|
|
+
|
|
|
|
+ temp.addAll(collect1);
|
|
|
|
+ }
|
|
|
|
|
|
- return checkChainNodeCheckHistoryService.createHistory(collect);
|
|
|
|
|
|
+ return checkChainNodeCheckHistoryService.createHistory(temp);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|