From 15b22b135e4708da28a621112e43e1cfd1a3eee1 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 15 六月 2023 09:17:59 +0800
Subject: [PATCH] fix(quartz): 1.站点增加字段cpbdLoadDt 2.调整站点接口
---
src/main/java/com/integrated/zyyt/ZyytConstant.java | 7 +
src/main/java/com/integrated/zyyt/enetity/StationInfo.java | 3 +
src/main/java/com/integrated/zyyt/service/ZyytService.java | 120 ++++++++++++++++++++++-----------------
src/main/resources/application.yml | 2
4 files changed, 77 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/integrated/zyyt/ZyytConstant.java b/src/main/java/com/integrated/zyyt/ZyytConstant.java
index e4fd78a..6d016d9 100644
--- a/src/main/java/com/integrated/zyyt/ZyytConstant.java
+++ b/src/main/java/com/integrated/zyyt/ZyytConstant.java
@@ -37,9 +37,12 @@
public static String X_EOS_SOURCESYSKEY_DJTJB = "ff13e98f32fd4cbeaa66b10278a20f19";
//3.锛氱珯鐐逛俊鎭〃 STATIONINFO
- public static String URL_STATIONINFO_QUERY = IP_PORT + "/api/sql-services/ZYE_ZYET_STATIONINFO/query";
+ /*public static String URL_STATIONINFO_QUERY = IP_PORT + "/api/sql-services/ZYE_ZYET_STATIONINFO/query";
public static String CLIENT_STATIONINFO = "6ffbdfb52cfb481f913608b4e6e99538";
public static String SECRET_STATIONINFO = "3288ffdb0d5041c0b61885010d1ef2ad";
+ public static String X_EOS_SOURCESYSKEY_STATIONINFO = "ff13e98f32fd4cbeaa66b10278a20f19";*/
+ public static String URL_STATIONINFO_QUERY = "https://10.225.71.10:9092/api/sql-services/NtdAPgZYysvNFut3WxDgQ/query";
+ public static String CLIENT_STATIONINFO = "ebe574afde8f409bbd5204d79272c939";
+ public static String SECRET_STATIONINFO = "900c4d8df2c14c9899497902655f1107";
public static String X_EOS_SOURCESYSKEY_STATIONINFO = "ff13e98f32fd4cbeaa66b10278a20f19";
-
}
diff --git a/src/main/java/com/integrated/zyyt/enetity/StationInfo.java b/src/main/java/com/integrated/zyyt/enetity/StationInfo.java
index 27f479d..f0ab384 100644
--- a/src/main/java/com/integrated/zyyt/enetity/StationInfo.java
+++ b/src/main/java/com/integrated/zyyt/enetity/StationInfo.java
@@ -42,6 +42,9 @@
@ApiModelProperty("鑷彁鐐圭紪鍙�")
private String vJgbh;
+ @ApiModelProperty("鏁版嵁鏇存柊鍔犺浇鏃ユ湡锛�")
+ private Date cpbdLoadDt;
+
@ApiModelProperty("鑷彁鐐瑰悕绉�")
private String vJgmc;
diff --git a/src/main/java/com/integrated/zyyt/service/ZyytService.java b/src/main/java/com/integrated/zyyt/service/ZyytService.java
index bac63d1..ff28ec4 100644
--- a/src/main/java/com/integrated/zyyt/service/ZyytService.java
+++ b/src/main/java/com/integrated/zyyt/service/ZyytService.java
@@ -41,7 +41,8 @@
}
Zyyt<StationInfo> stationInfoService = ZyytUtil.getBusinessEntity("STATIONINFO", yestDay);
- String exeSql = "merge into STATIONINFO A USING" + " (select ? V_JGBH from dual ) C " + "ON(A.V_JGBH=C.V_JGBH) " + "when matched then " + "update SET A.V_SFMC=?,A.V_SFDM=?,A.V_DSDM=?,A.V_DSMC=?,A.V_QXDM=?,A.V_XSMC=?,A.V_TDJGBH=?,A.V_TDJGMC=?,A.V_JGMC=?,A.V_LXRXM=?,A.V_LXDH=?,A.V_SJHM=?,A.V_LXDZ=?,A.ISCOUNTRY=?,A.C_WDLX =?,A.C_YZBM=?,A.V_YYWDBH=?,A.V_YYWDMC=?,A.V_GPSJD=?,A.V_GPSWD=?,A.YLGZDID =?,A.YLGZDMC=?,A.V_STATUS=?,A.D_SQRQ=?,A.D_SPRQ=?" + "when not matched then " + "insert(A.V_SFMC,A.V_SFDM,A.V_DSDM,A.V_DSMC,A.V_QXDM,A.V_XSMC,A.V_TDJGBH,A.V_TDJGMC,A.V_JGBH,A.V_JGMC,A.V_LXRXM,A.V_LXDH,A.V_SJHM,A.V_LXDZ,A.ISCOUNTRY,A.C_WDLX ,A.C_YZBM,A.V_YYWDBH,A.V_YYWDMC,A.V_GPSJD,A.V_GPSWD,A.YLGZDID ,A.YLGZDMC,A.V_STATUS,A.D_SQRQ,A.D_SPRQ) values " + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+// String exeSql = "merge into STATIONINFO A USING" + " (select ? V_JGBH from dual ) C " + "ON(A.V_JGBH=C.V_JGBH) " + "when matched then " + "update SET A.V_SFMC=?,A.V_SFDM=?,A.V_DSDM=?,A.V_DSMC=?,A.V_QXDM=?,A.V_XSMC=?,A.V_TDJGBH=?,A.V_TDJGMC=?,A.V_JGMC=?,A.V_LXRXM=?,A.V_LXDH=?,A.V_SJHM=?,A.V_LXDZ=?,A.ISCOUNTRY=?,A.C_WDLX =?,A.C_YZBM=?,A.V_YYWDBH=?,A.V_YYWDMC=?,A.V_GPSJD=?,A.V_GPSWD=?,A.YLGZDID =?,A.YLGZDMC=?,A.V_STATUS=?,A.D_SQRQ=?,A.D_SPRQ=?" + "when not matched then " + "insert(A.V_SFMC,A.V_SFDM,A.V_DSDM,A.V_DSMC,A.V_QXDM,A.V_XSMC,A.V_TDJGBH,A.V_TDJGMC,A.V_JGBH,A.V_JGMC,A.V_LXRXM,A.V_LXDH,A.V_SJHM,A.V_LXDZ,A.ISCOUNTRY,A.C_WDLX ,A.C_YZBM,A.V_YYWDBH,A.V_YYWDMC,A.V_GPSJD,A.V_GPSWD,A.YLGZDID ,A.YLGZDMC,A.V_STATUS,A.D_SQRQ,A.D_SPRQ) values " + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+ String exeSql = "merge into STATIONINFO A USING" + " (select ? V_JGBH, ? CPBD_LOAD_DT from dual ) C " + "ON(A.V_JGBH=C.V_JGBH) " + "when matched then " + "update SET A.CPBD_LOAD_DT=?, A.V_SFMC=?,A.V_SFDM=?,A.V_DSDM=?,A.V_DSMC=?,A.V_QXDM=?,A.V_XSMC=?,A.V_TDJGBH=?,A.V_TDJGMC=?,A.V_JGMC=?,A.V_LXRXM=?,A.V_LXDH=?,A.V_SJHM=?,A.V_LXDZ=?,A.ISCOUNTRY=?,A.C_WDLX =?,A.C_YZBM=?,A.V_YYWDBH=?,A.V_YYWDMC=?,A.V_GPSJD=?,A.V_GPSWD=?,A.YLGZDID =?,A.YLGZDMC=?,A.V_STATUS=?,A.D_SQRQ=?,A.D_SPRQ=? where A.CPBD_LOAD_DT < C.CPBD_LOAD_DT " + "when not matched then " + "insert(A.V_SFMC,A.V_SFDM,A.V_DSDM,A.V_DSMC,A.V_QXDM,A.V_XSMC,A.V_TDJGBH,A.V_TDJGMC,A.V_JGBH,A.V_JGMC,A.V_LXRXM,A.V_LXDH,A.V_SJHM,A.V_LXDZ,A.ISCOUNTRY,A.C_WDLX ,A.C_YZBM,A.V_YYWDBH,A.V_YYWDMC,A.V_GPSJD,A.V_GPSWD,A.YLGZDID ,A.YLGZDMC,A.V_STATUS,A.D_SQRQ,A.D_SPRQ,A.CPBD_LOAD_DT) values " + "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
Long recordId = stationInfoService.insertRecord("STATIONINFO", batchNo);
Long totalSize = 0L;
@@ -87,67 +88,78 @@
// log.info("stationInfo==> {}", JSON.toJSONString(stationInfo));
ps.setString(1, stationInfo.getVJgbh());
+ // 6.14鏂板
+ // 鏌ヨ鐢�
+ ps.setDate(2, stationInfo.getCpbdLoadDt() == null ? null :
+ new Date(stationInfo.getCpbdLoadDt().getTime()));
+ // 鏇存柊鐢�
+ ps.setDate(3, stationInfo.getCpbdLoadDt() == null ? null :
+ new Date(stationInfo.getCpbdLoadDt().getTime()));
- ps.setString(2, stationInfo.getVSfmc());
- ps.setString(3, stationInfo.getVSfdm());
- ps.setString(4, stationInfo.getVDsdm());
- ps.setString(5, stationInfo.getVDsmc());
- ps.setString(6, stationInfo.getVQxdm());
- ps.setString(7, stationInfo.getVXsmc());
- ps.setString(8, stationInfo.getVTdjgbh());
- ps.setString(9, stationInfo.getVTdjgmc());
- ps.setString(10, stationInfo.getVJgmc());
- ps.setString(11, stationInfo.getVLxrxm());
- ps.setString(12, stationInfo.getVLxdh());
- ps.setString(13, stationInfo.getVSjhm());
- ps.setString(14, stationInfo.getVLxdz());
- ps.setString(15, stationInfo.getIscountry());
- ps.setShort(16, stationInfo.getCWdlx());
- ps.setString(17, stationInfo.getCYzbm());
- ps.setString(18, stationInfo.getVYywdbh());
- ps.setString(19, stationInfo.getVYywdmc());
- ps.setString(20, stationInfo.getVGpsjd());
- ps.setString(21, stationInfo.getVGpswd());
- ps.setString(22, stationInfo.getYlgzdid());
- ps.setString(23, stationInfo.getYlgzdmc());
- ps.setString(24, stationInfo.getVStatus());
+ ps.setString(4, stationInfo.getVSfmc());
+ ps.setString(5, stationInfo.getVSfdm());
+ ps.setString(6, stationInfo.getVDsdm());
+ ps.setString(7, stationInfo.getVDsmc());
+ ps.setString(8, stationInfo.getVQxdm());
+ ps.setString(9, stationInfo.getVXsmc());
+ ps.setString(10, stationInfo.getVTdjgbh());
+ ps.setString(11, stationInfo.getVTdjgmc());
+ ps.setString(12, stationInfo.getVJgmc());
+ ps.setString(13, stationInfo.getVLxrxm());
+ ps.setString(14, stationInfo.getVLxdh());
+ ps.setString(15, stationInfo.getVSjhm());
+ ps.setString(16, stationInfo.getVLxdz());
+ ps.setString(17, stationInfo.getIscountry());
+ ps.setShort(18, stationInfo.getCWdlx());
+ ps.setString(19, stationInfo.getCYzbm());
+ ps.setString(20, stationInfo.getVYywdbh());
+ ps.setString(21, stationInfo.getVYywdmc());
+ ps.setString(22, stationInfo.getVGpsjd());
+ ps.setString(23, stationInfo.getVGpswd());
+ ps.setString(24, stationInfo.getYlgzdid());
+ ps.setString(25, stationInfo.getYlgzdmc());
+ ps.setString(26, stationInfo.getVStatus());
// ps.setDate(25, new Date(stationInfo.getDSqrq().getTime()));
- ps.setDate(25,
+ ps.setDate(27,
stationInfo.getDSqrq() == null ? null :
new Date(stationInfo.getDSqrq().getTime()));
// ps.setString(25, stationInfo.getDSqrq());
// ps.setString(26, stationInfo.getDSprq());
- ps.setDate(26, stationInfo.getDSprq() == null ? null :
+ ps.setDate(28, stationInfo.getDSprq() == null ? null :
new Date(stationInfo.getDSprq().getTime()));
- ps.setString(27, stationInfo.getVSfmc());
- ps.setString(28, stationInfo.getVSfdm());
- ps.setString(29, stationInfo.getVDsdm());
- ps.setString(30, stationInfo.getVDsmc());
- ps.setString(31, stationInfo.getVQxdm());
- ps.setString(32, stationInfo.getVXsmc());
- ps.setString(33, stationInfo.getVTdjgbh());
- ps.setString(34, stationInfo.getVTdjgmc());
- ps.setString(35, stationInfo.getVJgbh());
- ps.setString(36, stationInfo.getVJgmc());
- ps.setString(37, stationInfo.getVLxrxm());
- ps.setString(38, stationInfo.getVLxdh());
- ps.setString(39, stationInfo.getVSjhm());
- ps.setString(40, stationInfo.getVLxdz());
- ps.setString(41, stationInfo.getIscountry());
- ps.setShort(42, stationInfo.getCWdlx());
- ps.setString(43, stationInfo.getCYzbm());
- ps.setString(44, stationInfo.getVYywdbh());
- ps.setString(45, stationInfo.getVYywdmc());
- ps.setString(46, stationInfo.getVGpsjd());
- ps.setString(47, stationInfo.getVGpswd());
- ps.setString(48, stationInfo.getYlgzdid());
- ps.setString(49, stationInfo.getYlgzdmc());
- ps.setString(50, stationInfo.getVStatus());
+ ps.setString(29, stationInfo.getVSfmc());
+ ps.setString(30, stationInfo.getVSfdm());
+ ps.setString(31, stationInfo.getVDsdm());
+ ps.setString(32, stationInfo.getVDsmc());
+ ps.setString(33, stationInfo.getVQxdm());
+ ps.setString(34, stationInfo.getVXsmc());
+ ps.setString(35, stationInfo.getVTdjgbh());
+ ps.setString(36, stationInfo.getVTdjgmc());
+ ps.setString(37, stationInfo.getVJgbh());
+ ps.setString(38, stationInfo.getVJgmc());
+ ps.setString(39, stationInfo.getVLxrxm());
+ ps.setString(40, stationInfo.getVLxdh());
+ ps.setString(41, stationInfo.getVSjhm());
+ ps.setString(42, stationInfo.getVLxdz());
+ ps.setString(43, stationInfo.getIscountry());
+ ps.setShort(44, stationInfo.getCWdlx());
+ ps.setString(45, stationInfo.getCYzbm());
+ ps.setString(46, stationInfo.getVYywdbh());
+ ps.setString(47, stationInfo.getVYywdmc());
+ ps.setString(48, stationInfo.getVGpsjd());
+ ps.setString(49, stationInfo.getVGpswd());
+ ps.setString(50, stationInfo.getYlgzdid());
+ ps.setString(51, stationInfo.getYlgzdmc());
+ ps.setString(52, stationInfo.getVStatus());
// ps.setString(51, stationInfo.getDSqrq());
- ps.setDate(51, stationInfo.getDSqrq() == null ? null : new Date(stationInfo.getDSqrq().getTime()));
+ ps.setDate(53, stationInfo.getDSqrq() == null ? null : new Date(stationInfo.getDSqrq().getTime()));
- ps.setDate(52, stationInfo.getDSprq() == null ? null : new Date(stationInfo.getDSprq().getTime()));
+ ps.setDate(54, stationInfo.getDSprq() == null ? null : new Date(stationInfo.getDSprq().getTime()));
+
+ //6.14鏂板 insert鐢�
+ ps.setDate(55, stationInfo.getCpbdLoadDt() == null ? null :
+ new Date(stationInfo.getCpbdLoadDt().getTime()));
}
@Override
@@ -164,7 +176,11 @@
stationInfoService.updateRecord(recordId, 1, 0L, e.getMessage());
return;
}
+ //璇曡瘯浠ｇ爜
+// break;
}
+ //璇曡瘯浠ｇ爜
+// break;
}
} catch (Exception e) {
log.error(e.getMessage());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 100736c..b338654 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,7 +2,7 @@
mvc:
static-path-pattern: /static # 璁剧疆闈欐�佹枃浠惰矾寰勶紝js,css绛�
profiles:
- active: dev
+ active: prod
http:
encoding:
charset: UTF-8
--
Gitblit v1.9.1