Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
wr
2025-12-05 15:34:12 +08:00
parent e03478eeec 0c1bb606d6
commit 186d46752c
4 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/ComponentParam.java
View File

@@ -9,7 +9,6 @@ import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Range; import org.hibernate.validator.constraints.Range;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
import java.util.List; import java.util.List;
@@ -60,9 +59,7 @@ public class ComponentParam {
private String image; private String image;
@ApiModelProperty("时间标识") @ApiModelProperty("时间标识")
private String timeKey; private List<String> timeKeys;
@ApiModelProperty("系统类型") @ApiModelProperty("系统类型")
@NotBlank(message = "系统类型不为空") @NotBlank(message = "系统类型不为空")
@@ -84,6 +81,4 @@ public class ComponentParam {
} }
} }

15
pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/Component.java
View File

@@ -1,14 +1,15 @@
package com.njcn.user.pojo.po; package com.njcn.user.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity; import com.njcn.db.bo.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.util.List;
/** /**
*
* @author xuyang * @author xuyang
* @since 2021-12-13 * @since 2021-12-13
*/ */
@@ -80,5 +81,13 @@ public class Component extends BaseEntity {
private String timeKey; private String timeKey;
@TableField(exist = false)
private List<String> timeKeys;
public String getTimeKey() {
if (timeKeys != null) {
timeKey = String.join(",", timeKeys);
}
return timeKey;
}
} }

3
pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/ComponentVO.java
View File

@@ -52,6 +52,9 @@ public class ComponentVO implements Serializable {
@ApiModelProperty("时间标识") @ApiModelProperty("时间标识")
private String timeKey; private String timeKey;
@ApiModelProperty("时间标识集合")
private List<String> timeKeys;
@ApiModelProperty("子级") @ApiModelProperty("子级")
List<ComponentVO> children; List<ComponentVO> children;

32
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ComponentServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.njcn.user.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
@@ -25,7 +26,10 @@ import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -89,17 +93,18 @@ public class ComponentServiceImpl extends ServiceImpl<ComponentMapper, Component
List<ComponentVO> list = new ArrayList<>(); List<ComponentVO> list = new ArrayList<>();
List<ComponentVO> result = new ArrayList<>(); List<ComponentVO> result = new ArrayList<>();
List<ComponentDTO> componentList = componentMapper.getAllComponent(); List<ComponentDTO> componentList = componentMapper.getAllComponent();
if (!CollectionUtils.isEmpty(componentList)){ if (!CollectionUtils.isEmpty(componentList)) {
componentList.forEach(item -> { componentList.forEach(item -> {
ComponentVO componentVO = new ComponentVO(); ComponentVO componentVO = new ComponentVO();
BeanUtil.copyProperties(item, componentVO); BeanUtil.copyProperties(item, componentVO);
componentVO.setTimeKeys(StrUtil.split(item.getTimeKey(), ","));
// componentVO.setFunctionGroup(Arrays.stream(item.getFunctionGroup().split(",")).map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList())); // componentVO.setFunctionGroup(Arrays.stream(item.getFunctionGroup().split(",")).map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList()));
list.add(componentVO); list.add(componentVO);
}); });
Map<String,List<ComponentVO>> map = list.stream().filter(m->!Objects.isNull(m.getSystemType())).collect(Collectors.groupingBy(ComponentVO::getSystemType)); Map<String, List<ComponentVO>> map = list.stream().filter(m -> !Objects.isNull(m.getSystemType())).collect(Collectors.groupingBy(ComponentVO::getSystemType));
map.forEach((k,v)->{ map.forEach((k, v) -> {
DictData dictData = dicDataFeignClient.getDicDataById(k).getData(); DictData dictData = dicDataFeignClient.getDicDataById(k).getData();
if (Objects.isNull(dictData)){ if (Objects.isNull(dictData)) {
throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY); throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY);
} }
ComponentVO componentVO = new ComponentVO(); ComponentVO componentVO = new ComponentVO();
@@ -107,9 +112,9 @@ public class ComponentServiceImpl extends ServiceImpl<ComponentMapper, Component
componentVO.setName(dictData.getName()); componentVO.setName(dictData.getName());
componentVO.setChildren( componentVO.setChildren(
v.stream() v.stream()
.filter(fun -> Objects.equals(ComponentState.FATHER_PID, fun.getPid())) .filter(fun -> Objects.equals(ComponentState.FATHER_PID, fun.getPid()))
.peek(funS -> funS.setChildren(getChildCategoryList(funS, v))) .peek(funS -> funS.setChildren(getChildCategoryList(funS, v)))
.collect(Collectors.toList())); .collect(Collectors.toList()));
result.add(componentVO); result.add(componentVO);
}); });
} }
@@ -132,19 +137,20 @@ public class ComponentServiceImpl extends ServiceImpl<ComponentMapper, Component
} }
list = componentMapper.getComponentByList(componentList); list = componentMapper.getComponentByList(componentList);
} }
if (CollectionUtil.isEmpty(list)){ if (CollectionUtil.isEmpty(list)) {
return result; return result;
} }
list.forEach(item -> { list.forEach(item -> {
ComponentVO componentVO = new ComponentVO(); ComponentVO componentVO = new ComponentVO();
BeanUtil.copyProperties(item, componentVO); BeanUtil.copyProperties(item, componentVO);
componentVO.setTimeKeys(StrUtil.split(item.getTimeKey(), ","));
// componentVO.setFunctionGroup(Arrays.stream(item.getFunctionGroup().split(",")).map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList())); // componentVO.setFunctionGroup(Arrays.stream(item.getFunctionGroup().split(",")).map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList()));
componentVOList.add(componentVO); componentVOList.add(componentVO);
}); });
Map<String,List<ComponentVO>> map = componentVOList.stream().collect(Collectors.groupingBy(ComponentVO::getSystemType)); Map<String, List<ComponentVO>> map = componentVOList.stream().collect(Collectors.groupingBy(ComponentVO::getSystemType));
map.forEach((k, v)->{ map.forEach((k, v) -> {
DictData dictData = dicDataFeignClient.getDicDataById(k).getData(); DictData dictData = dicDataFeignClient.getDicDataById(k).getData();
if (Objects.isNull(dictData)){ if (Objects.isNull(dictData)) {
throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY); throw new BusinessException(SystemResponseEnum.SYSTEM_TYPE_EMPTY);
} }
ComponentVO componentVO = new ComponentVO(); ComponentVO componentVO = new ComponentVO();
@@ -167,7 +173,7 @@ public class ComponentServiceImpl extends ServiceImpl<ComponentMapper, Component
component.setId("0"); component.setId("0");
component.setName("无"); component.setName("无");
list.add(component); list.add(component);
list.addAll(this.lambdaQuery().eq(Component::getSystemType, systemType).eq(Component::getPid,ComponentState.FATHER_PID).eq(Component::getState, ComponentState.ENABLE).list()); list.addAll(this.lambdaQuery().eq(Component::getSystemType, systemType).eq(Component::getPid, ComponentState.FATHER_PID).eq(Component::getState, ComponentState.ENABLE).list());
return list; return list;
} }