Commit 3ea1fd4e authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 6c0fb58d
...@@ -22,19 +22,16 @@ ...@@ -22,19 +22,16 @@
<artifactId>pps-common</artifactId> <artifactId>pps-common</artifactId>
<version>1.0.0-pps</version> <version>1.0.0-pps</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>gf</groupId> <groupId>gf</groupId>
<artifactId>pps-cloud-base</artifactId> <artifactId>pps-cloud-base</artifactId>
<version>1.0.0-pps</version> <version>1.0.0-pps</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>gf</groupId> <groupId>gf</groupId>
<artifactId>pps-cloud-system</artifactId> <artifactId>pps-cloud-system</artifactId>
<version>1.0.0-pps</version> <version>1.0.0-pps</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>gf</groupId> <groupId>gf</groupId>
<artifactId>pps-cloud-space</artifactId> <artifactId>pps-cloud-space</artifactId>
...@@ -45,15 +42,11 @@ ...@@ -45,15 +42,11 @@
<artifactId>pps-cloud-prediction</artifactId> <artifactId>pps-cloud-prediction</artifactId>
<version>1.0.0-pps</version> <version>1.0.0-pps</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt-api</artifactId>
<version>0.9.1</version> <version>0.12.6</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.70</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -73,6 +73,4 @@ ...@@ -73,6 +73,4 @@
</releases> </releases>
</repository> </repository>
</repositories> </repositories>
</project> </project>
\ No newline at end of file
...@@ -39,12 +39,6 @@ ...@@ -39,12 +39,6 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </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 --> <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-mail -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
package pps.core.base.service; package pps.core.base.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
......
package pps.core.base.service; package pps.core.base.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
......
...@@ -8,9 +8,9 @@ import cn.hutool.core.io.IoUtil; ...@@ -8,9 +8,9 @@ import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.NioUtil; import cn.hutool.core.io.NioUtil;
import cn.hutool.core.io.file.FileReader; import cn.hutool.core.io.file.FileReader;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import pps.cloud.base.service.IBaseWeatherCloudService; import pps.cloud.base.service.IBaseWeatherCloudService;
......
package pps.core.base.service.data.third_weather_data; package pps.core.base.service.data.third_weather_data;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
......
...@@ -2,7 +2,7 @@ package pps.core.base.service.data.third_weather_data; ...@@ -2,7 +2,7 @@ package pps.core.base.service.data.third_weather_data;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson2.annotation.JSONField;
import lombok.Data; import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
......
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