liwenxuan
/
data-upload
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.日志优化 

2.风险事件新增三个字段
master
liwenxuan 9 months ago
parent
dc777aea2b
commit
7f1597901d
9 changed files with 165 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java
  2. 22
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java
  3. 22
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java
  4. 23
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java
  5. 22
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
  6. 35
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
  7. 36
      src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java
  8. 27
      src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Fxsj.java
  9. 3
      src/main/resources/mapper/FxfxdxMapper.xml

23
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java
View File

@ -91,14 +91,27 @@ public class FxfxdxJobHandler {
String post = null; String post = null;
try { try {
post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "avRdnP4OxPigMalwzipa9F643CF443BE2F93"); post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "avRdnP4OxPigMalwzipa9F643CF443BE2F93");
success++; JSONObject postJsonObj = JSONObject.parseObject(post);
//System.out.println("post:"+post.toString()); if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
//XxlJobHelper.log("执行日志:"+company+post.toString()); //成功
System.out.println("成功"+(i+1)+",");
//System.out.println(jsonObject);
//System.out.println("post:" + post.toString());
//XxlJobHelper.log("执行日志:" + company + post.toString());
success++;
}else{
System.out.println("成功"+(i+1)+",");
System.out.println("post:" + post.toString());
XxlJobHelper.log("执行日志:" + company + post.toString()+jsonObject);
fail++;
}
} catch (IOException e) { } catch (IOException e) {
fail++; fail++;
e.printStackTrace(); e.printStackTrace();
XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); System.out.println(jsonObject);
XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject);
} }
break; break;
//System.out.println("post:"+post1.toString()); //System.out.println("post:"+post1.toString());

22
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java
View File

@ -89,13 +89,27 @@ public class FxfxdyJobHandler {
String post = null; String post = null;
try { try {
post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "RZdFEDt03BmZvGwkuL6KAE15B7F9249CFBE9"); post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "RZdFEDt03BmZvGwkuL6KAE15B7F9249CFBE9");
success++; JSONObject postJsonObj = JSONObject.parseObject(post);
//System.out.println("post:"+post.toString()); if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
//XxlJobHelper.log("执行日志:"+company+post.toString()); //成功
System.out.println("成功"+(i+1)+",");
//System.out.println(jsonObject);
//System.out.println("post:" + post.toString());
//XxlJobHelper.log("执行日志:" + company + post.toString());
success++;
}else{
System.out.println("成功"+(i+1)+",");
System.out.println("post:" + post.toString());
XxlJobHelper.log("执行日志:" + company + post.toString()+jsonObject);
fail++;
}
} catch (IOException e) { } catch (IOException e) {
fail++; fail++;
e.printStackTrace(); e.printStackTrace();
XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); System.out.println(jsonObject);
XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject);
} }
break; break;
//System.out.println("post:"+post1.toString()); //System.out.println("post:"+post1.toString());

22
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java
View File

@ -48,13 +48,27 @@ public class FxgkcsJobHandler {
String post = null; String post = null;
try { try {
post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "7CTkAyBoL26Jo7ZMNVmg0EA57A0791FD71AB"); post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "7CTkAyBoL26Jo7ZMNVmg0EA57A0791FD71AB");
success++; JSONObject postJsonObj = JSONObject.parseObject(post);
//System.out.println("post:"+post.toString()); if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
//XxlJobHelper.log("执行日志:" + company + post.toString()); //成功
System.out.println("成功"+(i+1)+",");
//System.out.println(jsonObject);
//System.out.println("post:" + post.toString());
//XxlJobHelper.log("执行日志:" + company + post.toString());
success++;
}else{
System.out.println("成功"+(i+1)+",");
System.out.println("post:" + post.toString());
XxlJobHelper.log("执行日志:" + company + post.toString()+jsonObject);
fail++;
}
} catch (IOException e) { } catch (IOException e) {
fail++; fail++;
e.printStackTrace(); e.printStackTrace();
XxlJobHelper.handleFail("任务执行失败" + e.getMessage()); System.out.println(jsonObject);
XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject);
} }
break; break;
} }

23
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java
View File

