Skip to content

Z
zjsgfa_mysql
Commit 22c2b8d1 by jiang'yun
Options

修改

parent fad77451
Showing with 38 additions and 36 deletions
src/main/java/com/zjsgfa/project/zjsgfa/service/impl/SjFdsgcsServiceImpl.java
......@@ -327,7 +327,8 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String json = gson.toJson(map);
//调用httpsPost请求获取数据
String url = "https://10.68.249.59:12001/api/ljzjymd";
// String url = "https://10.68.249.59:12001/api/ljzjymd";
String url = "http://10.68.202.238:12001/api/ljzjymd";
System.out.println(json);
String result = HttpRequest.post(url).body(json).execute().body();
System.out.println(result);
......@@ -432,27 +433,27 @@ public class SjFdsgcsServiceImpl implements ISjFdsgcsService
List<SjFdsgcsDcylZjymdtjb> collect4 = zjymdtjbList.stream().filter(zjymdtjb ->kc.equals(zjymdtjb.getKc()) ).collect(Collectors.toList());
String dcyl="";
if(kc.equals("一开")){
dcyl="<p>基于邻井相关数据：<br>经分析，根据邻井钻井液密度分析出的压力情况如下。</p><p>邻井梁217-斜40：东营组 密度范围为1.09-1.1，取样垂深在359.49-2028.6。</p><p>邻井梁217-斜29：东营组密度范围为1.08-1.09，取样垂深在358.76-1554.51。</p>";
}else {
dcyl="<p>基于邻井相关数据：<br>经分析，根据邻井钻井液密度分析出的压力情况如下。</p><p>邻井梁217-斜40：沙二段 密度范围为1.21，取样垂深在2286.02-2419.18。</p><p>沙三上 密度范围为1.21，取样垂深在2601.96-2601.96。</p><p>沙三下 密度范围为1.25-1.26，取样垂深在2764.7-2869.13。</p><p>沙四上 密度范围为1.32，取样垂深在3024.55-3162.2。</p><p>沙四下 密度范围为1.35，取样垂深在3273.57-3273.57。</p><p>邻井梁217-斜29：沙二段 密度范围为1.1-1.18，取样垂深在2151.5-2366.04。</p><p>沙三下 密度范围为1.21-1.26，取样垂深在2705.32-2868.43。</p><p>沙四上 密度范围为1.35，取样垂深在3090.77-3090.77。</p><p>沙四下 密度范围为1.35，取样垂深在3253.37-3253.37。</p>";
}
// if(collect4.size()>0){
// List<String> dcylList=new ArrayList<>();
// dcylList.add("经分析，根据邻井钻井液密度分析出的压力情况如下。：<br/>");
// Map<String, List<SjFdsgcsDcylZjymdtjb>> collect3 = collect4.stream().collect(Collectors.groupingBy(SjFdsgcsDcylZjymdtjb::getLjjh));
// for(String key:collect3.keySet()){
// String aa="邻井"+key+"：" ;
// dcylList.add(aa);
// List<SjFdsgcsDcylZjymdtjb> zjymdtjbList1 = collect3.get(key);
// zjymdtjbList1.forEach(zjymdtjb -> {
// String bb=zjymdtjb.getCw()+" 密度范围为"+zjymdtjb.getMdMin()+"-"+zjymdtjb.getMdMax()+"，取样垂深在"+zjymdtjb.getQycsMin()+"-"+zjymdtjb.getQycsMax()+"。<br/>";
// dcylList.add(bb);
// });
// }
//
// dcyl= String.join(" ",dcylList);
// if(kc.equals("一开")){
// dcyl="<p>基于邻井相关数据：<br>经分析，根据邻井钻井液密度分析出的压力情况如下。</p><p>邻井梁217-斜40：东营组 密度范围为1.09-1.1，取样垂深在359.49-2028.6。</p><p>邻井梁217-斜29：东营组密度范围为1.08-1.09，取样垂深在358.76-1554.51。</p>";
// }else {
// dcyl="<p>基于邻井相关数据：<br>经分析，根据邻井钻井液密度分析出的压力情况如下。</p><p>邻井梁217-斜40：沙二段 密度范围为1.21，取样垂深在2286.02-2419.18。</p><p>沙三上 密度范围为1.21，取样垂深在2601.96-2601.96。</p><p>沙三下 密度范围为1.25-1.26，取样垂深在2764.7-2869.13。</p><p>沙四上 密度范围为1.32，取样垂深在3024.55-3162.2。</p><p>沙四下 密度范围为1.35，取样垂深在3273.57-3273.57。</p><p>邻井梁217-斜29：沙二段 密度范围为1.1-1.18，取样垂深在2151.5-2366.04。</p><p>沙三下 密度范围为1.21-1.26，取样垂深在2705.32-2868.43。</p><p>沙四上 密度范围为1.35，取样垂深在3090.77-3090.77。</p><p>沙四下 密度范围为1.35，取样垂深在3253.37-3253.37。</p>";
// }
if(collect4.size()>0){
List<String> dcylList=new ArrayList<>();
dcylList.add("经分析，根据邻井钻井液密度分析出的压力情况如下。：<br/>");
Map<String, List<SjFdsgcsDcylZjymdtjb>> collect3 = collect4.stream().collect(Collectors.groupingBy(SjFdsgcsDcylZjymdtjb::getLjjh));
for(String key:collect3.keySet()){
String aa="邻井"+key+"：" ;
dcylList.add(aa);
List<SjFdsgcsDcylZjymdtjb> zjymdtjbList1 = collect3.get(key);
zjymdtjbList1.forEach(zjymdtjb -> {
String bb=zjymdtjb.getCw()+" 密度范围为"+zjymdtjb.getMdMin()+"-"+zjymdtjb.getMdMax()+"，取样垂深在"+zjymdtjb.getQycsMin()+"-"+zjymdtjb.getQycsMax()+"。<br/>";
dcylList.add(bb);
});
}
dcyl= String.join(" ",dcylList);
}
......
src/main/resources/application-druid.yml
......@@ -6,10 +6,11 @@ spring:
druid:
# 主库数据源
master:
# url: jdbc:mysql://192.168.31.167:3306/zjsgfa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
url: jdbc:mysql://192.168.31.167:3306/zjsgfa-fwq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
url: jdbc:mysql://192.168.31.167:3306/zjsgfa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
# url: jdbc:mysql://192.168.31.167:3306/zjsgfa-fwq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
username: root
password: qianhe2024
# url: jdbc:mysql://127.0.0.1:3306/zjsgfa_fwq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
# url: jdbc:mysql://127.0.0.1:3306/zjsgfa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
# username: root
# password: sql2025
......@@ -19,10 +20,10 @@ spring:
enabled: true
driverClassName: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.31.167:1521/qianhe
# username: HHZJJS
# password: HHZJJS
username: DISUSER1
password: dis#2022
username: HHZJJS
password: HHZJJS
# username: DISUSER1
# password: dis#2022
# slave:
# # 从数据源开关/默认关闭
# enabled: true
......
src/main/resources/application.yml
......@@ -74,14 +74,14 @@ spring:
# 数据库索引
database: 6
# 密码
host: 182.92.202.17
port: 7789
# 密码
password: qianheRedis2021
# host: 192.168.31.167
## 端口，默认为6379
# port: 6379
# password: qianhe2024
# host: 182.92.202.17
# port: 7789
# # 密码
# password: qianheRedis2021
host: 192.168.31.167
# 端口，默认为6379
port: 6379
password: qianhe2024
# host: 127.0.0.1
# port: 7789
# # # 密码
......@@ -106,7 +106,7 @@ token:
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 30
expireTime: 300
# MyBatis配置
mybatis:
......
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