Commit c60cad8c authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.新建油田配置表同时生成相关代码及mapper文件,修改部分第三方数据抽取定时任务,增加针对不同井场开关控制逻辑,同时修改首页页面展示逻辑,通过油田配置功能区分不同首页展示功能;
2.新建定时任务配置表同时生成相关代码及mapper文件,定时任务模块增加mybatis配置,用以操作数据库,修改部分第三方数据抽取定时任务,修改使用方式使其脱离框架方便动态控制;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e23c5aa5
......@@ -201,12 +201,12 @@ public class BusinessConstant {
/**
* 日期标志
*/
public static final DateTime DATE_FLAG = DateUtil.parse("1970-01-02 00:00:00", "yyyy-MM-dd HH:mm:ss");
public static final DateTime DATE_FLAG = DateUtil.parse("1970-01-02 00:00:00", DATE_FORMAT_ALL);
/**
* 日期标志开始
*/
public static final DateTime DATE_FLAG_BEGIN = DateUtil.parse("1970-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
public static final DateTime DATE_FLAG_BEGIN = DateUtil.parse("1970-01-01 00:00:00", DATE_FORMAT_ALL);
/*------------------------------字典------------------------------*/
......
......@@ -342,7 +342,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
.dayTime(this.zeroFill(date.dayOfMonth()))
.hourTime(this.zeroFill(date.hour(true)))
.minTime(this.zeroFill(date.minute()))
.dataDate(date.toString("yyyy-MM-dd HH:mm:ss"))
.dataDate(date.toString(BusinessConstant.DATE_FORMAT_ALL))
.temperature(thirdWeatherDataView.getTem())
.windSpeed(thirdWeatherDataView.getWns100m())
.windDirection(new BigDecimal(thirdWeatherDataView.getWnd()))
......
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