@ -43,14 +43,29 @@ public class FxsjJobHandler {
JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fxsjs.get(i)); JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fxsjs.get(i));
String post = null; String post = null;
try { try {
success++; //success++;
post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "GGUIPRh5bemgUmX8bvyn76E2ACA7DEE82AB4"); post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "GGUIPRh5bemgUmX8bvyn76E2ACA7DEE82AB4");
//System.out.println("post:"+post.toString()); JSONObject postJsonObj = JSONObject.parseObject(post);
//XxlJobHelper.log("执行日志:"+company+post.toString()); if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
//成功
System.out.println("成功"+(i+1)+",");
//System.out.println(jsonObject);
//System.out.println("post:" + post.toString());
//XxlJobHelper.log("执行日志:" + company + post.toString());
success++;
}else{
System.out.println("成功"+(i+1)+",");
System.out.println("post:" + post.toString());
XxlJobHelper.log("执行日志:" + company + post.toString()+jsonObject);
fail++;
}
} catch (IOException e) { } catch (IOException e) {
fail++; fail++;
e.printStackTrace(); e.printStackTrace();
XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); System.out.println(jsonObject);
XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject);
} }
break; break;
//System.out.println("post:"+post1.toString()); //System.out.println("post:"+post1.toString());

22
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java
View File

@ -102,13 +102,27 @@ public class YhpcjhJobHandler {
String post = null; String post = null;
try { try {
post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "5JzJFKkwF5aHJ0GQUz3Y3D76035B58D84048"); post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "5JzJFKkwF5aHJ0GQUz3Y3D76035B58D84048");
success++; JSONObject postJsonObj = JSONObject.parseObject(post);
//System.out.println("post:"+post.toString()); if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
//XxlJobHelper.log("执行日志:" + company + post.toString()); //成功
System.out.println("成功"+(i+1)+",");
//System.out.println(jsonObject);
//System.out.println("post:" + post.toString());
//XxlJobHelper.log("执行日志:" + company + post.toString());
success++;
}else{
System.out.println("成功"+(i+1)+",");
System.out.println("post:" + post.toString());
XxlJobHelper.log("执行日志:" + company + post.toString()+jsonObject);
fail++;
}
} catch (IOException e) { } catch (IOException e) {
fail++; fail++;
e.printStackTrace(); e.printStackTrace();
XxlJobHelper.handleFail("任务执行失败" + e.getMessage()); System.out.println(jsonObject);
XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject);
} }
break; break;
} }

35
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java
View File

@ -56,18 +56,14 @@ public class YhpcrwJobHandler {
PageInfo<Yhpcrw> pageInfo = new PageInfo<>(onePage); PageInfo<Yhpcrw> pageInfo = new PageInfo<>(onePage);
//设置总数 //设置总数
total = pageInfo.getTotal(); total = pageInfo.getTotal();
System.out.println("总条数:" + total);
System.out.println("第" + pageNum + "页");
System.out.println("本页条数:" + pageInfo.getList().size());
//对本页数据进行上传 //对本页数据进行上传
for (int x = 0; x < pageInfo.getList().size(); x++) { for (int x = 0; x < pageInfo.getList().size(); x++) {
if (x == pageInfo.getList().size() - 1) {
System.out.println("总条数:" + total);
System.out.println("第" + pageNum + "页");
System.out.println("本页条数:" + pageInfo.getList().size());
}
//在此进行上传 //在此进行上传
String HAZARD_NAME = pageInfo.getList().get(x).getFengxianfenxiduixian(); String HAZARD_NAME = pageInfo.getList().get(x).getFengxianfenxiduixian();
@ -127,17 +123,28 @@ public class YhpcrwJobHandler {
String post = null; String post = null;
try { try {
post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F"); post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F");
success++;
System.out.println(jsonObject); JSONObject postJsonObj = JSONObject.parseObject(post);
if(postJsonObj.get("msg").equals("成功")&&postJsonObj.get("code").toString().equals("1000000")&&postJsonObj.get("status").toString().equals("200")){//status
System.out.println("post:" + post.toString()); //成功
XxlJobHelper.log("执行日志:" + company + post.toString()); System.out.println("成功"+(x+1)+",");
//System.out.println(jsonObject);
//System.out.println("post:" + post.toString());
//XxlJobHelper.log("执行日志:" + company + post.toString());
success++;
}else{
System.out.println("成功"+(x+1)+",");
System.out.println("post:" + post.toString());
XxlJobHelper.log("执行日志:" + company + post.toString()+jsonObject);
fail++;
}
} catch (IOException e) { } catch (IOException e) {
fail++; fail++;
e.printStackTrace(); e.printStackTrace();
System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ","); System.out.println(jsonObject);
XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage()); XxlJobHelper.handleFail( "-->任务执行失败" + e.getMessage()+jsonObject);
} }
break; break;
} }

36
src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java
View File

