定时计划修改

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/config/SqlServerDataSourceConfig.java

@@ -16,11 +16,11 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 
 import javax.sql.DataSource;
 
-//@Configuration
-//@MapperScan(basePackages = "com.zcxk.dao.sqlserver", sqlSessionTemplateRef  = "sqlServerSqlSessionTemplate")
+@Configuration
+@MapperScan(basePackages = "com.zcxk.dao.sqlserver", sqlSessionTemplateRef  = "sqlServerSqlSessionTemplate")
 public class SqlServerDataSourceConfig {
 
-   /* @Bean(name = "sqlServerDataSource")
+    @Bean(name = "sqlServerDataSource")
     @ConfigurationProperties(prefix = "spring.datasource.sqlsever")
     @Primary
     public DataSource testDataSource() {
@@ -46,6 +46,6 @@ public class SqlServerDataSourceConfig {
     @Primary
     public SqlSessionTemplate testSqlSessionTemplate(@Qualifier("sqlServerSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {
         return new SqlSessionTemplate(sqlSessionFactory);
-    }*/
+    }
 }
 

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/controller/DemoController.java

@@ -16,13 +16,15 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @RestController
 public class DemoController {
-    //@Autowired
+    @Autowired
     ReceiveDao receiveDao;
     @Autowired
     SendDao sendDao;
@@ -112,12 +114,13 @@ public class DemoController {
                    Map<String,Object>args=new HashMap<>();
 
                    List<MeterDataEntity>datas=new ArrayList<>();
-                   SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-dd-MM HH:mm:ss");
-                   String uplaodTime= (String) map.get("UploadTime");
-                   Date time=simpleDateFormat.parse(uplaodTime);
-                   Date needUploadTime=new Date(time.getTime()-24*3600*1000);
-                   SimpleDateFormat needUploadDateFormate=new SimpleDateFormat("yyyyddMM");
-                   int needUploadTimeDate = Integer.parseInt(needUploadDateFormate.format(needUploadTime));
+                   SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                   Date date= (Date) map.get("UploadTime");
+                   LocalDateTime time=dateToLocateDateTime(date);
+
+                   String needUploadTime = time.plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+                    //LocalDateTime ldt = LocalDateTime.parse("2017-09-28 17:07:05",df);
+                   int needUploadTimeDate = Integer.parseInt(needUploadTime);
                    args.put("readDate",needUploadTimeDate);
                    args.put("customerId",customerId);
                    List<MeterReadRecord> meterReadRecords = sendDao.selectDeviceMeterReader(args);
@@ -129,12 +132,14 @@ public class DemoController {
                        datas.add(meterDataEntity);
                    });
 
+                   if(datas.size()>0){
+                       UploadWaterMeterDataEntity uploadWaterMeterDataEntity=new UploadWaterMeterDataEntity();
+                       uploadWaterMeterDataEntity.setTaskId(taskEntity.getTaskId());
+                       uploadWaterMeterDataEntity.setMeterData(datas);
+                       receiveDao.meterDataInsert(uploadWaterMeterDataEntity);
+                       System.out.println(1);
+                   }
 
-                   UploadWaterMeterDataEntity uploadWaterMeterDataEntity=new UploadWaterMeterDataEntity();
-                   uploadWaterMeterDataEntity.setTaskId(taskEntity.getTaskId());
-                   uploadWaterMeterDataEntity.setMeterData(datas);
-                   receiveDao.meterDataInsert(uploadWaterMeterDataEntity);
-                   System.out.println(1);
                }catch (Exception e){
                    e.printStackTrace();
                }
@@ -143,6 +148,11 @@ public class DemoController {
 
         });
     }
+    private  LocalDateTime dateToLocateDateTime(Date date) {
+        Instant instant = date.toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+        return LocalDateTime.ofInstant(instant, zoneId);
+    }
     @GetMapping("/addJob")
     public void addJob(){
 

meter-reading-sishui/read-sqlSever/src/main/java/com/zcxk/entity/MeterReadRecord.java

@@ -13,7 +13,6 @@ import java.util.Date;
  * @since 2021-01-06 09:51:24
  */
 @Data
-
 public class MeterReadRecord implements Serializable {
     private static final long serialVersionUID = -87696822649581957L;
     /**

meter-reading-sishui/read-sqlSever/src/main/resources/mysql-mapper/SendDao.xml

@@ -23,7 +23,7 @@
         </foreach>
     </insert>
     <select id="selectDeviceMeterReader" resultType="com.zcxk.entity.MeterReadRecord">
-      select device_no,read_time,read_data from sc_meter_read_record where customer_id=#{customerId}
+      select device_no deviceNo,read_time readTime,read_data readDatafrom sc_meter_read_record where customer_id=#{customerId}
       and read_date=#{readDate}
     </select>
     <select id="selectDevice" resultType="string">