integrated/zyyt.git

			@@ -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;
			@@ -86,65 +87,79 @@
			StationInfo stationInfo = stationInfoListCopy.get(i);
			// log.info("stationInfo==> {}", JSON.toJSONString(stationInfo));

			ps.setObject(1, stationInfo.getVJgbh());
			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.setObject(2, stationInfo.getVSfmc());
			ps.setObject(3, stationInfo.getVSfdm());
			ps.setObject(4, stationInfo.getVDsdm());
			ps.setObject(5, stationInfo.getVDsmc());
			ps.setObject(6, stationInfo.getVQxdm());
			ps.setObject(7, stationInfo.getVXsmc());
			ps.setObject(8, stationInfo.getVTdjgbh());
			ps.setObject(9, stationInfo.getVTdjgmc());
			ps.setObject(10, stationInfo.getVJgmc());
			ps.setObject(11, stationInfo.getVLxrxm());
			ps.setObject(12, stationInfo.getVLxdh());
			ps.setObject(13, stationInfo.getVSjhm());
			ps.setObject(14, stationInfo.getVLxdz());
			ps.setObject(15, stationInfo.getIscountry());
			ps.setObject(16, stationInfo.getCWdlx());
			ps.setObject(17, stationInfo.getCYzbm());
			ps.setObject(18, stationInfo.getVYywdbh());
			ps.setObject(19, stationInfo.getVYywdmc());
			ps.setObject(20, stationInfo.getVGpsjd());
			ps.setObject(21, stationInfo.getVGpswd());
			ps.setObject(22, stationInfo.getYlgzdid());
			ps.setObject(23, stationInfo.getYlgzdmc());
			ps.setObject(24, stationInfo.getVStatus());
			ps.setDate(25, new Date(stationInfo.getDSqrq().getTime()));
			// ps.setObject(25, stationInfo.getDSqrq());
			// ps.setObject(26, stationInfo.getDSprq());
			ps.setDate(26, new Date(stationInfo.getDSprq().getTime()));
			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(27,
			stationInfo.getDSqrq() == null ? null :
			new Date(stationInfo.getDSqrq().getTime()));
			// ps.setString(25, stationInfo.getDSqrq());
			// ps.setString(26, stationInfo.getDSprq());
			ps.setDate(28, stationInfo.getDSprq() == null ? null :
			new Date(stationInfo.getDSprq().getTime()));

			ps.setObject(27, stationInfo.getVSfmc());
			ps.setObject(28, stationInfo.getVSfdm());
			ps.setObject(29, stationInfo.getVDsdm());
			ps.setObject(30, stationInfo.getVDsmc());
			ps.setObject(31, stationInfo.getVQxdm());
			ps.setObject(32, stationInfo.getVXsmc());
			ps.setObject(33, stationInfo.getVTdjgbh());
			ps.setObject(34, stationInfo.getVTdjgmc());
			ps.setObject(35, stationInfo.getVJgbh());
			ps.setObject(36, stationInfo.getVJgmc());
			ps.setObject(37, stationInfo.getVLxrxm());
			ps.setObject(38, stationInfo.getVLxdh());
			ps.setObject(39, stationInfo.getVSjhm());
			ps.setObject(40, stationInfo.getVLxdz());
			ps.setObject(41, stationInfo.getIscountry());
			ps.setObject(42, stationInfo.getCWdlx());
			ps.setObject(43, stationInfo.getCYzbm());
			ps.setObject(44, stationInfo.getVYywdbh());
			ps.setObject(45, stationInfo.getVYywdmc());
			ps.setObject(46, stationInfo.getVGpsjd());
			ps.setObject(47, stationInfo.getVGpswd());
			ps.setObject(48, stationInfo.getYlgzdid());
			ps.setObject(49, stationInfo.getYlgzdmc());
			ps.setObject(50, stationInfo.getVStatus());
			// ps.setObject(51, stationInfo.getDSqrq());
			ps.setDate(51, new Date(stationInfo.getDSqrq().getTime()));
			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(53, stationInfo.getDSqrq() == null ? null : new Date(stationInfo.getDSqrq().getTime()));

			ps.setObject(52, stationInfo.getDSprq());
			ps.setDate(52, 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
			@@ -161,7 +176,11 @@
			stationInfoService.updateRecord(recordId, 1, 0L, e.getMessage());
			return;
			}
			//试试代码
			// break;
			}
			//试试代码
			// break;
			}
			} catch (Exception e) {
			log.error(e.getMessage());
			@@ -279,8 +298,7 @@
			item.getReserved2(),
			item.getReserved3(),
			item.getReserved4(),
			item.getBatchNo()
			});
			batchNo});
			});
			jdbcTemplate.batchUpdate(batchInsertSql, insertShkdrbList);
			} catch (Exception e) {
			@@ -376,7 +394,7 @@
			item.getNSjzje(),
			item.getNTksr(),
			item.getNBksr(),
			item.getBatchNo()
			batchNo
			});
			});
			jdbcTemplate.batchUpdate(batchInsertSql, insertShkdrbList);