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-19 14:58:13 +08:00
parent 285545ecd0
commit 11cd82dc0f
32 changed files with 365 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,15 +53,15 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
CsConfigurationPO csConfigurationPO = new CsConfigurationPO();
BeanUtils.copyProperties(csConfigurationParm,csConfigurationPO);
List<String> engeeringIds = csConfigurationParm.getEngeeringIds();
if(CollectionUtils.isEmpty(engeeringIds)){
throw new BusinessException("请选择工程");
List<String> projectIds = csConfigurationParm.getProjectIds();
if(CollectionUtils.isEmpty(projectIds)){
throw new BusinessException("请选择项目");
}
String engeerings = String.join(",", engeeringIds);
String projects = String.join(",", projectIds);
csConfigurationPO.setEngeeringIds(engeerings);
csConfigurationPO.setProjectIds(projects);
//排序不填给个100往后排
csConfigurationPO.setOrderBy(csConfigurationParm.getOrderBy()==0?100:csConfigurationParm.getOrderBy());
csConfigurationPO.setOrderBy(Objects.isNull(csConfigurationParm.getOrderBy())?100:csConfigurationParm.getOrderBy());
csConfigurationPO.setImagePath(csConfigurationParm.getFileContent());
csConfigurationPO.setStatus("1");
@@ -79,10 +79,10 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
return b;
}
BeanUtils.copyProperties(auditParm,csConfigurationPO);
List<String> engeeringIds = auditParm.getEngeeringIds();
if(!CollectionUtils.isEmpty(engeeringIds)){
String engeerings = String.join(",", engeeringIds);
csConfigurationPO.setEngeeringIds(engeerings);
List<String> projectIds = auditParm.getProjectIds();
if(!CollectionUtils.isEmpty(projectIds)){
String projects = String.join(",", projectIds);
csConfigurationPO.setProjectIds(projects);
}
if(!Objects.isNull(auditParm.getOrderBy())){
@@ -105,7 +105,7 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
Page<CsConfigurationVO> returnpage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
Page<CsConfigurationPO> temppage = new Page<> (csConfigurationQueryParam.getPageNum(), csConfigurationQueryParam.getPageSize ( ));
List<String> data1 = roleEngineerDevFeignClient.getRoleengineer().getData();
List<String> data1 = roleEngineerDevFeignClient.getRoleProject().getData();
if(CollectionUtils.isEmpty(data1)){
return returnpage;
}
@@ -130,10 +130,10 @@ public class CsConfigurationServiceImpl extends ServiceImpl<CsConfigurationMappe
CsConfigurationVO csDevModelPageVO = new CsConfigurationVO();
BeanUtils.copyProperties(page, csDevModelPageVO);
if(StringUtils.isEmpty(page.getEngeeringIds())){
csDevModelPageVO.setEngeeringIds(new ArrayList<>());
if(StringUtils.isEmpty(page.getProjectIds())){
csDevModelPageVO.setProjectIds(new ArrayList<>());
}else {
csDevModelPageVO.setEngeeringIds( Arrays.asList(page.getEngeeringIds().split(",")));
csDevModelPageVO.setProjectIds( Arrays.asList(page.getProjectIds().split(",")));
}
if(Objects.isNull(page.getImagePath())){

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

@@ -176,6 +176,7 @@ public class StableDataServiceImpl implements StableDataService {
vo.setStatMethod(temp.getValueType());
vo.setStatisticalData(BigDecimal.valueOf(temp.getValue()).setScale(4, RoundingMode.UP).doubleValue());
vo.setStatisticalIndex(data.getId());
vo.setStatisticalName(temp.getStatisticalName());
return vo;
}).collect(Collectors.toList());