From d5193f41bbecb8fa94d61061eb3b03659a00899e Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Sat, 8 Mar 2025 15:44:56 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5=E8=AE=A1?= =?UTF-8?q?=E5=88=92=202.=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 + .../doubleprevent/FxfxdxJobHandler.java | 13 +- .../doubleprevent/FxfxdyJobHandler.java | 11 +- .../doubleprevent/FxgkcsJobHandler.java | 9 + .../doubleprevent/FxsjJobHandler.java | 11 +- .../doubleprevent/YhpcjhJobHandler.java | 134 +++++++++ .../hxjt/dataupload/mapper/FxfxdxMapper.java | 8 +- .../model/entity/doubleprevent/Yhpcjh.java | 277 ++++++++++++++++++ .../dataupload/service/FxfxdxService.java | 7 +- .../service/impl/FxfxdxServiceImpl.java | 11 +- src/main/resources/application-dev.yml | 6 +- src/main/resources/mapper/FxfxdxMapper.xml | 90 +++++- 12 files changed, 566 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java create mode 100644 src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java diff --git a/pom.xml b/pom.xml index 30f1713..2c23534 100644 --- a/pom.xml +++ b/pom.xml @@ -167,6 +167,12 @@ xxl-job-core 2.4.1 + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.6 + 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 634c51f..2d2c8d5 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdxJobHandler.java @@ -78,6 +78,8 @@ public class FxfxdxJobHandler { //System.out.println(fxfxdxs.get(i).toString()); } + int success = 0; + int fail = 0; for (int i = 0; i < fxfxdxs.size(); i++) { String company = fxfxdxs.get(i).getQiyemingcheng(); @@ -89,16 +91,25 @@ 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()); + //XxlJobHelper.log("执行日志:"+company+post.toString()); } catch (IOException e) { + fail++; e.printStackTrace(); XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); + } break; //System.out.println("post:"+post1.toString()); } } + if(fxfxdxs.size()>0){ + XxlJobHelper.log("执行日志:本次有"+fxfxdxs.size()+"条需要上传,成功上传"+success+"条,失败"+fail+"条"); + }else{ + XxlJobHelper.log("执行日志:本次无新数据需上传"); + } + } 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 5a340a3..cf24eaf 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxfxdyJobHandler.java @@ -76,6 +76,8 @@ public class FxfxdyJobHandler { } System.out.println(fxfxdxs.get(i)); } + int success = 0; + int fail = 0; for (int i = 0; i < fxfxdxs.size(); i++) { String company = fxfxdxs.get(i).getQiyemingcheng(); @@ -87,9 +89,11 @@ 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()); + //XxlJobHelper.log("执行日志:"+company+post.toString()); } catch (IOException e) { + fail++; e.printStackTrace(); XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); } @@ -97,6 +101,11 @@ public class FxfxdyJobHandler { //System.out.println("post:"+post1.toString()); } } + if(fxfxdxs.size()>0){ + XxlJobHelper.log("执行日志:本次有"+fxfxdxs.size()+"条需要上传,成功上传"+success+"条,失败"+fail+"条"); + }else{ + XxlJobHelper.log("执行日志:本次无新数据需上传"); + } } 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 955d955..8e63423 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java @@ -35,6 +35,8 @@ public class FxgkcsJobHandler { }else if(jobParam.equals("每日")){ fxgkcs = fxfxdxService.getFxgkcss("Y"); } + int success = 0; + int fail = 0; for (int i = 0; i < fxgkcs.size(); i++) { System.out.println(i + 1); String company = fxgkcs.get(i).getQiyemingcheng(); @@ -46,15 +48,22 @@ 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()); } catch (IOException e) { + fail++; e.printStackTrace(); XxlJobHelper.handleFail("任务执行失败" + e.getMessage()); } break; } } + if(fxgkcs.size()>0){ + XxlJobHelper.log("执行日志:本次有"+fxgkcs.size()+"条需要上传,成功上传"+success+"条,失败"+fail+"条"); + }else{ + XxlJobHelper.log("执行日志:本次无新数据需上传"); + } } 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 76d4369..ee837b5 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxsjJobHandler.java @@ -30,6 +30,8 @@ public class FxsjJobHandler { public void execute(String param) { ArrayList fxsjs = fxfxdxService.getFxsjs(); + int success = 0; + int fail = 0; for (int i = 0; i < fxsjs.size(); i++) { @@ -41,10 +43,12 @@ public class FxsjJobHandler { JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fxsjs.get(i)); String post = null; try { + success++; post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "GGUIPRh5bemgUmX8bvyn76E2ACA7DEE82AB4"); //System.out.println("post:"+post.toString()); - XxlJobHelper.log("执行日志:"+company+post.toString()); + //XxlJobHelper.log("执行日志:"+company+post.toString()); } catch (IOException e) { + fail++; e.printStackTrace(); XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); } @@ -52,6 +56,11 @@ public class FxsjJobHandler { //System.out.println("post:"+post1.toString()); } } + if(fxsjs.size()>0){ + XxlJobHelper.log("执行日志:本次有"+fxsjs.size()+"条需要上传,成功上传"+success+"条,失败"+fail+"条"); + }else{ + XxlJobHelper.log("执行日志:本次无新数据需上传"); + } } diff --git a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java new file mode 100644 index 0000000..5d2a4c6 --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/YhpcjhJobHandler.java @@ -0,0 +1,134 @@ +package com.hxjt.dataupload.jobhandler.doubleprevent; + +import com.alibaba.fastjson.JSONObject; +import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx; +import com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs; +import com.hxjt.dataupload.model.entity.doubleprevent.Yhpcjh; +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; + + +@Component +public class YhpcjhJobHandler { + + private Logger log = LoggerFactory.getLogger(YhpcjhJobHandler.class); + + @Autowired + FxfxdxService fxfxdxService; + + @XxlJob(value = "YhpcjhJobHandler", init = "init", destroy = "destroy") + public void execute(String param) { + String jobParam = XxlJobHelper.getJobParam(); + ArrayList fxgkcs = new ArrayList<>(); + if (jobParam.equals("全量")) { + fxgkcs = fxfxdxService.getYhpcjhs("N"); + }else if(jobParam.equals("每日")){ + fxgkcs = fxfxdxService.getYhpcjhs("Y"); + } + + ArrayList zdwxys = fxfxdxService.getZdwxys(); + for (int i = 0; i < fxgkcs.size(); i++) { + String HAZARD_NAME = fxgkcs.get(i).getFengxianfenxiduixian(); + for (int j = 0; j < zdwxys.size(); j++) { + String DANGESOURCE_NAME = zdwxys.get(j).getZhongdaweixianyuanmi(); + switch (HAZARD_NAME) { + case "重大危险源甲醇中间储存": + if (DANGESOURCE_NAME.equals("甲醇中间储存单元")) { + fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); + fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); + } + break; + case "重大危险源化产油库": + if (DANGESOURCE_NAME.equals("化产油库区")) { + fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); + fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); + } + break; + case "重大危险源甲醇储罐": + if (DANGESOURCE_NAME.equals("甲醇储存单元")) { + fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); + fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); + } + break; + case "重大危险源空分站": + if (DANGESOURCE_NAME.equals("空分站单元")) { + fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); + fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); + } + break; + case "重大危险源气柜储存": + if (DANGESOURCE_NAME.equals("气柜")) { + fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); + fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); + } + break; + case "重大危险源粗苯蒸馏": + if (DANGESOURCE_NAME.equals("粗苯蒸馏单元")) { + fxgkcs.get(i).setZhongdaweixianyuanmi(DANGESOURCE_NAME); + fxgkcs.get(i).setZhongdaweixianyuande(zdwxys.get(j).getZhongdaweixianyuande()); + } + break; + } + } + if((!StringUtils.isBlank(fxgkcs.get(i).getZhongdaweixianyuande()))&&fxgkcs.get(i).getZhongdaweixianyuande().length()>2){ + fxgkcs.get(i).setZhongdaweixianyuande(fxgkcs.get(i).getZhongdaweixianyuande().substring(0,2)); + } + + //System.out.println(fxfxdxs.get(i).toString()); + } + + + int success = 0; + int fail = 0; + for (int i = 0; i < fxgkcs.size(); i++) { + System.out.print(i + 1+","); + String company = fxgkcs.get(i).getQiyemingcheng(); + String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/yinhuanpaicharenwuqi/v1/yinhuanpaicharenwuqi"; + switch (company) { + case "山东恒信高科能源有限公司": + case "恒信中碳氢能源科技（山东）有限公司": + JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fxgkcs.get(i)); + 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()); + } catch (IOException e) { + fail++; + e.printStackTrace(); + XxlJobHelper.handleFail("任务执行失败" + e.getMessage()); + } + break; + } + } + if(fxgkcs.size()>0){ + XxlJobHelper.log("执行日志:本次有"+fxgkcs.size()+"条需要上传,成功上传"+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 068d63d..84a2f56 100644 --- a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java +++ b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java @@ -1,9 +1,7 @@ package com.hxjt.dataupload.mapper; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdy; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxsj; +import com.hxjt.dataupload.model.entity.doubleprevent.*; +import org.apache.ibatis.annotations.CacheNamespace; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -20,4 +18,6 @@ public interface FxfxdxMapper { ArrayList getFxsjs(); ArrayList getFxgkcss(@Param("isSingleDay")String isSingleDay); + + ArrayList getYhpcjhs(@Param("isSingleDay")String isSingleDay); } diff --git a/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java new file mode 100644 index 0000000..9cc8206 --- /dev/null +++ b/src/main/java/com/hxjt/dataupload/model/entity/doubleprevent/Yhpcjh.java @@ -0,0 +1,277 @@ +package com.hxjt.dataupload.model.entity.doubleprevent; + +import org.springframework.stereotype.Repository; + +@Repository +public class Yhpcjh { + private String qiyemingcheng; + private String qiyebianma; + private String weixianhuaxuepindeng; + private String fengxianfenxiduixian; + private String anquanfengxianfenxid; + //--缺失字段 重大危险源名称 + private String zhongdaweixianyuanmi; + //--缺失字段 重大危险源等级 + private String zhongdaweixianyuande; + private String fengxianfenxidanyuan1; + private String fengxianfenxidanyuan; + private String fengxianshijianmingc; + private String fengxianshijianbianh; + private String duiyingguankongcuosh; + private String guankongcuoshiid; + private String yinhuanpaichaneirong; + private String yinhuanpaicharenwuid; + private String yinhuanpaichazhouqi; + private String danwei; + private String xunjianyouxiaokaishi; + private String xunjianyouxiaojieshu; + private String gongzuorileixing; + private String renwuleixing; + //--缺失字段 包保责任人对应 任务项 + private String baobaorenwuduiyingxi; + //--缺失字段 首次排查时间 + private String baobaozerenrenduiyin; + private String chushipaicharenwukai; + private String jiluren; + private String jilushijian; + + 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 getFengxianfenxiduixian() { + return fengxianfenxiduixian; + } + + public void setFengxianfenxiduixian(String fengxianfenxiduixian) { + this.fengxianfenxiduixian = fengxianfenxiduixian; + } + + public String getAnquanfengxianfenxid() { + return anquanfengxianfenxid; + } + + public void setAnquanfengxianfenxid(String anquanfengxianfenxid) { + this.anquanfengxianfenxid = anquanfengxianfenxid; + } + + public String getZhongdaweixianyuanmi() { + return zhongdaweixianyuanmi; + } + + public void setZhongdaweixianyuanmi(String zhongdaweixianyuanmi) { + this.zhongdaweixianyuanmi = zhongdaweixianyuanmi; + } + + public String getZhongdaweixianyuande() { + return zhongdaweixianyuande; + } + + public void setZhongdaweixianyuande(String zhongdaweixianyuande) { + this.zhongdaweixianyuande = zhongdaweixianyuande; + } + + public String getFengxianfenxidanyuan1() { + return fengxianfenxidanyuan1; + } + + public void setFengxianfenxidanyuan1(String fengxianfenxidanyuan1) { + this.fengxianfenxidanyuan1 = fengxianfenxidanyuan1; + } + + public String getFengxianfenxidanyuan() { + return fengxianfenxidanyuan; + } + + public void setFengxianfenxidanyuan(String fengxianfenxidanyuan) { + this.fengxianfenxidanyuan = fengxianfenxidanyuan; + } + + public String getFengxianshijianmingc() { + return fengxianshijianmingc; + } + + public void setFengxianshijianmingc(String fengxianshijianmingc) { + this.fengxianshijianmingc = fengxianshijianmingc; + } + + public String getFengxianshijianbianh() { + return fengxianshijianbianh; + } + + public void setFengxianshijianbianh(String fengxianshijianbianh) { + this.fengxianshijianbianh = fengxianshijianbianh; + } + + public String getDuiyingguankongcuosh() { + return duiyingguankongcuosh; + } + + public void setDuiyingguankongcuosh(String duiyingguankongcuosh) { + this.duiyingguankongcuosh = duiyingguankongcuosh; + } + + 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 getYinhuanpaicharenwuid() { + return yinhuanpaicharenwuid; + } + + public void setYinhuanpaicharenwuid(String yinhuanpaicharenwuid) { + this.yinhuanpaicharenwuid = yinhuanpaicharenwuid; + } + + public String getYinhuanpaichazhouqi() { + return yinhuanpaichazhouqi; + } + + public void setYinhuanpaichazhouqi(String yinhuanpaichazhouqi) { + this.yinhuanpaichazhouqi = yinhuanpaichazhouqi; + } + + public String getDanwei() { + return danwei; + } + + public void setDanwei(String danwei) { + this.danwei = danwei; + } + + public String getXunjianyouxiaokaishi() { + return xunjianyouxiaokaishi; + } + + public void setXunjianyouxiaokaishi(String xunjianyouxiaokaishi) { + this.xunjianyouxiaokaishi = xunjianyouxiaokaishi; + } + + public String getXunjianyouxiaojieshu() { + return xunjianyouxiaojieshu; + } + + public void setXunjianyouxiaojieshu(String xunjianyouxiaojieshu) { + this.xunjianyouxiaojieshu = xunjianyouxiaojieshu; + } + + public String getGongzuorileixing() { + return gongzuorileixing; + } + + public void setGongzuorileixing(String gongzuorileixing) { + this.gongzuorileixing = gongzuorileixing; + } + + public String getRenwuleixing() { + return renwuleixing; + } + + public void setRenwuleixing(String renwuleixing) { + this.renwuleixing = renwuleixing; + } + + public String getBaobaorenwuduiyingxi() { + return baobaorenwuduiyingxi; + } + + public void setBaobaorenwuduiyingxi(String baobaorenwuduiyingxi) { + this.baobaorenwuduiyingxi = baobaorenwuduiyingxi; + } + + public String getBaobaozerenrenduiyin() { + return baobaozerenrenduiyin; + } + + public void setBaobaozerenrenduiyin(String baobaozerenrenduiyin) { + this.baobaozerenrenduiyin = baobaozerenrenduiyin; + } + + public String getChushipaicharenwukai() { + return chushipaicharenwukai; + } + + public void setChushipaicharenwukai(String chushipaicharenwukai) { + this.chushipaicharenwukai = chushipaicharenwukai; + } + + public String getJiluren() { + return jiluren; + } + + public void setJiluren(String jiluren) { + this.jiluren = jiluren; + } + + public String getJilushijian() { + return jilushijian; + } + + public void setJilushijian(String jilushijian) { + this.jilushijian = jilushijian; + } + + @Override + public String toString() { + return "Yhpcjh{" + + "qiyemingcheng='" + qiyemingcheng + '\'' + + ", qiyebianma='" + qiyebianma + '\'' + + ", weixianhuaxuepindeng='" + weixianhuaxuepindeng + '\'' + + ", fengxianfenxiduixian='" + fengxianfenxiduixian + '\'' + + ", anquanfengxianfenxid='" + anquanfengxianfenxid + '\'' + + ", zhongdaweixianyuanmi='" + zhongdaweixianyuanmi + '\'' + + ", zhongdaweixianyuande='" + zhongdaweixianyuande + '\'' + + ", fengxianfenxidanyuan1='" + fengxianfenxidanyuan1 + '\'' + + ", fengxianfenxidanyuan='" + fengxianfenxidanyuan + '\'' + + ", fengxianshijianmingc='" + fengxianshijianmingc + '\'' + + ", fengxianshijianbianh='" + fengxianshijianbianh + '\'' + + ", duiyingguankongcuosh='" + duiyingguankongcuosh + '\'' + + ", guankongcuoshiid='" + guankongcuoshiid + '\'' + + ", yinhuanpaichaneirong='" + yinhuanpaichaneirong + '\'' + + ", yinhuanpaicharenwuid='" + yinhuanpaicharenwuid + '\'' + + ", yinhuanpaichazhouqi='" + yinhuanpaichazhouqi + '\'' + + ", danwei='" + danwei + '\'' + + ", xunjianyouxiaokaishi='" + xunjianyouxiaokaishi + '\'' + + ", xunjianyouxiaojieshu='" + xunjianyouxiaojieshu + '\'' + + ", gongzuorileixing='" + gongzuorileixing + '\'' + + ", renwuleixing='" + renwuleixing + '\'' + + ", baobaorenwuduiyingxi='" + baobaorenwuduiyingxi + '\'' + + ", baobaozerenrenduiyin='" + baobaozerenrenduiyin + '\'' + + ", chushipaicharenwukai='" + chushipaicharenwukai + '\'' + + ", jiluren='" + jiluren + '\'' + + ", jilushijian='" + jilushijian + '\'' + + '}'; + } +} diff --git a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java index f0ba4a5..44ca077 100644 --- a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java +++ b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java @@ -1,9 +1,6 @@ package com.hxjt.dataupload.service; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdy; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxsj; +import com.hxjt.dataupload.model.entity.doubleprevent.*; import java.util.ArrayList; @@ -19,4 +16,6 @@ public interface FxfxdxService { ArrayList getFxsjs(); //风险管控措施 ArrayList getFxgkcss(String isSingleDay); + //隐患排查计划 + ArrayList getYhpcjhs(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 1b72a3e..973e3c7 100644 --- a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java +++ b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java @@ -1,13 +1,11 @@ package com.hxjt.dataupload.service.impl; import com.hxjt.dataupload.mapper.FxfxdxMapper; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdx; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxfxdy; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxgkcs; -import com.hxjt.dataupload.model.entity.doubleprevent.Fxsj; +import com.hxjt.dataupload.model.entity.doubleprevent.*; import com.hxjt.dataupload.service.FxfxdxService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; @Service @@ -38,4 +36,9 @@ public class FxfxdxServiceImpl implements FxfxdxService { public ArrayList getFxgkcss(String isSingleDay) { return fxfxdxMapper.getFxgkcss(isSingleDay); } + + @Override + public ArrayList getYhpcjhs(String isSingleDay) { + return fxfxdxMapper.getYhpcjhs(isSingleDay); + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 31e1975..99535ec 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,9 +2,13 @@ mybatis: configuration: #开启控制台打印sql - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # mybatis 下划线转驼峰配置,两者都可以 map-underscore-to-camel-case: true + # 一级缓存设置为 statement 级别，每次查询后清空缓存 + local-cache-scope: statement + #全局关闭二级缓存 + cache-enabled: false #配置扫描 mapper-locations: classpath:mapper/*.xml #配置xml的结果别名 diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 718a6b0..de57572 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -198,9 +198,97 @@ a.ISDELETE = 'N' AND a.CREASTAMP BETWEEN - DATEADD(DAY, -90, CAST(SYSDATETIME() AS date)) AND + DATEADD(DAY, -1, CAST(SYSDATETIME() AS date)) AND DATEADD(DAY, -1, CAST(SYSDATETIME() AS datetime2(6))) ORDER BY jilushijian DESC + + \ No newline at end of file