diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java index 2d2c8d5..efbad3c 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java @@ -91,14 +91,27 @@ public class FxfxdxJobHandler { String post = null; try { post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "avRdnP4OxPigMalwzipa9F643CF443BE2F93"); - success++; - //System.out.println("post:"+post.toString()); - //XxlJobHelper.log("执行日志:"+company+post.toString()); + 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("成功"+(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) { fail++; e.printStackTrace(); - XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); - + System.out.println(jsonObject); + XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject); } break; //System.out.println("post:"+post1.toString()); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java index cf24eaf..151d67e 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java @@ -89,13 +89,27 @@ public class FxfxdyJobHandler { String post = null; try { post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "RZdFEDt03BmZvGwkuL6KAE15B7F9249CFBE9"); - success++; - //System.out.println("post:"+post.toString()); - //XxlJobHelper.log("执行日志:"+company+post.toString()); + 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("成功"+(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) { fail++; e.printStackTrace(); - XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); + System.out.println(jsonObject); + XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject); } break; //System.out.println("post:"+post1.toString()); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java index 8e63423..9b01c6d 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java @@ -48,13 +48,27 @@ public class FxgkcsJobHandler { String post = null; try { post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "7CTkAyBoL26Jo7ZMNVmg0EA57A0791FD71AB"); - success++; - //System.out.println("post:"+post.toString()); - //XxlJobHelper.log("执行日志:" + company + post.toString()); + 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("成功"+(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) { fail++; e.printStackTrace(); - XxlJobHelper.handleFail("任务执行失败" + e.getMessage()); + System.out.println(jsonObject); + XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject); } break; } diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java index ee837b5..00650db 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java @@ -43,14 +43,29 @@ public class FxsjJobHandler { JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fxsjs.get(i)); String post = null; try { - success++; + //success++; post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "GGUIPRh5bemgUmX8bvyn76E2ACA7DEE82AB4"); - //System.out.println("post:"+post.toString()); - //XxlJobHelper.log("执行日志:"+company+post.toString()); + 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("成功"+(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) { fail++; e.printStackTrace(); - XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); + System.out.println(jsonObject); + XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject); } break; //System.out.println("post:"+post1.toString()); diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java index 5d2a4c6..8fbb34e 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java @@ -102,13 +102,27 @@ public class YhpcjhJobHandler { String post = null; try { post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "5JzJFKkwF5aHJ0GQUz3Y3D76035B58D84048"); - success++; - //System.out.println("post:"+post.toString()); - //XxlJobHelper.log("执行日志:" + company + post.toString()); + 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("成功"+(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) { fail++; e.printStackTrace(); - XxlJobHelper.handleFail("任务执行失败" + e.getMessage()); + System.out.println(jsonObject); + XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage()+jsonObject); } break; } diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java index c1482b2..303c042 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java @@ -56,18 +56,14 @@ public class YhpcrwJobHandler { PageInfo pageInfo = new PageInfo<>(onePage); //设置总数 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++) { - 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(); @@ -127,17 +123,28 @@ public class YhpcrwJobHandler { String post = null; try { post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F"); - success++; - System.out.println(jsonObject); - - System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:" + company + post.toString()); + 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("成功"+(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) { fail++; e.printStackTrace(); - System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ","); - XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage()); + System.out.println(jsonObject); + XxlJobHelper.handleFail( "-->任务执行失败" + e.getMessage()+jsonObject); } break; } diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java index b8d927f..eb293b4 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java @@ -43,7 +43,7 @@ public class YhzldaJobHandler { int pageNum = 1; do { - System.out.println("dowhile"); + //System.out.println("dowhile"); List onePage = new ArrayList<>(); // 1. 启动分页（必须紧邻查询语句） PageHelper.startPage(pageNum, pageSize); @@ -58,19 +58,17 @@ public class YhzldaJobHandler { PageInfo pageInfo = new PageInfo<>(onePage); //设置总数 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++) { 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; try { post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "Tk4xNbES1nIUaIzEOPnc29269B98C15B1EE4"); - success++; - System.out.println(jsonObject); - System.out.println("post:" + post.toString()); - XxlJobHelper.log("执行日志:" + company + post.toString()); + 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("隐患排查档案--第" + (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) { fail++; e.printStackTrace(); - System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ","); - XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage()); + System.out.println(jsonObject); + XxlJobHelper.handleFail("-->任务执行失败" + e.getMessage() + jsonObject); } break; } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Fxsj.java b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Fxsj.java index c607f23..e846720 100644 --- a/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Fxsj.java +++ b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Fxsj.java @@ -14,6 +14,33 @@ public class Fxsj { private String fengxianshijianmingc; private String fengxianshijianbianh; 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() { return qiyemingcheng; diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 226c597..f49eab4 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -126,6 +126,9 @@ a.ID AS fengxianshijianbianh, f.ACCOUNTDESC AS chuangjianren, FORMAT(a.CREASTAMP, 'yyyy-MM-dd HH:mm:ss') AS chuangjianshijian + c.fdutydeptid AS zerenbumen, + c.fdutyid AS fdutyid, + a.fresult AS kenengfashengdeshigu FROM ISM_RISKEVENT a -- 左连接风险信息表