Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

系统配置

Browse Source
This commit is contained in:
huangzj
2023-07-11 08:50:47 +08:00
parent 331a2e4f01
commit 6e2a4395f1
41 changed files with 643 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsConfigurationServiceImpl.java
View File

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.NjcnBeanUtil;
import com.njcn.csharmonic.constant.HarmonicConstant;
import com.njcn.csharmonic.mapper.CsConfigurationMapper;
@@ -28,10 +29,7 @@ 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.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -54,6 +52,16 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
public boolean add(CsConfigurationParm csConfigurationParm) {
CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
BeanUtils.copyProperties(csConfigurationParm,csConfigurationPO);
List<String> engeeringIds = csConfigurationParm.getEngeeringIds();
if(CollectionUtils.isEmpty(engeeringIds)){
throw new BusinessException("请选择工程");
}
String engeerings = String.join(",", engeeringIds);
csConfigurationPO.setEngeeringIds(engeerings);
//排序不填给个100往后排
csConfigurationPO.setOrderBy(csConfigurationParm.getOrderBy()==0?100:csConfigurationParm.getOrderBy());
csConfigurationPO.setImagePath(csConfigurationParm.getFileContent());
csConfigurationPO.setStatus("1");
@@ -64,7 +72,21 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
@Override
public boolean audit(CsConfigurationParm.CsConfigurationAuditParam auditParm) {
CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
NjcnBeanUtil.copyPropertiesIgnoreCase(auditParm,csConfigurationPO);
if(Objects.equals(auditParm.getStatus(),"0")){
csConfigurationPO.setId(auditParm.getId());
csConfigurationPO.setStatus("0");
boolean b = this.updateById(csConfigurationPO);
return b;
}
BeanUtils.copyProperties(auditParm,csConfigurationPO);
List<String> engeeringIds = auditParm.getEngeeringIds();
if(CollectionUtils.isEmpty(engeeringIds)){
throw new BusinessException("请选择工程");
}
String engeerings = String.join(",", engeeringIds);
csConfigurationPO.setEngeeringIds(engeerings);
csConfigurationPO.setOrderBy(auditParm.getOrderBy()==0?100:auditParm.getOrderBy());
if(!Objects.isNull(auditParm.getFileContent())){
String s = fileStorageUtil.uploadStream(writeJsonStringToInputStream(auditParm.getFileContent()), HarmonicConstant.CONFIGURATIONPATH, HarmonicConstant.CONFIGURATIONNAME);
csConfigurationPO.setImagePath(s);
@@ -79,14 +101,13 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
public IPage<CsConfigurationVO> queryPage(CsConfigurationParm.CsConfigurationQueryParam csConfigurationQueryParam) {
Page<CsConfigurationVO> returnpage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
Page<CsConfigurationPO> temppage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
String deptIndex = RequestUtil.getDeptIndex();
QueryWrapper<CsConfigurationPO> query = new QueryWrapper<>();
query.like(StringUtils.isNotBlank(csConfigurationQueryParam.getSearchValue()),CsConfigurationPO.COL_NAME,csConfigurationQueryParam.getSearchValue()).
le (StringUtils.isNotBlank (csConfigurationQueryParam.getSearchEndTime()), CsConfigurationPO.COL_CREATE_TIME, csConfigurationQueryParam.getSearchEndTime ( )).
ge (StringUtils.isNotBlank (csConfigurationQueryParam.getSearchBeginTime()), CsConfigurationPO.COL_CREATE_TIME, csConfigurationQueryParam.getSearchBeginTime ( )).
eq ("status",1).orderByDesc(CsConfigurationPO.COL_CREATE_TIME);
eq ("status",1).orderByAsc("order_by").orderByDesc(CsConfigurationPO.COL_CREATE_TIME);
Page<CsConfigurationPO> csConfigurationPOPage = this.getBaseMapper().selectPage(temppage, query);
List<String> collect1 = csConfigurationPOPage.getRecords().stream().map(CsConfigurationPO::getCreateBy).collect(Collectors.toList());
Map<String, String> collect2;
@@ -101,6 +122,13 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
List<CsConfigurationVO> collect = csConfigurationPOPage.getRecords().stream().map(page -> {
CsConfigurationVO csDevModelPageVO = new CsConfigurationVO();
BeanUtils.copyProperties(page, csDevModelPageVO);
if(StringUtils.isEmpty(page.getEngeeringIds())){
csDevModelPageVO.setEngeeringIds(new ArrayList<>());
}else {
csDevModelPageVO.setEngeeringIds( Arrays.asList(page.getEngeeringIds().split(",")));
}
if(Objects.isNull(page.getImagePath())){
csDevModelPageVO.setFileContent(null);

1
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsPagePOServiceImpl.java
View File

@@ -128,6 +128,7 @@ public class CsPagePOServiceImpl extends ServiceImpl<CsPagePOMapper, CsPagePO> i
CsPageVO csPageVO = new CsPageVO();
CsConfigurationPO csConfigurationPO = csConfigurationMapper.selectById(temp.getPid());
BeanUtils.copyProperties(temp, csPageVO);
csPageVO.setKid(temp.getKId());
csPageVO.setConfigurationName(csConfigurationPO.getName());
InputStream fileStream = fileStorageUtil.getFileStream(temp.getPath());
String text = new BufferedReader(