@ -43,7 +43,7 @@ public class YhzldaJobHandler {
int pageNum = 1; int pageNum = 1;
do { do {
System.out.println("dowhile"); //System.out.println("dowhile");
List<Yhzlda> onePage = new ArrayList<>(); List<Yhzlda> onePage = new ArrayList<>();
// 1. 启动分页（必须紧邻查询语句） // 1. 启动分页（必须紧邻查询语句）
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
@ -58,19 +58,17 @@ public class YhzldaJobHandler {
PageInfo<Yhzlda> pageInfo = new PageInfo<>(onePage); PageInfo<Yhzlda> pageInfo = new PageInfo<>(onePage);
//设置总数 //设置总数
total = pageInfo.getTotal(); total = pageInfo.getTotal();
System.out.println("总条数:" + total);
System.out.println("第" + pageNum + "页");
System.out.println("本页条数:" + pageInfo.getList().size());
//对本页数据进行上传 //对本页数据进行上传
for (int x = 0; x < pageInfo.getList().size(); x++) { for (int x = 0; x < pageInfo.getList().size(); x++) {
pageInfo.getList().get(x).setZijinwanyuan(AmountConverter.convertToTenThousandYuan(pageInfo.getList().get(x).getZijinwanyuan())); pageInfo.getList().get(x).setZijinwanyuan(AmountConverter.convertToTenThousandYuan(pageInfo.getList().get(x).getZijinwanyuan()));
if (x == pageInfo.getList().size() - 1) {
System.out.println("总条数:" + total);
System.out.println("第" + pageNum + "页");
System.out.println("本页条数:" + pageInfo.getList().size());
}
//在此进行上传 //在此进行上传
@ -83,17 +81,29 @@ public class YhzldaJobHandler {
String post = null; String post = null;
try { try {
post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "Tk4xNbES1nIUaIzEOPnc29269B98C15B1EE4"); post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "Tk4xNbES1nIUaIzEOPnc29269B98C15B1EE4");
success++;
System.out.println(jsonObject);
System.out.println("post:" + post.toString()); JSONObject postJsonObj = JSONObject.parseObject(post);
XxlJobHelper.log("执行日志:" + company + post.toString()); if (postJsonObj.get("msg").equals("成功") && postJsonObj.get("code").toString().equals("1000000") && postJsonObj.get("status").toString().equals("200")) {//status
//成功
System.out.println("隐患排查档案--第" + (x + 1) + "条成功,");
//System.out.println(jsonObject);
//System.out.println("post:" + post.toString());
//XxlJobHelper.log("执行日志:" + company + post.toString());
success++;
} else {
System.out.println("隐患排查档案--第" + (x + 1) + "条失败,");
System.out.println("post:" + post.toString());
XxlJobHelper.log("执行日志:" + company + post.toString() + jsonObject);
fail++;
}
} catch (IOException e) { } catch (IOException e) {
fail++; fail++;
e.printStackTrace(); e.printStackTrace();
System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ","); System.out.println(jsonObject);
XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage()); XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage() + jsonObject);
} }
break; break;
} }

27
src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Fxsj.java
View File

@ -14,6 +14,33 @@ public class Fxsj {
private String fengxianshijianmingc; private String fengxianshijianmingc;
private String fengxianshijianbianh; private String fengxianshijianbianh;
private String chuangjianren; private String chuangjianren;
private String zerenbumen;
private String zerenren;
private String kenengfashengdeshigu;
public String getZerenbumen() {
return zerenbumen;
}
public void setZerenbumen(String zerenbumen) {
this.zerenbumen = zerenbumen;
}
public String getZerenren() {
return zerenren;
}
public void setZerenren(String zerenren) {
this.zerenren = zerenren;
}
public String getKenengfashengdeshigu() {
return kenengfashengdeshigu;
}
public void setKenengfashengdeshigu(String kenengfashengdeshigu) {
this.kenengfashengdeshigu = kenengfashengdeshigu;
}
public String getQiyemingcheng() { public String getQiyemingcheng() {
return qiyemingcheng; return qiyemingcheng;

3
src/main/resources/mapper/FxfxdxMapper.xml
View File

@ -126,6 +126,9 @@
a.ID AS fengxianshijianbianh, a.ID AS fengxianshijianbianh,
f.ACCOUNTDESC AS chuangjianren, f.ACCOUNTDESC AS chuangjianren,
FORMAT(a.CREASTAMP, 'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian FORMAT(a.CREASTAMP, 'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian
c.fdutydeptid AS zerenbumen,
c.fdutyid AS fdutyid,
a.fresult AS kenengfashengdeshigu
FROM FROM
ISM_RISKEVENT a ISM_RISKEVENT a
-- 左连接风险信息表 -- 左连接风险信息表

Write Preview
Loading…
Cancel
Save