|
@@ -1310,7 +1310,6 @@ public class RyTask
|
|
tXinyiForecastComparison.setHsForecastOne(new BigDecimal(split[0]));
|
|
tXinyiForecastComparison.setHsForecastOne(new BigDecimal(split[0]));
|
|
tXinyiForecastComparison.setHsForecastTwo(new BigDecimal(split[1]));
|
|
tXinyiForecastComparison.setHsForecastTwo(new BigDecimal(split[1]));
|
|
tXinyiForecastComparison.setHsForecastThree(new BigDecimal(split[2]));
|
|
tXinyiForecastComparison.setHsForecastThree(new BigDecimal(split[2]));
|
|
- this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
|
|
|
|
//获取配置表
|
|
//获取配置表
|
|
List<TXinyiNormConfig> tXinyiNormConfigs = this.xinyiNormConfigMapper.selectTXinyiNormConfigList(null);
|
|
List<TXinyiNormConfig> tXinyiNormConfigs = this.xinyiNormConfigMapper.selectTXinyiNormConfigList(null);
|
|
if(CollectionUtils.isEmpty(tXinyiNormConfigs)) {
|
|
if(CollectionUtils.isEmpty(tXinyiNormConfigs)) {
|
|
@@ -1322,6 +1321,19 @@ public class RyTask
|
|
TXinyiIndustry tXinyiIndustry = this.xinyiIndustryMapper.selectTXinyiIndustryNewest();
|
|
TXinyiIndustry tXinyiIndustry = this.xinyiIndustryMapper.selectTXinyiIndustryNewest();
|
|
List<ChartBasic> chartsDataList = new ArrayList<>(9);
|
|
List<ChartBasic> chartsDataList = new ArrayList<>(9);
|
|
if("cod".equals(task)){
|
|
if("cod".equals(task)){
|
|
|
|
+ //同时调用跃渊的预测接口 保存记录值
|
|
|
|
+ try {
|
|
|
|
+ String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=2&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH));
|
|
|
|
+ if(!StringUtils.isBlank(result)){
|
|
|
|
+ JSONArray array = JSON.parseArray(result);
|
|
|
|
+ tXinyiForecastComparison.setYyForecastOne(array.getBigDecimal(6));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastTwo(array.getBigDecimal(7));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastThree(array.getBigDecimal(8));
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("调用跃渊的预测接口出现异常,异常信息为{}", e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
|
|
BigDecimal cscodBzz = normConfig.getCscodBzz();
|
|
BigDecimal cscodBzz = normConfig.getCscodBzz();
|
|
BigDecimal cscodGkz = normConfig.getCscodGkz();
|
|
BigDecimal cscodGkz = normConfig.getCscodGkz();
|
|
//处理展示数据
|
|
//处理展示数据
|
|
@@ -1341,6 +1353,19 @@ public class RyTask
|
|
}
|
|
}
|
|
handleXinYiWarningsYC(cscodBzz, split, cscodGkz, BusinessEnum.WarningCategoryEnum.CS_COD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
handleXinYiWarningsYC(cscodBzz, split, cscodGkz, BusinessEnum.WarningCategoryEnum.CS_COD_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
}else if("ss".equals(task)){
|
|
}else if("ss".equals(task)){
|
|
|
|
+ //同时调用跃渊的预测接口 保存记录值
|
|
|
|
+ try {
|
|
|
|
+ String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=5&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH));
|
|
|
|
+ if(!StringUtils.isBlank(result)){
|
|
|
|
+ JSONArray array = JSON.parseArray(result);
|
|
|
|
+ tXinyiForecastComparison.setYyForecastOne(array.getBigDecimal(6));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastTwo(array.getBigDecimal(7));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastThree(array.getBigDecimal(8));
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("调用跃渊的预测接口出现异常,异常信息为{}", e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
|
|
BigDecimal csSSBzz = normConfig.getCsssBzz();
|
|
BigDecimal csSSBzz = normConfig.getCsssBzz();
|
|
BigDecimal csssGkz = normConfig.getCsssGkz();
|
|
BigDecimal csssGkz = normConfig.getCsssGkz();
|
|
//处理展示数据
|
|
//处理展示数据
|
|
@@ -1360,6 +1385,19 @@ public class RyTask
|
|
}
|
|
}
|
|
handleXinYiWarningsYC(csSSBzz, split, csssGkz, BusinessEnum.WarningCategoryEnum.CS_SS_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
handleXinYiWarningsYC(csSSBzz, split, csssGkz, BusinessEnum.WarningCategoryEnum.CS_SS_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
}else if("tn".equals(task)){
|
|
}else if("tn".equals(task)){
|
|
|
|
+ //同时调用跃渊的预测接口 保存记录值
|
|
|
|
+ try {
|
|
|
|
+ String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=3&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH));
|
|
|
|
+ if(!StringUtils.isBlank(result)){
|
|
|
|
+ JSONArray array = JSON.parseArray(result);
|
|
|
|
+ tXinyiForecastComparison.setYyForecastOne(array.getBigDecimal(6));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastTwo(array.getBigDecimal(7));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastThree(array.getBigDecimal(8));
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("调用跃渊的预测接口出现异常,异常信息为{}", e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
|
|
BigDecimal cszzBzz = normConfig.getCszzBzz();
|
|
BigDecimal cszzBzz = normConfig.getCszzBzz();
|
|
BigDecimal cszzGkz = normConfig.getCszzGkz();
|
|
BigDecimal cszzGkz = normConfig.getCszzGkz();
|
|
//处理展示数据
|
|
//处理展示数据
|
|
@@ -1379,6 +1417,19 @@ public class RyTask
|
|
}
|
|
}
|
|
handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.CS_TN_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
handleXinYiWarningsYC(cszzBzz, split, cszzGkz, BusinessEnum.WarningCategoryEnum.CS_TN_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
}else if("tp".equals(task)){
|
|
}else if("tp".equals(task)){
|
|
|
|
+ //同时调用跃渊的预测接口 保存记录值
|
|
|
|
+ try {
|
|
|
|
+ String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=1&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH));
|
|
|
|
+ if(!StringUtils.isBlank(result)){
|
|
|
|
+ JSONArray array = JSON.parseArray(result);
|
|
|
|
+ tXinyiForecastComparison.setYyForecastOne(array.getBigDecimal(6));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastTwo(array.getBigDecimal(7));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastThree(array.getBigDecimal(8));
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("调用跃渊的预测接口出现异常,异常信息为{}", e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
|
|
BigDecimal cszlBzz = normConfig.getCszlBzz();
|
|
BigDecimal cszlBzz = normConfig.getCszlBzz();
|
|
BigDecimal cszlGkz = normConfig.getCszlGkz();
|
|
BigDecimal cszlGkz = normConfig.getCszlGkz();
|
|
//处理展示数据
|
|
//处理展示数据
|
|
@@ -1398,6 +1449,19 @@ public class RyTask
|
|
}
|
|
}
|
|
handleXinYiWarningsYC(cszlBzz, split, cszlGkz, BusinessEnum.WarningCategoryEnum.CS_TP_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
handleXinYiWarningsYC(cszlBzz, split, cszlGkz, BusinessEnum.WarningCategoryEnum.CS_TP_YC.getCode(), hour, normConfig,tXinyiIndustry.getCsCod(), tXinyiIndustry, chartsDataList, date);
|
|
}else if("nh3".equals(task)){
|
|
}else if("nh3".equals(task)){
|
|
|
|
+ //同时调用跃渊的预测接口 保存记录值
|
|
|
|
+ try {
|
|
|
|
+ String result = HttpUtil.get("http://10.0.3.52:10003/system/forecast?type=4&time=" + DateUtil.format(DateUtils.getNowDate(), DateUtils.YYYY_MM_DD_HH));
|
|
|
|
+ if(!StringUtils.isBlank(result)){
|
|
|
|
+ JSONArray array = JSON.parseArray(result);
|
|
|
|
+ tXinyiForecastComparison.setYyForecastOne(array.getBigDecimal(6));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastTwo(array.getBigDecimal(7));
|
|
|
|
+ tXinyiForecastComparison.setYyForecastThree(array.getBigDecimal(8));
|
|
|
|
+ }
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ log.error("调用跃渊的预测接口出现异常,异常信息为{}", e.getMessage());
|
|
|
|
+ }
|
|
|
|
+ this.xinyiForecastComparisonService.insertTXinyiForecastComparison(tXinyiForecastComparison);
|
|
BigDecimal csadBzz = normConfig.getCsadBzz();
|
|
BigDecimal csadBzz = normConfig.getCsadBzz();
|
|
BigDecimal csadGkz = normConfig.getCsadGkz();
|
|
BigDecimal csadGkz = normConfig.getCsadGkz();
|
|
//处理展示数据
|
|
//处理展示数据
|