汇川

src/main/java/com/zcxk/meterreadingsystemv2/kafka/AddAccountReceiver.java

@@ -166,12 +166,12 @@ public class AddAccountReceiver {
                             Ycblhb ycblhb = new Ycblhb();
                             ycblhb.setYhdz(acceptListData.getBuildingName() + acceptListData.getLocation());
                             ycblhb.setSbdz(acceptListData.getBuildingName() + acceptListData.getLocation());
-                            ycblhb.setBc("001");
+                            ycblhb.setBc("HC0112YCB");
                             ycblhb.setBsm(acceptListData.getWaterMeterNo());
                             ycblhb.setZdsj("0101");
                             ycblhb.setYys("020101");
                             ycblhb.setBw(acceptListData.getBuildingName() + acceptListData.getLocation());
-                            ycblhb.setBxh("4");
+                            ycblhb.setBxh("2");
                             //ycblhb.setBqds(acceptListData.getReadData());
                             ycblhb.setBqds(BigDecimal.ZERO);
                             ycblhb.setNhrq(acceptListData.getInstallTime());

src/main/java/com/zcxk/meterreadingsystemv2/scheduled/MeterReadingScheduleTask.java

@@ -3,6 +3,7 @@ package com.zcxk.meterreadingsystemv2.scheduled;
 import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.zcxk.meterreadingsystemv2.common.DateTimeUtil;
+import com.zcxk.meterreadingsystemv2.common.Jdk8DateUtils;
 import com.zcxk.meterreadingsystemv2.dao.*;
 import com.zcxk.meterreadingsystemv2.dbs.DynamicDataSourceContextHolder;
 import com.zcxk.meterreadingsystemv2.entity.*;
@@ -905,7 +906,7 @@ public class MeterReadingScheduleTask {
     /**
      * 汇川 每天
      */
-    @Scheduled(cron = "0 57 7 */1 * ?")
+    @Scheduled(cron = "0 0 4 */1 * ?")
     public void huichuanTasks() {
         log.info("开始执行汇川定时任务");
         if(!"prd".equals(active)){
@@ -923,7 +924,12 @@ public class MeterReadingScheduleTask {
 
         //Integer startDate = Integer.valueOf(LocalDateTime.now().plusMonths(-1).plusDays(-1).with(TemporalAdjusters.lastDayOfMonth()).format(DateTimeFormatter.ofPattern(DateTimeUtil.DATE_FORMAT)));
         endDate = Integer.valueOf(LocalDateTime.now().plusDays(-1).format(DateTimeFormatter.ofPattern(DateTimeUtil.DATE_FORMAT)));
+        /*startDate = 20210515;
+        endDate = 20210516;
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime ldt = LocalDateTime.parse("2021-05-17 04:00:00",df);
 
+        Date date = Jdk8DateUtils.getLocalDateTimeToDate(ldt);*/
         AtomicInteger count = new AtomicInteger(0);
 
         try {

src/main/java/com/zcxk/meterreadingsystemv2/service/MssqlService.java

@@ -96,12 +96,12 @@ public class MssqlService {
                 Ycblhb ycblhb = new Ycblhb();
                 ycblhb.setYhdz(info.getBuildingName() + info.getLocation());
                 ycblhb.setSbdz(info.getBuildingName() + info.getLocation());
-                ycblhb.setBc("001");
+                ycblhb.setBc("HC0112YCB");
                 ycblhb.setBsm(info.getWaterMeterNo());
                 ycblhb.setZdsj("0101");//汇川0101
                 ycblhb.setYys("020101");
                 ycblhb.setBw(info.getBuildingName() + info.getLocation());
-                ycblhb.setBxh("4");
+                ycblhb.setBxh("2");
                 //ycblhb.setBqds(acceptListData.getReadData());
                 ycblhb.setBqds(BigDecimal.ZERO);
                 ycblhb.setNhrq(info.getInstallTime());

src/main/resources/application-prd.properties

@@ -83,6 +83,15 @@ db.jingyang.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
 db.jingyang.username=xdycb_zs
 db.jingyang.password=whxdkj
 
+
+#汇川oracle
+db.huichuan.driver-class-name=oracle.jdbc.OracleDriver
+db.huichuan.type=com.alibaba.druid.pool.DruidDataSource
+db.huichuan.url=jdbc:oracle:thin:@//101.200.189.198:1521/xdkjys
+db.huichuan.username=xdycb_zs
+db.huichuan.password=whxdkj
+
+
 #监利sql server
 db.jl.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
 db.jl.type=com.alibaba.druid.pool.DruidDataSource