Skip to content

G
gf_back
Commit 82e79ac4 authored by ZWT's avatar ZWT
Browse files
Options

feat(能源管理系统): 修改架构 

1.修改架构添加cse;
2.修改各微服务服务名,启动验证,完成cse注册;
3.修改各模块pom及配置文件,解决服务间无法调用问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d130574d
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 1123 deletions
C02-system/pps-cloud-system/pom.xml
View file @ 82e79ac4
......@@ -24,35 +24,6 @@
<properties>
<maven.build.timestamp.format>yyyy.MMdd.HHmmss</maven.build.timestamp.format>
</properties>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......
C02-system/pps-core-system/pom.xml
View file @ 82e79ac4
......@@ -46,52 +46,12 @@
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>gf</groupId>-->
<!-- <artifactId>pps-core-auth</artifactId>-->
<!-- <version>1.0.0-pps</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.32</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>gf</groupId>-->
<!-- <artifactId>fiybook-cloud</artifactId>-->
<!-- <version>1.0.0-pps</version>-->
<!-- <scope>compile</scope>-->
<!-- </dependency>-->
</dependencies>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......
C09-base/pps-cloud-base/pom.xml
View file @ 82e79ac4
......@@ -24,34 +24,6 @@
</dependency>
</dependencies>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......@@ -73,6 +45,4 @@
</releases>
</repository>
</repositories>
</project>
\ No newline at end of file
C09-base/pps-core-base/pom.xml
View file @ 82e79ac4
......@@ -22,12 +22,6 @@
<artifactId>pps-common</artifactId>
<version>1.0.0-pps</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>gf</groupId>-->
<!-- <artifactId>pps-core-auth</artifactId>-->
<!-- <version>1.0.0-pps</version>-->
<!-- <scope>provided</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
......@@ -40,52 +34,21 @@
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-system</artifactId>
<artifactId>pps-cloud-space</artifactId>
<version>1.0.0-pps</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.10.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-mail -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
<version>2.6.8</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.32</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......@@ -106,7 +69,10 @@
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>
</project>
C09-base/pps-core-base/src/main/java/pps/core/base/module/PpsCoreBaseModule.java
View file @ 82e79ac4
package pps.core.base.module;
import pps.core.common.utils.ManifestComponentInfoHelper;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.XModule;
......@@ -13,6 +12,5 @@ public class PpsCoreBaseModule extends XModule {
@Override
protected void onStarted(XContext context) {
ManifestComponentInfoHelper.init(this.getClass().getClassLoader());
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseLineService.java deleted 100644 → 0
View file @ d130574d
package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.SystemDictionaryService;
import pps.cloud.system.service.data.GetAllOuListByOuIdInput;
import pps.cloud.system.service.data.GetOuListTreeOutput;
import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.*;
import pps.core.base.mapper.BaseLineAttenuationRateMapper;
import pps.core.base.mapper.BaseLineAttenuationRateViewMapper;
import pps.core.base.mapper.BaseLineMapper;
import pps.core.base.mapper.BaseLineViewMapper;
import pps.core.base.service.data.base_line.*;
import pps.core.base.service.data.base_line_attenuation_rate.CreateBaseLineAttenuationRateInput;
import pps.core.common.session.PpsUserSession;
import pps.core.system.entity.SysAreaEnt;
import pps.core.system.mapper.SysAreaMapper;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XStringUtils;
import xstartup.data.XListResult;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@XService
public class BaseLineService {
@XApiAnonymous
@XApiPost
public XServiceResult createBaseLine(XContext context, CreateBaseLineInput input){
BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
BaseLineEnt entity = new BaseLineEnt();
XCopyUtils.copyObject(input, entity);
if(entity.getParentId() == null)
entity.setParentId(0);
Date now = new Date();
PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getUserName());
entity.setCreateTime(now);
mapper.insert(entity);
if(!CollectionUtils.isEmpty(input.getList())){
BaseLineAttenuationRateViewMapper rateMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
List<BaseLineAttenuationRateView> list = new ArrayList<>();
for(CreateBaseLineAttenuationRateInput rateInput : input.getList()){
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput , BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
ent.setCreateTime(now);
ent.setType(0);
ent.setLineId(entity.getId());
list.add(ent);
}
rateMapper.batchInsert(list);
}
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateBaseLine(XContext context, UpdateBaseLineInput input){
BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId());
BaseLineEnt entity = mapper.selectOne(queryWrapper);
if(entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
if(entity.getParentId() == null)
entity.setParentId(0);
Date now = new Date();
PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(now);
mapper.updateById(entity);
BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class);
QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>();
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId , entity.getId());
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType , 0);
rateMapper.delete(queryRateWrapper);
if(!CollectionUtils.isEmpty(input.getList())){
BaseLineAttenuationRateViewMapper rateViewMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
List<BaseLineAttenuationRateView> list = new ArrayList<>();
for(CreateBaseLineAttenuationRateInput rateInput : input.getList()){
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput , BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
ent.setCreateTime(now);
ent.setLineId(entity.getId());
ent.setType(0);
list.add(ent);
}
rateViewMapper.batchInsert(list);
}
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult deleteBaseLine(XContext context, DeleteBaseLineInput input){
BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseLineEnt::getId, input.getId());
BaseLineEnt entity = mapper.selectOne(queryWrapper);
if(entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
mapper.deleteById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XSingleResult<GetBaseLineOutput> getBaseLine(XContext context, GetBaseLineInput input){
BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
BaseLineView lineView = new BaseLineView();
lineView.setId(input.getId());
BaseLineView entity = mapper.selectOne(lineView);
if(entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBaseLineOutput output = new GetBaseLineOutput();
XCopyUtils.copyObject(entity, output);
BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class);
QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>();
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId , entity.getId());
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType , 0);
List<BaseLineAttenuationRateEnt> list = rateMapper.selectList(queryRateWrapper);
if(!CollectionUtils.isEmpty(list)){
List<CreateBaseLineAttenuationRateInput> rateInputs = XCopyUtils.copyNewList(list , CreateBaseLineAttenuationRateInput.class);
output.setList(rateInputs);
}
if(output.getParentId() == 0)
output.setParentId(null);
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiPost
public XPageResult<QueryBaseLineOutput> queryBaseLineList(XContext context, QueryBaseLineListInput input){
PageHelper.startPage(input.getPage(), input.getLimit());
//获取组织机构下的子集
SysOrganizationCloudService cloudService = context.getBean(SysOrganizationCloudService.class);
GetAllOuListByOuIdInput ouIdInput = new GetAllOuListByOuIdInput();
if(XStringUtils.isNotEmpty(input.getOuId()))
ouIdInput.setOuId(input.getOuId());
else
ouIdInput.setOuId("00000000-0000-0000-0000-000000000000");
XListResult<GetOuListTreeOutput> outputXListResult = cloudService.getAllOuListByOuId(context , ouIdInput);
outputXListResult.throwIfFail();
List<GetOuListTreeOutput> ouList = outputXListResult.getResult();
List<String> ouIdList = new ArrayList<>();
if(CollectionUtils.isEmpty(ouList)){
ouIdList.add(input.getOuId());
}else {
ouIdList = ouList.stream().map(GetOuListTreeOutput::getOuId).collect(Collectors.toList());
}
BaseLineViewMapper viewMapper = context.getBean(BaseLineViewMapper.class);
BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class);
view.setOuIdList(ouIdList);
List<BaseLineView> list = viewMapper.selectList(view);
PageInfo<BaseLineView> pageInfo = new PageInfo(list);
List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineOutput.class);
//获取线路、电网字典
List<QuerySysDictionaryViewOutput> gridTypeList = getDictList(context , "grid_type");
List<QuerySysDictionaryViewOutput> lineTypeList = getDictList(context , "line_type");
for(QueryBaseLineOutput item : outputs){
item.setGridTypeName(getDictName(item.getGridType(), gridTypeList));
item.setLineTypeName(getDictName(item.getLineType(), lineTypeList));
}
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
@XApiAnonymous
@XApiPost
public XPageResult<QueryBaseLineOutput> queryBaseLine(XContext context, QueryBaseLineInput input){
BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class);
List<BaseLineView> list = mapper.selectList(view);
PageInfo<BaseLineView> pageInfo = new PageInfo(list);
List<QueryBaseLineOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineOutput.class);
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
@XApiAnonymous
@XApiPost
public XPageResult<QueryBaseLineAllOutput> queryAllBaseLine(XContext context, QueryBaseLineInput input){
BaseLineViewMapper mapper = context.getBean(BaseLineViewMapper.class);
BaseLineView view = XCopyUtils.copyNewObject(input,BaseLineView.class);
List<BaseLineAllView> list = mapper.selectDataList(view);
PageInfo<BaseLineAllView> pageInfo = new PageInfo(list);
List<QueryBaseLineAllOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseLineAllOutput.class);
SystemAreaService areaService = context.getBean(SystemAreaService.class);
// XListResult<GetSysAreaOutput> areaOutputXListResult = areaService.getSysAreaList(context ,new GetSysAreaInput());
// areaOutputXListResult.throwIfFail();
// List<GetSysAreaOutput> areaOutputs = areaOutputXListResult.getResult();
SysAreaMapper areaMapper = context.getBean(SysAreaMapper.class);
List<SysAreaEnt> areaEntList = areaMapper.selectList(new QueryWrapper<>());
outputs.stream().forEach(item->{
if(XStringUtils.isNotEmpty(item.getProvince())){
System.out.println(item.getProvince());
SysAreaEnt areaEnt = areaEntList.stream().filter(area->item.getProvince().equals(area.getId()+"")).findFirst().orElse(null);
if(areaEnt != null)
item.setProvince(getParentNameStr(areaEntList ,areaEnt ));
}
});
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
@XApiAnonymous
@XApiPost
public XPageResult<QueryBaseLineOutput> dynamicQueryBaseLine(XContext context, CustomQueryInput input){
BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
return XMapperHelper.query(mapper, input, BaseLineEnt.class, QueryBaseLineOutput.class);
}
public List<QuerySysDictionaryViewOutput> getDictList(XContext context , String alias ){
SystemDictionaryService dictionaryService = context.getBean(SystemDictionaryService.class);
QuerySysDictionaryViewInput dictInput = new QuerySysDictionaryViewInput();
dictInput.setAlias(alias);
dictInput.setPage(1);
dictInput.setLimit(999);
XListResult<QuerySysDictionaryViewOutput> dictPageResult = dictionaryService.queryChildSysDictionarysByParentAlias(context, dictInput);
dictPageResult.throwIfFail();
return dictPageResult.getResult();
}
public String getDictName(String dictKey,List<QuerySysDictionaryViewOutput> dictList){
if(StringUtils.isBlank(dictKey) || CollectionUtils.isEmpty(dictList)){
return " ";
}
for (QuerySysDictionaryViewOutput dict : dictList) {
if(dict.getDicKey().equals(dictKey)){
return dict.getDicName();
}
}
return "";
}
@XApiAnonymous
@XApiPost
public XListResult<GetBaseLineTreeOutput> getBaseLineTree(XContext context, GetBaseLineInput input){
BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
//queryWrapper.lambda().in(BaseLineEnt::getWellOuId , ouIdList);
List<BaseLineEnt> list = mapper.selectList(queryWrapper);
List<GetBaseLineTreeOutput> outputs = new ArrayList<>();
for(BaseLineEnt ent : list){
GetBaseLineTreeOutput output = new GetBaseLineTreeOutput();
output.setParentId(ent.getParentId());
output.setValue(ent.getId());
output.setLabel(ent.getLineName());
outputs.add(output);
}
if(!CollectionUtils.isEmpty(outputs))
selectBaseLineTree(outputs);
return XListResult.success(outputs);
}
public List<GetBaseLineTreeOutput> selectBaseLineTree(List<GetBaseLineTreeOutput> list) {
//操作所有组织机构数据
Map<Integer, List<GetBaseLineTreeOutput>> groupMap = list.stream().collect(Collectors.groupingBy(GetBaseLineTreeOutput::getParentId));
list.forEach(organization-> {
organization.setChildren(groupMap.get(organization.getValue()));
});
List<GetBaseLineTreeOutput> collect = list.stream().filter(organization-> organization.getParentId() == 0).collect(Collectors.toList());
return collect;
}
@XApiAnonymous
@XApiPost
public XListResult<GetBaseLineOutput> getBaseLineList(XContext context, GetBaseLineInput input){
//获取组织机构下的子集
BaseLineMapper mapper = context.getBean(BaseLineMapper.class);
QueryWrapper<BaseLineEnt> queryWrapper = new QueryWrapper<>();
// queryWrapper.lambda().in(BaseLineEnt::getWellOuId , ouIdList);
List<BaseLineEnt> list = mapper.selectList(queryWrapper);
List<GetBaseLineOutput> outputs = XCopyUtils.copyNewList(list , GetBaseLineOutput.class);
return XListResult.success(outputs);
}
/**
* 根据子节点获取最上层节点
* @return
*/
public static String getParentNameStr(List<SysAreaEnt> areaList, SysAreaEnt child){
String parentNameStr = child.getName();
Integer parentId = child.getParentId();
if(parentId == 120){
}else {
SysAreaEnt parent = areaList.stream().filter(item -> item.getId().equals(parentId)).findFirst().orElse(null);
String nameStr = getParentNameStr(areaList, parent);
parentNameStr = nameStr +"/" + parentNameStr;
}
return parentNameStr;
}
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BasePhotovoltaicPlantService.java
View file @ 82e79ac4
......@@ -17,19 +17,13 @@ import pps.core.base.mapper.BasePowerLinePlantMapper;
import pps.core.base.service.data.base_photovoltaic_plant.*;
import pps.core.base.utils.ServiceUtil;
import pps.core.common.constant.BusinessConstant;
import pps.core.common.constant.UserConstant;
import pps.core.common.entity.BaseModel;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseUtils;
import pps.core.system.constant.SysOrganizationCode;
import pps.core.system.entity.SysOrganizationView;
import pps.core.system.mapper.SysOrganizationViewMapper;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XStringUtils;
import xstartup.data.XListResult;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
......@@ -163,13 +157,13 @@ public class BasePhotovoltaicPlantService {
}
GetBasePhotovoltaicPlantOutput output = XCopyUtils.copyNewObject(entity, GetBasePhotovoltaicPlantOutput.class);
//根据组织机构的路径获取
SysOrganizationViewMapper organizationViewMapper = context.getBean(SysOrganizationViewMapper.class);
SysOrganizationView organizationView = new SysOrganizationView();
organizationView.setId(entity.getOuId());
organizationView = organizationViewMapper.selectOrgProvince(organizationView);
if (Objects.nonNull(organizationView)) {
output.setProvince(organizationView.getProvinceName());
}
// SysOrganizationViewMapper organizationViewMapper = context.getBean(SysOrganizationViewMapper.class);
// SysOrganizationView organizationView = new SysOrganizationView();
// organizationView.setId(entity.getOuId());
// organizationView = organizationViewMapper.selectOrgProvince(organizationView);
// if (Objects.nonNull(organizationView)) {
// output.setProvince(organizationView.getProvinceName());
// }
output.setAreaName(Optional.ofNullable(this.getSysAreaInfo(context, GetSysAreaInput.builder()
.id(entity.getAreaCode())
.build()))
......@@ -212,46 +206,46 @@ public class BasePhotovoltaicPlantService {
return XMapperHelper.query(mapper, input, queryWrapper, QueryBasePhotovoltaicPlantOutput.class);
}
@XText("根据父级id查询儿子级(含电站)")
@XApiGet
public XListResult<GetSysOrganizationAndPlantViewOutput> selectOuAndPhotovoltaicPlantInfoByParentOuId(XContext context, GetSysOrganizationAndPlantInput input) {
SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
BasePhotovoltaicPlantMapper plantMapper = context.getBean(BasePhotovoltaicPlantMapper.class);
QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
SysOrganizationView record = new SysOrganizationView();
XCopyUtils.copyObject(input, record);
record.setIsDeleted(SysOrganizationCode.NORMAL);
PpsUserSession session = context.getSession(PpsUserSession.class);
Integer isSuperAdmin = session.getIsSuperAdmin();
List<SysOrganizationView> viewList;
String ouId = "00000000-0000-0000-0000-000000000000";
if (XStringUtils.isEmpty(input.getParentOuId())) {
//如果是超级管理员查所以组织机构
if (UserConstant.ISSUPERADMIN_TRUE.equals(isSuperAdmin)) {
record.setParentOuId("00000000-0000-0000-0000-000000000000");
viewList = mapper.selectOuSonByParentOuId(record);
} else {
ouId = session.getOuId();
record.setId(session.getOuId());
viewList = mapper.selectOuByOuId(record);
}
} else {
ouId = input.getParentOuId();
viewList = mapper.selectOuSonByParentOuId(record);
}
queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE);
List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(queryWrapper);
plantList.forEach(item -> {
SysOrganizationView view = new SysOrganizationView();
view.setId(item.getId());
view.setOuName(item.getStationName());
view.setShortName(item.getStationName());
view.setOuLevel("PHOTOVOLTAIC");
viewList.add(view);
});
List<GetSysOrganizationAndPlantViewOutput> outputs = XCopyUtils.copyNewList(viewList, GetSysOrganizationAndPlantViewOutput.class);
return XListResult.success(outputs);
}
// @XText("根据父级id查询儿子级(含电站)")
// @XApiGet
// public XListResult<GetSysOrganizationAndPlantViewOutput> selectOuAndPhotovoltaicPlantInfoByParentOuId(XContext context, GetSysOrganizationAndPlantInput input) {
// SysOrganizationViewMapper mapper = context.getBean(SysOrganizationViewMapper.class);
// BasePhotovoltaicPlantMapper plantMapper = context.getBean(BasePhotovoltaicPlantMapper.class);
// QueryWrapper<BasePhotovoltaicPlantEnt> queryWrapper = new QueryWrapper<>();
// SysOrganizationView record = new SysOrganizationView();
// XCopyUtils.copyObject(input, record);
// record.setIsDeleted(SysOrganizationCode.NORMAL);
// PpsUserSession session = context.getSession(PpsUserSession.class);
// Integer isSuperAdmin = session.getIsSuperAdmin();
// List<SysOrganizationView> viewList;
// String ouId = "00000000-0000-0000-0000-000000000000";
// if (XStringUtils.isEmpty(input.getParentOuId())) {
// //如果是超级管理员查所以组织机构
// if (UserConstant.ISSUPERADMIN_TRUE.equals(isSuperAdmin)) {
// record.setParentOuId("00000000-0000-0000-0000-000000000000");
// viewList = mapper.selectOuSonByParentOuId(record);
// } else {
// ouId = session.getOuId();
// record.setId(session.getOuId());
// viewList = mapper.selectOuByOuId(record);
// }
// } else {
// ouId = input.getParentOuId();
// viewList = mapper.selectOuSonByParentOuId(record);
// }
// queryWrapper.lambda().eq(BasePhotovoltaicPlantEnt::getOuId, ouId).eq(BasePhotovoltaicPlantEnt::getIsDeleted, BusinessConstant.ONE);
// List<BasePhotovoltaicPlantEnt> plantList = plantMapper.selectList(queryWrapper);
// plantList.forEach(item -> {
// SysOrganizationView view = new SysOrganizationView();
// view.setId(item.getId());
// view.setOuName(item.getStationName());
// view.setShortName(item.getStationName());
// view.setOuLevel("PHOTOVOLTAIC");
// viewList.add(view);
// });
// List<GetSysOrganizationAndPlantViewOutput> outputs = XCopyUtils.copyNewList(viewList, GetSysOrganizationAndPlantViewOutput.class);
// return XListResult.success(outputs);
// }
/*-----------------------------------private-----------------------------------*/
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseProjectInfoService.java deleted 100644 → 0
View file @ d130574d
package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import org.springframework.util.CollectionUtils;
import pps.core.base.entity.BaseLineAttenuationRateEnt;
import pps.core.base.entity.BaseLineAttenuationRateView;
import pps.core.base.entity.BaseProjectInfoEnt;
import pps.core.base.entity.BaseProjectInfoPredictedDataEnt;
import pps.core.base.mapper.*;
import pps.core.base.service.data.base_line_attenuation_rate.CreateBaseLineAttenuationRateInput;
import pps.core.base.service.data.base_project_info.*;
import pps.core.base.utils.HttpUtils;
import pps.core.common.session.PpsUserSession;
import pps.core.system.entity.SysAreaEnt;
import pps.core.system.mapper.SysAreaMapper;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XJsonUtils;
import xstartup.base.util.XStringUtils;
import xstartup.core.base.helper.XThreadHelper;
import xstartup.data.XListResult;
import xstartup.data.XPageResult;
import xstartup.data.XServiceResult;
import xstartup.data.XSingleResult;
import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@XService
public class BaseProjectInfoService {
@XApiAnonymous
@XApiPost
public XServiceResult createProjectInfo(XContext context, CreateBaseProjectInfoInput input){
BaseProjectInfoMapper mapper = context.getBean(BaseProjectInfoMapper.class);
BaseProjectInfoEnt entity = new BaseProjectInfoEnt();
XCopyUtils.copyObject(input, entity);
Date now = new Date();
PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setCreateById(session.getId());
entity.setCreateByName(session.getUserName());
entity.setCreateTime(now);
entity.setIsDeleted(0);
mapper.insert(entity);
List<BaseLineAttenuationRateView> list = new ArrayList<>();
if(!CollectionUtils.isEmpty(input.getList())){
BaseLineAttenuationRateViewMapper rateMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
for(CreateBaseLineAttenuationRateInput rateInput : input.getList()){
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput , BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
ent.setCreateTime(now);
ent.setType(1);
ent.setLineId(entity.getId());
list.add(ent);
}
rateMapper.batchInsert(list);
}
//开始预测
XThreadHelper.async(new Runnable() {
@Override
public void run() {
predictedData(context , entity , list);
}
});
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult updateProjectInfo(XContext context, UpdateBaseProjectInfoInput input){
BaseProjectInfoMapper mapper = context.getBean(BaseProjectInfoMapper.class);
QueryWrapper<BaseProjectInfoEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseProjectInfoEnt::getId, input.getId());
BaseProjectInfoEnt entity = mapper.selectOne(queryWrapper);
if(entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
XCopyUtils.copyObject(input, entity);
Date now = new Date();
PpsUserSession session = context.getSession(PpsUserSession.class);
entity.setModifyById(session.getId());
entity.setModifyByName(session.getUserName());
entity.setModifyTime(now);
entity.setIsDeleted(0);
mapper.updateById(entity);
BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class);
QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>();
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId , entity.getId());
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType , 1);
rateMapper.delete(queryRateWrapper);
List<BaseLineAttenuationRateView> list = new ArrayList<>();
if(!CollectionUtils.isEmpty(input.getList())){
BaseLineAttenuationRateViewMapper rateViewMapper = context.getBean(BaseLineAttenuationRateViewMapper.class);
for(CreateBaseLineAttenuationRateInput rateInput : input.getList()){
BaseLineAttenuationRateView ent = XCopyUtils.copyNewObject(rateInput , BaseLineAttenuationRateView.class);
ent.setCreateById(session.getId());
ent.setCreateByName(session.getUserName());
ent.setCreateTime(now);
ent.setLineId(entity.getId());
ent.setType(1);
list.add(ent);
}
rateViewMapper.batchInsert(list);
}
//开始预测
XThreadHelper.async(new Runnable() {
@Override
public void run() {
predictedData(context , entity , list);
}
});
return XServiceResult.OK;
}
@XApiAnonymous
@XApiPost
public XServiceResult deleteProjectInfo(XContext context, DeleteProjectInfoInput input){
BaseProjectInfoMapper mapper = context.getBean(BaseProjectInfoMapper.class);
QueryWrapper<BaseProjectInfoEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseProjectInfoEnt::getId, input.getId());
BaseProjectInfoEnt entity = mapper.selectOne(queryWrapper);
if(entity == null) {
return XServiceResult.error(context, XError.NotFound);
}
entity.setIsDeleted(1);
mapper.updateById(entity);
return XServiceResult.OK;
}
@XApiAnonymous
@XApiGet
public XSingleResult<GetBaseProjectInfoOutput> getProjectInfo(XContext context, GetProjectInfoInput input){
BaseProjectInfoMapper mapper = context.getBean(BaseProjectInfoMapper.class);
QueryWrapper<BaseProjectInfoEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseProjectInfoEnt::getId, input.getId());
BaseProjectInfoEnt entity = mapper.selectOne(queryWrapper);
if(entity == null) {
return XSingleResult.error(context, XError.NotFound);
}
GetBaseProjectInfoOutput output = new GetBaseProjectInfoOutput();
XCopyUtils.copyObject(entity, output);
if(XStringUtils.isNotEmpty(entity.getProvince()))
output.setProvince(Integer.valueOf(entity.getProvince()));
BaseLineAttenuationRateMapper rateMapper = context.getBean(BaseLineAttenuationRateMapper.class);
QueryWrapper<BaseLineAttenuationRateEnt> queryRateWrapper = new QueryWrapper<>();
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getLineId , entity.getId());
queryRateWrapper.lambda().eq(BaseLineAttenuationRateEnt::getType , 1);
List<BaseLineAttenuationRateEnt> list = rateMapper.selectList(queryRateWrapper);
if(!CollectionUtils.isEmpty(list)){
List<CreateBaseLineAttenuationRateInput> rateInputs = XCopyUtils.copyNewList(list , CreateBaseLineAttenuationRateInput.class);
output.setList(rateInputs);
}
return XSingleResult.success(output);
}
@XApiAnonymous
@XApiGet
public XPageResult<QueryBaseProjectInfoOutput> queryProjectInfoList(XContext context, QueryProjectInfoInput input){
BaseProjectInfoMapper mapper = context.getBean(BaseProjectInfoMapper.class);
QueryWrapper<BaseProjectInfoEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseProjectInfoEnt::getIsDeleted , 0);
if(XStringUtils.isNotEmpty(input.getProjectName()))
queryWrapper.lambda().like(BaseProjectInfoEnt::getProjectName , input.getProjectName());
if(input.getProductionYear() != null)
queryWrapper.lambda().like(BaseProjectInfoEnt::getProductionYear , input.getProductionYear());
List<BaseProjectInfoEnt> list = mapper.selectList(queryWrapper);
PageInfo<BaseProjectInfoEnt> pageInfo = new PageInfo(list);
List<QueryBaseProjectInfoOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), QueryBaseProjectInfoOutput.class);
SysAreaMapper areaMapper = context.getBean(SysAreaMapper.class);
List<SysAreaEnt> areaEntList = areaMapper.selectList(new QueryWrapper<>());
outputs.stream().forEach(item->{
if(XStringUtils.isNotEmpty(item.getProvince())){
SysAreaEnt areaEnt = areaEntList.stream().filter(area->item.getProvince().equals(area.getId()+"")).findFirst().orElse(null);
if(areaEnt != null)
item.setProvince(getParentNameStr(areaEntList ,areaEnt ));
}
});
return XPageResult.success(outputs, input, pageInfo.getTotal());
}
/**
* 根据子节点获取最上层节点
* @return
*/
public static String getParentNameStr(List<SysAreaEnt> areaList, SysAreaEnt child){
String parentNameStr = child.getName();
Integer parentId = child.getParentId();
if(parentId == 120){
}else {
SysAreaEnt parent = areaList.stream().filter(item -> item.getId().equals(parentId)).findFirst().orElse(null);
String nameStr = getParentNameStr(areaList, parent);
parentNameStr = nameStr +"/" + parentNameStr;
}
return parentNameStr;
}
@XApiAnonymous
@XApiGet
public XListResult<GetProjectInfoPredictedDataOutput> queryProjectInfoPredictedDataList(XContext context, GetProjectInfoPredictedDataInput input){
BaseProjectInfoPredictedDataMapper mapper = context.getBean(BaseProjectInfoPredictedDataMapper.class);
QueryWrapper<BaseProjectInfoPredictedDataEnt> queryWrapper = new QueryWrapper<>();
if(input.getProjectId() != null)
queryWrapper.lambda().eq(BaseProjectInfoPredictedDataEnt::getProjectId , input.getProjectId());
List<BaseProjectInfoPredictedDataEnt> list = mapper.selectList(queryWrapper);
PageInfo<BaseProjectInfoPredictedDataEnt> pageInfo = new PageInfo(list);
List<GetProjectInfoPredictedDataOutput> outputs = XCopyUtils.copyNewList(pageInfo.getList(), GetProjectInfoPredictedDataOutput.class);
return XListResult.success(outputs);
}
private void predictedData(XContext context , BaseProjectInfoEnt entity , List<BaseLineAttenuationRateView> list){
CalcProjectInfoPredictedDataInput input = new CalcProjectInfoPredictedDataInput();
input.setLat(entity.getLatitude());
input.setLon(entity.getLongitude());
input.setAngle(entity.getArrayIncidence());
input.setDirection(entity.getArrayToward());
input.setCapacity(entity.getInstallCapacity());
input.setEfficiency(new BigDecimal(0.35).setScale(2 , RoundingMode.HALF_EVEN));
input.setWeather(new BigDecimal(0.7).setScale(2, RoundingMode.HALF_EVEN));
List<BaseLineAttenuationRateView> sortList = list.stream().sorted(Comparator.comparing(BaseLineAttenuationRateView::getSort)).collect(Collectors.toList());
List<BigDecimal> decimals = sortList.stream().map(BaseLineAttenuationRateView::getAttenuationRate).collect(Collectors.toList());
input.setDecline(decimals);
Map<String , Object> map = getPredictedData(context , input);
//插入数据
BaseProjectInfoPredictedDataMapper mapper = context.getBean(BaseProjectInfoPredictedDataMapper.class);
QueryWrapper<BaseProjectInfoPredictedDataEnt> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BaseProjectInfoPredictedDataEnt::getProjectId , entity.getId());
mapper.delete(queryWrapper);
List<Double> powers = (List<Double>)map.get("power");
Integer particularYear = Integer.valueOf(entity.getProductionYear());
PpsUserSession userSession = context.getSession(PpsUserSession.class);
Date date = new Date();
List<BaseProjectInfoPredictedDataEnt> entList = new ArrayList<>();
for(Double decimal : powers){
BaseProjectInfoPredictedDataEnt ent = new BaseProjectInfoPredictedDataEnt();
ent.setProjectId(entity.getId());
ent.setParticularYear(particularYear + "");
ent.setPredictedPower(BigDecimal.valueOf(decimal.doubleValue()));
ent.setCreateById(userSession.getId());
ent.setCreateByName(userSession.getUserName());
ent.setCreateTime(date);
particularYear ++;
entList.add(ent);
}
BaseProjectInfoPredictedDataViewMapper dataViewMapper = context.getBean(BaseProjectInfoPredictedDataViewMapper.class);
dataViewMapper.batchInsert(entList);
}
public Map<String , Object> getPredictedData(XContext context, CalcProjectInfoPredictedDataInput calcProjectInfoPredictedDataInput ){
Map<String , Object> returnMap = new HashMap<>();
try {
String jsonString = XJsonUtils.toJson(calcProjectInfoPredictedDataInput);
context.getLogger().info(jsonString);
Object ret = HttpUtils.send2( "http://121.36.43.217:8098//model/yearmodel",
jsonString);
returnMap = XJsonUtils.toMap(ret.toString());
return returnMap;
}catch (Exception e) {
throw new RuntimeException("调用预测接口失败");
}
}
}
C11-space/pom.xml
View file @ 82e79ac4
......@@ -16,26 +16,5 @@
<module>pps-cloud-space</module>
<module>pps-core-space</module>
</modules>
<repositories>
<repository>
<id>central</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>xstartup-hz</id>
<url>http://dev.sunboxauto.com/HZ/_packaging/xstartup-hz/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>
C11-space/pps-cloud-space/pom.xml
View file @ 82e79ac4
......@@ -23,35 +23,6 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......@@ -73,6 +44,4 @@
</releases>
</repository>
</repositories>
</project>
C11-space/pps-core-space/pom.xml
View file @ 82e79ac4
......@@ -42,40 +42,8 @@
<artifactId>pps-cloud-prediction</artifactId>
<version>1.0.0-pps</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.10.2</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......@@ -97,6 +65,4 @@
</releases>
</repository>
</repositories>
</project>
C11-space/pps-core-space/src/main/java/pps/core/space/module/PpsCoreSpaceModule.java
View file @ 82e79ac4
package pps.core.space.module;
import pps.core.common.utils.ManifestComponentInfoHelper;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.XModule;
......@@ -20,6 +19,5 @@ public class PpsCoreSpaceModule extends XModule {
@Override
protected void onStarted(XContext context) {
ManifestComponentInfoHelper.init(this.getClass().getClassLoader());
}
}
\ No newline at end of file
C12-prediction/pom.xml
View file @ 82e79ac4
......@@ -16,26 +16,5 @@
<module>pps-cloud-prediction</module>
</modules>
<packaging>pom</packaging>
<repositories>
<repository>
<id>central</id>
<name>aliyun maven</name>
<url>https://maven.aliyun.com/repository/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>xstartup-hz</id>
<url>http://dev.sunboxauto.com/HZ/_packaging/xstartup-hz/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
</project>
\ No newline at end of file
C12-prediction/pps-cloud-prediction/pom.xml
View file @ 82e79ac4
......@@ -24,34 +24,6 @@
</dependency>
</dependencies>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......
C12-prediction/pps-core-prediction/pom.xml
View file @ 82e79ac4
......@@ -39,34 +39,6 @@
<version>1.0.0-pps</version>
</dependency>
</dependencies>
<build>
<plugins>
<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.2</version>
<configuration combine.self="override">
<archive>
<manifestEntries>
<Component-Group-Name>${project.groupId}</Component-Group-Name>
<Component-Artifactid>${project.artifactId}</Component-Artifactid>
<Component-Version>${project.version}</Component-Version>
<Component-Build-Time>${maven.build.timestamp}</Component-Build-Time>
<Component-Description>${project.description}</Component-Description>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
......
C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/module/PpsCorePredictionModule.java
View file @ 82e79ac4
package pps.core.prediction.module;
import pps.core.common.utils.ManifestComponentInfoHelper;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.XModule;
......@@ -20,6 +19,5 @@ public class PpsCorePredictionModule extends XModule {
@Override
protected void onStarted(XContext context) {
ManifestComponentInfoHelper.init(this.getClass().getClassLoader());
}
}
\ No newline at end of file
D03-deploy/deploy-pps-all/pom.xml
View file @ 82e79ac4
......@@ -168,7 +168,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
......
D03-deploy/deploy-pps-base/pom.xml
View file @ 82e79ac4
......@@ -21,12 +21,7 @@
<dependencies>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-space</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-dependency-all</artifactId>
<artifactId>pps-core-base</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
......@@ -37,6 +32,15 @@
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-swagger-doc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
......@@ -116,7 +120,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
......
D03-deploy/deploy-pps-base/src/main/java/app/DeployPpsBaseApplication.java
View file @ 82e79ac4
......@@ -8,9 +8,12 @@ import xstartup.boot.XStartupApplication;
import xstartup.feature.api.XApiFeature;
import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature;
import xstartup.feature.cloud.conf.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
/**
* 基础信息配置模块启动程序
......@@ -27,10 +30,17 @@ public class DeployPpsBaseApplication {
.config(new XServiceConf("pps"));
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCloudHuaweiCseFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XSwaggerFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCorsFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-system").addModule("pps", "cloud", "system"),
XCloudBundle.naming("pps-prediction").addModule("pps", "cloud", "prediction"),
XCloudBundle.naming("pps-space").addModule("pps", "cloud", "space")
)
);
startup.run(args);
}
}
D03-deploy/deploy-pps-gateway/pom.xml
View file @ 82e79ac4
......@@ -89,7 +89,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
......
D03-deploy/deploy-pps-gateway/src/main/resources/application.yaml
View file @ 82e79ac4
server:
port: 10079
spring:
cloud:
gateway:
routes:
- id: pps-system
uri: lb://pps-system
filters:
- name: governance
predicates:
- Path=/api/pps/system/**
- id: pps-base
uri: lb://pps-base
filters:
- name: governance
predicates:
- Path=/api/pps/base/**
- id: pps-ukey
uri: lb://pps-interface
filters:
- name: governance
predicates:
- Path=/api/pps/ukey/**
- id: pps-prediction
uri: lb://pps-prediction
filters:
- name: governance
predicates:
- Path=/api/pps/prediction/**
- id: pps-space
uri: lb://pps-space
filters:
- name: governance
predicates:
- Path=/api/pps/space/**
\ No newline at end of file
D03-deploy/deploy-pps-gateway/src/main/resources/deploy-pps-gateway.app.properties
View file @ 82e79ac4
......@@ -12,18 +12,6 @@ x.cache.port=@x.cache.port@
x.cache.auth=@x.cache.auth@
x.cache.db=@x.cache.db@
# datasource
#x.db.sharding=1
#x.db.driver=com.mysql.cj.jdbc.Driver
#x.db.url=jdbc:mysql://81.70.29.235:3306/pps_demo?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
#x.db.user=pps
#x.db.password=_X2csclhj1QIh7OU1ta6iw==
#x.db.naming=snake-case
#x.db.sharding=@x.db.sharding@
#x.db.driver=@x.db.driver@
#x.db.url=@x.db.url@
#x.db.user=@x.db.user@
#x.db.password=@x.db.password@
#x.db.naming=@x.db.naming@
x.db.sharding=@x.db.sharding@
x.db.driver=@x.db.driver@
x.db.url=@x.db.url@
......@@ -31,7 +19,7 @@ x.db.user=@x.db.user@
x.db.password=@x.db.password@
x.db.naming=@x.db.naming@
#cors
x.cors.origin-pattern=*
x.cors.origin-pattern=http://localhost:10079
#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
#\u6CE8\u518C\u7684\u5E94\u7528\u540D\u79F0\uFF08\u975E\u5FAE\u670D\u52A1\u540D\u79F0\uFF0C\u5FAE\u670D\u52A1\u540D\u79F0\u5728\u4EE3\u7801\u91CC\u8BBE\u7F6E\u4E86\uFF09
......
D03-deploy/deploy-pps-prediction/pom.xml
View file @ 82e79ac4
......@@ -25,11 +25,6 @@
<artifactId>pps-core-prediction</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-dependency-all</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
......@@ -38,6 +33,15 @@
<groupId>xstartup-cloud</groupId>
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-swagger-doc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
......@@ -155,7 +159,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
......
D03-deploy/deploy-pps-prediction/src/main/java/app/DeployPpsPredictionApplication.java
View file @ 82e79ac4
......@@ -13,6 +13,7 @@ import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
/**
* 光伏预测模块启动程序
......@@ -29,6 +30,7 @@ public class DeployPpsPredictionApplication {
startup.enable(XApiFeature.class)
.config(new XApiCookieConf("%4bH8s9&", 43200));
startup.enable(XCorsFeature.class);
startup.enable(XSwaggerFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
......
D03-deploy/deploy-pps-space/pom.xml
View file @ 82e79ac4
......@@ -26,11 +26,6 @@
<artifactId>pps-core-space</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-dependency-all</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
......@@ -40,9 +35,13 @@
<artifactId>xstartup-cloud-feature-huawei-cse</artifactId>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-swagger-doc</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
</dependency>
</dependencies>
......@@ -108,44 +107,6 @@
<finalName>${project.artifactId}</finalName>
<plugins>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<configuration>
<target>
<copy todir="../lib" overwrite="true">
<fileset dir="${project.build.directory}/current/lib/"
erroronmissingdir="false">
<include name="*.jar" />
</fileset>
</copy>
&lt;!&ndash;<move file="${project.build.directory}/current/lib/deploy-pps-analysis.jar"
tofile="../lib/deploy-pps-analysis.jar" />&ndash;&gt;
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>clean</id>
<phase>clean</phase>
<configuration>
<target>
<delete file="../lib/deploy-pps-task.jar" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
......@@ -156,7 +117,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
......@@ -191,5 +152,10 @@
<enabled>true</enabled>
</releases>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>
</project>
D03-deploy/deploy-pps-space/src/main/java/app/DeployPpsSpaceApplication.java
View file @ 82e79ac4
package app;
import pps.core.common.utils.CounterBuilder;
import xstartup.base.XStartup;
import xstartup.base.conf.XServerConf;
import xstartup.base.conf.XServiceConf;
......@@ -10,6 +9,7 @@ import xstartup.feature.api.conf.XApiCookieConf;
import xstartup.feature.cloud.XCloudHuaweiCseFeature;
import xstartup.feature.cloud.conf.XCloudBundle;
import xstartup.feature.cloud.conf.XCloudBundlesConf;
import xstartup.feature.cors.XCorsFeature;
import xstartup.feature.mybatis.XMybatisFeature;
import xstartup.feature.rpc.XRpcFeature;
import xstartup.feature.swagger.XSwaggerFeature;
......@@ -22,7 +22,6 @@ import xstartup.feature.swagger.XSwaggerFeature;
*/
public class DeployPpsSpaceApplication {
public static void main(String... args) {
CounterBuilder.globalCounterBuilder.setFieldValue(CounterBuilder.DEPLOY_KEY, DeployPpsSpaceApplication.class.getSimpleName());
XStartup startup = new XStartupApplication("pps");
startup.config(new XServerConf(22061).naming("pps-space"))
.config(new XServiceConf("pps"));
......@@ -31,6 +30,7 @@ public class DeployPpsSpaceApplication {
startup.enable(XSwaggerFeature.class);
startup.enable(XMybatisFeature.class);
startup.enable(XRpcFeature.class);
startup.enable(XCorsFeature.class);
startup.enable(XCloudHuaweiCseFeature.class)
.config(XCloudBundlesConf.with(
XCloudBundle.naming("pps-base").addModule("pps", "cloud", "base"),
......
D03-deploy/deploy-pps-space/src/main/resources/deploy-pps-space.app.properties
View file @ 82e79ac4
......@@ -20,12 +20,6 @@ x.db.url=@x.db.url@
x.db.user=@x.db.user@
x.db.password=@x.db.password@
x.db.naming=@x.db.naming@
x.db.pps.core.system.sharding=@x.db.pps.core.system.sharding@
x.db.pps.core.system.driver=@x.db.pps.core.system.driver@
x.db.pps.core.system.url=@x.db.pps.core.system.url@
x.db.pps.core.system.user=@x.db.pps.core.system.user@
x.db.pps.core.system.password=@x.db.pps.core.system.password@
x.db.pps.core.system.naming=@x.db.pps.core.system.naming@
pps.core.common.trace-log-config.enabletracelog=true
#\u6CE8\u518C\u4E2D\u5FC3\u5730\u5740
x.cloud.discovery.server-addr=@spring.cloud.servicecomb.discovery.address@
......
D03-deploy/deploy-pps-system/pom.xml
View file @ 82e79ac4
......@@ -26,24 +26,8 @@
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-core-base</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId>
<version>${pps.version}</version>
</dependency>
<dependency>
<groupId>gf</groupId>
<artifactId>pps-dependency-all</artifactId>
<version>${pps.version}</version>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</dependency>
<dependency>
<groupId>xstartup-cloud</groupId>
......@@ -53,14 +37,10 @@
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-swagger-doc</artifactId>
</dependency>
<dependency>
<groupId>xstartup</groupId>
<artifactId>xstartup-feature-mybatis</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.23</version>
<version>8.0.33</version>
</dependency>
</dependencies>
......@@ -126,44 +106,6 @@
<finalName>${project.artifactId}</finalName>
<plugins>
<!--<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>install</id>
<phase>install</phase>
<configuration>
<target>
<copy todir="../lib" overwrite="true">
<fileset dir="${project.build.directory}/current/lib/"
erroronmissingdir="false">
<include name="*.jar" />
</fileset>
</copy>
&lt;!&ndash;<move file="${project.build.directory}/current/lib/deploy-pps-analysis.jar"
tofile="../lib/deploy-pps-analysis.jar" />&ndash;&gt;
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>clean</id>
<phase>clean</phase>
<configuration>
<target>
<delete file="../lib/deploy-pps-system.jar" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>-->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
......@@ -177,7 +119,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
......
D03-deploy/deploy-pps-task/pom.xml
View file @ 82e79ac4
......@@ -156,7 +156,7 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>${main.class}</mainClass>
<mainClass>${project.mainClass}</mainClass>
</configuration>
</execution>
</executions>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment