Skip to content

G
gf_back
Commit b66a2233 authored by tianchao's avatar tianchao
Browse files
Options

1.年预测

parent ca4b85cb
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 28 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/mapper/BaseProjectInfoPredictedDataViewMapper.java 0 → 100644
View file @ b66a2233
package pps.core.base.mapper;
import org.springframework.stereotype.Repository;
import pps.core.base.entity.BaseLineAttenuationRateView;
import pps.core.base.entity.BaseProjectInfoPredictedDataEnt;
import java.util.List;
@Repository(value="pps.core.base.mapper.BaseProjectInfoPredictedDataViewMapper")
public interface BaseProjectInfoPredictedDataViewMapper {
void batchInsert(List<BaseProjectInfoPredictedDataEnt> dataList);
}
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseDataService.java
View file @ b66a2233
package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sun.org.apache.xpath.internal.objects.XString;
import org.springframework.util.CollectionUtils;
import pps.cloud.base.service.BaseBasePipelineService;
import pps.cloud.base.service.BaseBaseStationService;
import pps.cloud.base.service.data.BaseOuIdInput;
import pps.cloud.base.service.data.QueryBaseStationOutput;
import pps.cloud.base.service.data.base_pipeline.SelectPipelineByOperatorOutput;
import pps.cloud.system.service.SysOrganizationCloudService;
import pps.cloud.system.service.data.GetSysOrganizationViewOutput;
import pps.core.base.entity.BaseDataEnt;
import pps.core.base.entity.BaseDataView;
import pps.core.base.enums.ImportFieldDic;
......@@ -20,12 +9,9 @@ import pps.core.base.mapper.BaseDataViewMapper;
import pps.core.base.service.data.base_data.*;
import pps.core.base.service.data.base_line.ImportFileInput;
import pps.core.base.utils.HttpUtils;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.ExcelTemplateUtils;
import pps.core.common.utils.ExcelUtils;
import pps.core.common.utils.ExportExcelUtils;
import pps.core.common.utils.MapUtil;
import pps.core.system.entity.SysAreaEnt;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
......
C09-base/pps-core-base/src/main/java/pps/core/base/service/BaseProjectInfoService.java
View file @ b66a2233
......@@ -2,16 +2,9 @@ package pps.core.base.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import pps.cloud.system.service.SystemAreaService;
import pps.cloud.system.service.SystemDictionaryService;
import pps.cloud.system.service.data.QuerySysDictionaryViewInput;
import pps.cloud.system.service.data.QuerySysDictionaryViewOutput;
import pps.core.base.entity.*;
import pps.core.base.mapper.*;
import pps.core.base.service.data.base_data.CalcBaseDataInput;
import pps.core.base.service.data.base_line.*;
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;
......@@ -20,9 +13,7 @@ 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.XDateUtils;
import xstartup.base.util.XJsonUtils;
import xstartup.base.util.XStringUtils;
import xstartup.core.base.helper.XThreadHelper;
......@@ -34,9 +25,9 @@ import xstartup.error.XError;
import xstartup.feature.api.annotation.XApiAnonymous;
import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
......@@ -229,8 +220,8 @@ public class BaseProjectInfoService {
input.setAngle(entity.getArrayIncidence());
input.setDirection(entity.getArrayToward());
input.setCapacity(entity.getInstallCapacity());
input.setEfficiency(new BigDecimal(0.35));
input.setWeather(new BigDecimal(0.7));
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);
......@@ -242,14 +233,22 @@ public class BaseProjectInfoService {
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 ++;
mapper.insert(ent);
entList.add(ent);
}
BaseProjectInfoPredictedDataViewMapper dataViewMapper = context.getBean(BaseProjectInfoPredictedDataViewMapper.class);
dataViewMapper.batchInsert(entList);
}
public Map<String , Object> getPredictedData(XContext context, CalcProjectInfoPredictedDataInput calcProjectInfoPredictedDataInput ){
......@@ -257,7 +256,7 @@ public class BaseProjectInfoService {
try {
String jsonString = XJsonUtils.toJson(calcProjectInfoPredictedDataInput);
context.getLogger().info(jsonString);
Object ret = HttpUtils.send2("http://121.36.43.217:8098/model/yearmodel",
Object ret = HttpUtils.send2( "http://121.36.43.217:8098//model/yearmodel",
jsonString);
returnMap = XJsonUtils.toMap(ret.toString());
return returnMap;
......
C09-base/pps-core-base/src/main/resources/mybatis/mapper/pps/core/base/BaseProjectInfoPredictedDataViewMapper.xml 0 → 100644
View file @ b66a2233
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pps.core.base.mapper.BaseProjectInfoPredictedDataViewMapper">
<insert id="batchInsert">
insert into base_project_info_predicted_data(
project_id,
particular_year,
predicted_power,
create_by_id,
create_by_name,
create_time
) VALUES
<foreach collection ="list" item="item" separator =",">
(
#{item.projectId},
#{item.particularYear},
#{item.predictedPower},
#{item.createById},
#{item.createByName},
#{item.createTime}
)
</foreach>
</insert>
</mapper>
D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties
View file @ b66a2233
......@@ -38,6 +38,8 @@ pps.core.common.mq-config.newToOldFormMqSwitch=@pps.core.common.mq-config.newToO
pps.core.transfer.transfer-config.oldPPSAddress=@pps.core.transfer.transfer-config.oldPPSAddress@
pps.core.task.task-config.ackImsUrl=@pps.core.task.task-config.ackImsUrl@
pps.core.common.base-config.predictedUrl=@pps.core.common.base-config.predictedUrl@
#x.job.service=pps.core.task.job.TaskPlanTransferJob,pps.core.task.job.TaskPlanImsJob,pps.core.task.job.TaskPlanAckImsJob
......
D03-deploy/filters/filter-dev.properties
View file @ b66a2233
......@@ -43,6 +43,8 @@ pps.core.system.login-config.userRsaPublicKey=t1vlR1n_TeraMrene4m4b7vz2yWEyKby73
pps.core.system.login-config.adminRoles=638dc709-7b21-4139-bf27-56ac9390168b
pps.core.system.login-config.iamToLoginUrl=http://10.21.140.150/
pps.core.common.base-config.predictedUrl=http://121.36.43.217:8098/
pps.core.system.login-config.ukeyUrl=https://mfstest-iam.pipechina.com.cn/verify_signature
pps.core.system.login-config.appid=mEvc
......
D03-deploy/filters/filter-prod.properties
View file @ b66a2233
......@@ -42,6 +42,8 @@ pps.core.common.mq-config.newToOldFormMqSwitch=1
pps.core.task.task-config.ackImsUrl=https://ims.pipechina.com.cn/api/maintenance/weekPlan/updatePPS
pps.core.common.mq-config.ackImsMq=pps_ack_ims
pps.core.common.base-config.predictedUrl=http://121.36.43.217:8098/
pps.core.measure.si-config.siUrl=http://10.20.89.57/interface/
#pps.core.measure.si-config.siUrl=http://10.20.89.75/interface/pdf/InsertSIFile
......
D03-deploy/filters/filter-test.properties
View file @ b66a2233
......@@ -45,6 +45,8 @@ pps.core.system.login-config.iamToLoginUrl=http://10.21.140.25/
pps.core.transfer.transfer-config.oldPPSAddress=http://10.20.89.75
pps.core.task.task-config.ackImsUrl=https://test-ims.pipechina.com.cn/api/maintenance/weekPlan/updatePPS
pps.core.common.base-config.predictedUrl=http://121.36.43.217:8098/
pps.core.primbpm.bps-config.bpsAddress=http://10.37.19.112:48084
pps.core.primbpm.bps-config.bpsVirtualAddress=http://10.37.19.7:8762
pps.core.primbpm.bps-config.bpsGraphAddress=http://10.37.19.173
......
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