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 9d9f499..c1482b2 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcrwJobHandler.java @@ -33,15 +33,12 @@ public class YhpcrwJobHandler { @XxlJob(value = "YhpcrwJobHandler", init = "init", destroy = "destroy") public void execute(String param) { String jobParam = XxlJobHelper.getJobParam(); - //PageInfo fxgkcs = new PageInfo<>(); + int pageSize = 1000; int success = 0; int fail = 0; long total = 0; ArrayList zdwxys = fxfxdxService.getZdwxys(); - /*if (jobParam.equals("全量")) { - //fxgkcs = fxfxdxService.getYhpcrws("N"); - }else if(jobParam.equals("每日")){*/ int pageNum = 1; do { @@ -68,7 +65,7 @@ public class YhpcrwJobHandler { System.out.println("总条数:" + total); System.out.println("第" + pageNum + "页"); System.out.println("本页条数:" + pageInfo.getList().size()); - System.out.println("本页最后一条:" + pageInfo.getList().get(x).getYinhuanpaicharenwuji()); + } //在此进行上传 @@ -119,43 +116,39 @@ public class YhpcrwJobHandler { pageInfo.getList().get(x).setZhongdaweixianyuande(pageInfo.getList().get(x).getZhongdaweixianyuande().substring(0, 2)); } - //System.out.println(fxfxdxs.get(i).toString()); - - - for (int i = 0; i < pageInfo.getList().size(); i++) { - System.out.print(i + 1 + ","); - String company = pageInfo.getList().get(x).getQiyemingcheng(); - String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu"; - switch (company) { - case "山东恒信高科能源有限公司": - case "恒信中碳氢能源科技（山东）有限公司": - JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x)); - String post = null; - try { - post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "tp9tNKR6nGsS2mpdWzrQ02D93621E3411A0F"); - success++; - System.out.println(pageInfo.getList().get(x).getYinhuanpaicharenwuji()+","); - System.out.println(jsonObject); - System.out.println(pageInfo.getList().get(x)); - System.out.println("post:"+post.toString()); - XxlJobHelper.log("执行日志:" + company + post.toString()); - } catch (IOException e) { - fail++; - e.printStackTrace(); - System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ","); - XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage()); - } - break; - } + + + String company = pageInfo.getList().get(x).getQiyemingcheng(); + String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu"; + switch (company) { + case "山东恒信高科能源有限公司": + case "恒信中碳氢能源科技（山东）有限公司": + JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x)); + 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()); + } catch (IOException e) { + fail++; + e.printStackTrace(); + System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ","); + XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage()); + } + break; } + } pageNum++; - /*System.out.println(total); - System.out.println(pageNum*pageSize);*/ + } while (total > (pageNum - 1) * pageSize); - //} + if (total > 0) { diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java new file mode 100644 index 0000000..39efa1d --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhzldaJobHandler.java @@ -0,0 +1,121 @@ +package com.hxjt.dataupload.jobhandler.doubleprevent; + +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx; +import com.hxjt.dataupload.model.entity.doubleprevent.Yhpcrw; +import com.hxjt.dataupload.model.entity.doubleprevent.Yhzlda; +import com.hxjt.dataupload.service.FxfxdxService; +import com.hxjt.dataupload.utils.HttpUtils; +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.protocol.HTTP; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +@Component +public class YhzldaJobHandler { + + + private Logger log = LoggerFactory.getLogger(YhzldaJobHandler.class); + + @Autowired + FxfxdxService fxfxdxService; + + @XxlJob(value = "YhzldaJobHandler", init = "init", destroy = "destroy") + public void execute(String param) { + String jobParam = XxlJobHelper.getJobParam(); + + int pageSize = 1000; + int success = 0; + int fail = 0; + long total = 0; + + + int pageNum = 1; + do { + System.out.println("dowhile"); + List onePage = new ArrayList<>(); + // 1. 启动分页（必须紧邻查询语句） + PageHelper.startPage(pageNum, pageSize); + // 2. 执行查询（此时SQL已被自动拦截并添加分页逻辑） + if (jobParam.equals("全量")) { + onePage = fxfxdxService.getOneYhzldasPage("N"); + } else { + onePage = fxfxdxService.getOneYhzldasPage("Y"); + } + + // 3. 封装分页结果 + PageInfo pageInfo = new PageInfo<>(onePage); + //设置总数 + total = pageInfo.getTotal(); + + //对本页数据进行上传 + 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 company = pageInfo.getList().get(x).getQiyemingcheng(); + String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwu/v1/yinhuanpaicharenwu"; + switch (company) { + case "山东恒信高科能源有限公司": + case "恒信中碳氢能源科技（山东）有限公司": + JSONObject jsonObject = (JSONObject) JSONObject.toJSON(pageInfo.getList().get(x)); + 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()); + } catch (IOException e) { + fail++; + e.printStackTrace(); + System.out.print(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + ","); + XxlJobHelper.handleFail(pageInfo.getList().get(x).getYinhuanpaicharenwuji() + "-->任务执行失败" + e.getMessage()); + } + break; + } + + + } + pageNum++; + } while (total > (pageNum - 1) * pageSize); + + if (total > 0) { + XxlJobHelper.log("执行日志:本次有" + total + "条需要上传,成功上传" + success + "条,失败" + fail + "条"); + } else { + XxlJobHelper.log("执行日志:本次无新数据需上传"); + } + + + } + + + private void init() { + log.info("init 方法调用成功"); + } + + private void destroy() { + log.info("destroy 方法调用成功"); + } +} diff --git a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java index 9879c71..0f20acf 100644 --- a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java +++ b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java @@ -23,4 +23,6 @@ public interface FxfxdxMapper { ArrayList getYhpcjhs(@Param("isSingleDay")String isSingleDay); List getOneYhpcrwsPage(@Param("isSingleDay")String isSingleDay); + + List getOneYhzldasPage(@Param("isSingleDay")String isSingleDay); } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhzlda.java b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhzlda.java new file mode 100644 index 0000000..724ac22 --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhzlda.java @@ -0,0 +1,353 @@ +package com.hxjt.dataupload.model.entity.doubleprevent; + +import org.springframework.stereotype.Repository; + +@Repository +public class Yhzlda { + private String qiyemingcheng; + private String qiyebianma; + private String weixianhuaxuepindeng; + private String yinhuanbianhao; + private String yinhuanshejiduixiang; + private String fengxianfenxiduixia1; + private String suoshuqukuai; + private String danyuanbianma; + private String fengxianshijianmingc; + private String fengxianshijianid; + private String xianyoucuoshi; + private String guankongcuoshiid; + private String yinhuanpaichaneirong; + private String yinhuanpaicharenwuji; + private String yinhuanmingcheng; + private String yinhuanjibie; + private String paicharenyuan; + private String tijiaoriq1; + private String jianchaleixing; + private String zhilileixing; + private String yinhuanleixing; + private String yinhuanleibie; + private String yinhuanmiaoshu; + private String yuanyinfenxi; + private String kongzhicuoshi; + private String zijinwanyuan; + private String yinhuanzhuangtai; + private String zhenggairen; + private String zhenggaiqixia1; + private String zhenggaitijiaoriqi; + private String fucharen; + private String fuchariqi; + private String chuangjianren; + private String chuangjianshijian; + + public String getQiyemingcheng() { + return qiyemingcheng; + } + + public void setQiyemingcheng(String qiyemingcheng) { + this.qiyemingcheng = qiyemingcheng; + } + + public String getQiyebianma() { + return qiyebianma; + } + + public void setQiyebianma(String qiyebianma) { + this.qiyebianma = qiyebianma; + } + + public String getWeixianhuaxuepindeng() { + return weixianhuaxuepindeng; + } + + public void setWeixianhuaxuepindeng(String weixianhuaxuepindeng) { + this.weixianhuaxuepindeng = weixianhuaxuepindeng; + } + + public String getYinhuanbianhao() { + return yinhuanbianhao; + } + + public void setYinhuanbianhao(String yinhuanbianhao) { + this.yinhuanbianhao = yinhuanbianhao; + } + + public String getYinhuanshejiduixiang() { + return yinhuanshejiduixiang; + } + + public void setYinhuanshejiduixiang(String yinhuanshejiduixiang) { + this.yinhuanshejiduixiang = yinhuanshejiduixiang; + } + + public String getFengxianfenxiduixia1() { + return fengxianfenxiduixia1; + } + + public void setFengxianfenxiduixia1(String fengxianfenxiduixia1) { + this.fengxianfenxiduixia1 = fengxianfenxiduixia1; + } + + public String getSuoshuqukuai() { + return suoshuqukuai; + } + + public void setSuoshuqukuai(String suoshuqukuai) { + this.suoshuqukuai = suoshuqukuai; + } + + public String getDanyuanbianma() { + return danyuanbianma; + } + + public void setDanyuanbianma(String danyuanbianma) { + this.danyuanbianma = danyuanbianma; + } + + public String getFengxianshijianmingc() { + return fengxianshijianmingc; + } + + public void setFengxianshijianmingc(String fengxianshijianmingc) { + this.fengxianshijianmingc = fengxianshijianmingc; + } + + public String getFengxianshijianid() { + return fengxianshijianid; + } + + public void setFengxianshijianid(String fengxianshijianid) { + this.fengxianshijianid = fengxianshijianid; + } + + public String getXianyoucuoshi() { + return xianyoucuoshi; + } + + public void setXianyoucuoshi(String xianyoucuoshi) { + this.xianyoucuoshi = xianyoucuoshi; + } + + public String getGuankongcuoshiid() { + return guankongcuoshiid; + } + + public void setGuankongcuoshiid(String guankongcuoshiid) { + this.guankongcuoshiid = guankongcuoshiid; + } + + public String getYinhuanpaichaneirong() { + return yinhuanpaichaneirong; + } + + public void setYinhuanpaichaneirong(String yinhuanpaichaneirong) { + this.yinhuanpaichaneirong = yinhuanpaichaneirong; + } + + public String getYinhuanpaicharenwuji() { + return yinhuanpaicharenwuji; + } + + public void setYinhuanpaicharenwuji(String yinhuanpaicharenwuji) { + this.yinhuanpaicharenwuji = yinhuanpaicharenwuji; + } + + public String getYinhuanmingcheng() { + return yinhuanmingcheng; + } + + public void setYinhuanmingcheng(String yinhuanmingcheng) { + this.yinhuanmingcheng = yinhuanmingcheng; + } + + public String getYinhuanjibie() { + return yinhuanjibie; + } + + public void setYinhuanjibie(String yinhuanjibie) { + this.yinhuanjibie = yinhuanjibie; + } + + public String getPaicharenyuan() { + return paicharenyuan; + } + + public void setPaicharenyuan(String paicharenyuan) { + this.paicharenyuan = paicharenyuan; + } + + public String getTijiaoriq1() { + return tijiaoriq1; + } + + public void setTijiaoriq1(String tijiaoriq1) { + this.tijiaoriq1 = tijiaoriq1; + } + + public String getJianchaleixing() { + return jianchaleixing; + } + + public void setJianchaleixing(String jianchaleixing) { + this.jianchaleixing = jianchaleixing; + } + + public String getZhilileixing() { + return zhilileixing; + } + + public void setZhilileixing(String zhilileixing) { + this.zhilileixing = zhilileixing; + } + + public String getYinhuanleixing() { + return yinhuanleixing; + } + + public void setYinhuanleixing(String yinhuanleixing) { + this.yinhuanleixing = yinhuanleixing; + } + + public String getYinhuanleibie() { + return yinhuanleibie; + } + + public void setYinhuanleibie(String yinhuanleibie) { + this.yinhuanleibie = yinhuanleibie; + } + + public String getYinhuanmiaoshu() { + return yinhuanmiaoshu; + } + + public void setYinhuanmiaoshu(String yinhuanmiaoshu) { + this.yinhuanmiaoshu = yinhuanmiaoshu; + } + + public String getYuanyinfenxi() { + return yuanyinfenxi; + } + + public void setYuanyinfenxi(String yuanyinfenxi) { + this.yuanyinfenxi = yuanyinfenxi; + } + + public String getKongzhicuoshi() { + return kongzhicuoshi; + } + + public void setKongzhicuoshi(String kongzhicuoshi) { + this.kongzhicuoshi = kongzhicuoshi; + } + + public String getZijinwanyuan() { + return zijinwanyuan; + } + + public void setZijinwanyuan(String zijinwanyuan) { + this.zijinwanyuan = zijinwanyuan; + } + + public String getYinhuanzhuangtai() { + return yinhuanzhuangtai; + } + + public void setYinhuanzhuangtai(String yinhuanzhuangtai) { + this.yinhuanzhuangtai = yinhuanzhuangtai; + } + + public String getZhenggairen() { + return zhenggairen; + } + + public void setZhenggairen(String zhenggairen) { + this.zhenggairen = zhenggairen; + } + + public String getZhenggaiqixia1() { + return zhenggaiqixia1; + } + + public void setZhenggaiqixia1(String zhenggaiqixia1) { + this.zhenggaiqixia1 = zhenggaiqixia1; + } + + public String getZhenggaitijiaoriqi() { + return zhenggaitijiaoriqi; + } + + public void setZhenggaitijiaoriqi(String zhenggaitijiaoriqi) { + this.zhenggaitijiaoriqi = zhenggaitijiaoriqi; + } + + public String getFucharen() { + return fucharen; + } + + public void setFucharen(String fucharen) { + this.fucharen = fucharen; + } + + public String getFuchariqi() { + return fuchariqi; + } + + public void setFuchariqi(String fuchariqi) { + this.fuchariqi = fuchariqi; + } + + public String getChuangjianren() { + return chuangjianren; + } + + public void setChuangjianren(String chuangjianren) { + this.chuangjianren = chuangjianren; + } + + public String getChuangjianshijian() { + return chuangjianshijian; + } + + public void setChuangjianshijian(String chuangjianshijian) { + this.chuangjianshijian = chuangjianshijian; + } + + @Override + public String toString() { + return "Yhzlda{" + + "qiyemingcheng='" + qiyemingcheng + '\'' + + ", qiyebianma='" + qiyebianma + '\'' + + ", weixianhuaxuepindeng='" + weixianhuaxuepindeng + '\'' + + ", yinhuanbianhao='" + yinhuanbianhao + '\'' + + ", yinhuanshejiduixiang='" + yinhuanshejiduixiang + '\'' + + ", fengxianfenxiduixia1='" + fengxianfenxiduixia1 + '\'' + + ", suoshuqukuai='" + suoshuqukuai + '\'' + + ", danyuanbianma='" + danyuanbianma + '\'' + + ", fengxianshijianmingc='" + fengxianshijianmingc + '\'' + + ", fengxianshijianid='" + fengxianshijianid + '\'' + + ", xianyoucuoshi='" + xianyoucuoshi + '\'' + + ", guankongcuoshiid='" + guankongcuoshiid + '\'' + + ", yinhuanpaichaneirong='" + yinhuanpaichaneirong + '\'' + + ", yinhuanpaicharenwuji='" + yinhuanpaicharenwuji + '\'' + + ", yinhuanmingcheng='" + yinhuanmingcheng + '\'' + + ", yinhuanjibie='" + yinhuanjibie + '\'' + + ", paicharenyuan='" + paicharenyuan + '\'' + + ", tijiaoriq1='" + tijiaoriq1 + '\'' + + ", jianchaleixing='" + jianchaleixing + '\'' + + ", zhilileixing='" + zhilileixing + '\'' + + ", yinhuanleixing='" + yinhuanleixing + '\'' + + ", yinhuanleibie='" + yinhuanleibie + '\'' + + ", yinhuanmiaoshu='" + yinhuanmiaoshu + '\'' + + ", yuanyinfenxi='" + yuanyinfenxi + '\'' + + ", kongzhicuoshi='" + kongzhicuoshi + '\'' + + ", zijinwanyuan='" + zijinwanyuan + '\'' + + ", yinhuanzhuangtai='" + yinhuanzhuangtai + '\'' + + ", zhenggairen='" + zhenggairen + '\'' + + ", zhenggaiqixia1='" + zhenggaiqixia1 + '\'' + + ", zhenggaitijiaoriqi='" + zhenggaitijiaoriqi + '\'' + + ", fucharen='" + fucharen + '\'' + + ", fuchariqi='" + fuchariqi + '\'' + + ", chuangjianren='" + chuangjianren + '\'' + + ", chuangjianshijian='" + chuangjianshijian + '\'' + + '}'; + } +} diff --git a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java index 11aba1c..1b46ed5 100644 --- a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java +++ b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java @@ -21,4 +21,6 @@ public interface FxfxdxService { ArrayList getYhpcjhs(String isSingleDay); //隐患排查任务 List getOneYhpcrwsPage(String isSingleDay); + //隐患治理档案 + List getOneYhzldasPage(String isSingleDay); } diff --git a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java index 3edc148..239f690 100644 --- a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java +++ b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java @@ -48,4 +48,9 @@ public class FxfxdxServiceImpl implements FxfxdxService { public List getOneYhpcrwsPage(String isSingleDay) { return fxfxdxMapper.getOneYhpcrwsPage(isSingleDay); } + + @Override + public List getOneYhzldasPage(String isSingleDay) { + return fxfxdxMapper.getOneYhzldasPage(isSingleDay); + } } diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index d690adb..6ef8932 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -398,4 +398,139 @@ ORDER BY chuangjianshijian DESC + + \ No newline at end of file