Commit 4ab279c2 authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 16ef1b4a
...@@ -20,7 +20,4 @@ public class GetConfigOilFieldOutput { ...@@ -20,7 +20,4 @@ public class GetConfigOilFieldOutput {
@XText("首页路由") @XText("首页路由")
private String homePagePath; private String homePagePath;
@XText("接口任务是否启用(1_否,0_是)")
private Integer apiTaskIsEnable;
} }
...@@ -38,8 +38,4 @@ public class ConfigOilFieldEnt implements Serializable { ...@@ -38,8 +38,4 @@ public class ConfigOilFieldEnt implements Serializable {
@XText("首页路由") @XText("首页路由")
@TableField @TableField
private String homePagePath; private String homePagePath;
@XText("接口任务是否启用(1_否,0_是)")
@TableField
private Integer apiTaskIsEnable;
} }
\ No newline at end of file
...@@ -33,8 +33,4 @@ public class ConfigOilFieldView implements Serializable { ...@@ -33,8 +33,4 @@ public class ConfigOilFieldView implements Serializable {
@XText("首页路由") @XText("首页路由")
@TableField @TableField
private String homePagePath; private String homePagePath;
}
@XText("接口任务是否启用(1_否,0_是)") \ No newline at end of file
@TableField
private Integer apiTaskIsEnable;
}
...@@ -20,7 +20,4 @@ public class GetConfigOilFieldOutput { ...@@ -20,7 +20,4 @@ public class GetConfigOilFieldOutput {
@XText("首页路由") @XText("首页路由")
private String homePagePath; private String homePagePath;
@XText("接口任务是否启用(1_否,0_是)")
private Integer apiTaskIsEnable;
} }
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<result column="oil_field_name" property="oilFieldName" jdbcType="VARCHAR" /> <result column="oil_field_name" property="oilFieldName" jdbcType="VARCHAR" />
<result column="oil_field_code" property="oilFieldCode" jdbcType="VARCHAR" /> <result column="oil_field_code" property="oilFieldCode" jdbcType="VARCHAR" />
<result column="home_page_path" property="homePagePath" jdbcType="VARCHAR" /> <result column="home_page_path" property="homePagePath" jdbcType="VARCHAR" />
<result column="api_task_is_enable" property="apiTaskIsEnable" jdbcType="TINYINT" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id id
...@@ -15,8 +14,7 @@ ...@@ -15,8 +14,7 @@
is_enable, is_enable,
oil_field_name, oil_field_name,
oil_field_code, oil_field_code,
home_page_path, home_page_path
api_task_is_enable
</sql> </sql>
<select id="selectOne" parameterType="pps.core.base.entity.ConfigOilFieldView" resultMap="BaseResultMap"> <select id="selectOne" parameterType="pps.core.base.entity.ConfigOilFieldView" resultMap="BaseResultMap">
select select
......
...@@ -71,4 +71,4 @@ public class PpsCoreTaskModule extends XModule { ...@@ -71,4 +71,4 @@ public class PpsCoreTaskModule extends XModule {
}); });
} }
} }
} }
\ No newline at end of file
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