From ee6a8fd63d3ba1667ed46c1246351c651048bb7b Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Sat, 8 Mar 2025 09:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E7=AE=A1=E6=8E=A7=E6=8E=AA?= =?UTF-8?q?=E6=96=BD,=E5=8F=AF=E9=80=9A=E8=BF=87=E4=BC=A0=E5=8F=82"?= =?UTF-8?q?=E5=85=A8=E9=87=8F"=E5=92=8C"=E6=AF=8F=E6=97=A5"=E6=9D=A5?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E4=B8=8A=E4=BC=A0=E6=95=B0=E6=8D=AE=E8=8C=83?= =?UTF-8?q?=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doubleprevent/FxgkcsJobHandler.java | 19 ++++++++++++------- .../hxjt/dataupload/mapper/FxfxdxMapper.java | 3 ++- .../dataupload/service/FxfxdxService.java | 2 +- .../service/impl/FxfxdxServiceImpl.java | 4 ++-- .../com/hxjt/dataupload/utils/HttpUtils.java | 2 +- src/main/resources/mapper/FxfxdxMapper.xml | 8 +++++++- 6 files changed, 25 insertions(+), 13 deletions(-) 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 8a60559..955d955 100644 --- a/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java +++ b/src/main/java/com/hxjt/dataupload/jobhandler/doubleprevent/FxgkcsJobHandler.java @@ -8,6 +8,7 @@ import com.hxjt.dataupload.utils.HttpUtils; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; import org.apache.http.protocol.HTTP; +import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -27,11 +28,15 @@ public class FxgkcsJobHandler { @XxlJob(value = "FxgkcsJobHandler", init = "init", destroy = "destroy") public void execute(String param) { - - ArrayList fxgkcs = fxfxdxService.getFxgkcss(); - + String jobParam = XxlJobHelper.getJobParam(); + ArrayList fxgkcs = new ArrayList<>(); + if (jobParam.equals("全量")) { + fxgkcs = fxfxdxService.getFxgkcss("N"); + }else if(jobParam.equals("每日")){ + fxgkcs = fxfxdxService.getFxgkcss("Y"); + } for (int i = 0; i < fxgkcs.size(); i++) { - + System.out.println(i + 1); String company = fxgkcs.get(i).getQiyemingcheng(); String url = "https://www.ny-fxfk.com/space-ningyanghuagongchany/sapi/qpaas/tiga/dys/keyAuthentication/fengxianguankongqing/v1/fengxianguankongqing"; switch (company) { @@ -42,16 +47,16 @@ public class FxgkcsJobHandler { try { post = HttpUtils.sendDataUpload(url, jsonObject, HTTP.UTF_8, "7CTkAyBoL26Jo7ZMNVmg0EA57A0791FD71AB"); //System.out.println("post:"+post.toString()); - XxlJobHelper.log("执行日志:"+company+post.toString()); + //XxlJobHelper.log("执行日志:" + company + post.toString()); } catch (IOException e) { e.printStackTrace(); - XxlJobHelper.handleFail("任务执行失败"+e.getMessage()); + XxlJobHelper.handleFail("任务执行失败" + e.getMessage()); } break; - //System.out.println("post:"+post1.toString()); } } + } diff --git a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java index 02b21d7..068d63d 100644 --- a/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java +++ b/src/main/java/com/hxjt/dataupload/mapper/FxfxdxMapper.java @@ -5,6 +5,7 @@ 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 org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.ArrayList; @@ -18,5 +19,5 @@ public interface FxfxdxMapper { ArrayList getFxsjs(); - ArrayList getFxgkcss(); + ArrayList getFxgkcss(@Param("isSingleDay")String isSingleDay); } diff --git a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java index 6526255..f0ba4a5 100644 --- a/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java +++ b/src/main/java/com/hxjt/dataupload/service/FxfxdxService.java @@ -18,5 +18,5 @@ public interface FxfxdxService { //风险事件 ArrayList getFxsjs(); //风险管控措施 - ArrayList getFxgkcss(); + ArrayList getFxgkcss(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 6dbf756..1b72a3e 100644 --- a/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java +++ b/src/main/java/com/hxjt/dataupload/service/impl/FxfxdxServiceImpl.java @@ -35,7 +35,7 @@ public class FxfxdxServiceImpl implements FxfxdxService { } @Override - public ArrayList getFxgkcss() { - return fxfxdxMapper.getFxgkcss(); + public ArrayList getFxgkcss(String isSingleDay) { + return fxfxdxMapper.getFxgkcss(isSingleDay); } } diff --git a/src/main/java/com/hxjt/dataupload/utils/HttpUtils.java b/src/main/java/com/hxjt/dataupload/utils/HttpUtils.java index f20e78f..c014628 100644 --- a/src/main/java/com/hxjt/dataupload/utils/HttpUtils.java +++ b/src/main/java/com/hxjt/dataupload/utils/HttpUtils.java @@ -271,7 +271,7 @@ public class HttpUtils { httpPost.setHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)"); httpPost.setHeader("entId","ningyanghuagongchany"); httpPost.setHeader("keyAuthentication",keyAuthentication); - System.out.println("请求地址："+url); + //System.out.println("请求地址："+url); //执行请求操作，并拿到结果（同步阻塞） CloseableHttpResponse response = client.execute(httpPost); //获取结果实体 diff --git a/src/main/resources/mapper/FxfxdxMapper.xml b/src/main/resources/mapper/FxfxdxMapper.xml index 91a509e..718a6b0 100644 --- a/src/main/resources/mapper/FxfxdxMapper.xml +++ b/src/main/resources/mapper/FxfxdxMapper.xml @@ -195,6 +195,12 @@ -- 左连接账户表 LEFT JOIN PF_ACCOUNT h ON a.CREATOR = h.id WHERE - a.ISDELETE = 'N'; + a.ISDELETE = 'N' + + AND a.CREASTAMP BETWEEN + DATEADD(DAY, -90, CAST(SYSDATETIME() AS date)) AND + DATEADD(DAY, -1, CAST(SYSDATETIME() AS datetime2(6))) + + ORDER BY jilushijian DESC \ No newline at end of file