请求时间更改

meter-reading-suntront/pom.xml

@@ -15,6 +15,7 @@
     <description>新天抄表对接</description>
     <properties>
         <java.version>1.8</java.version>
+        <skipTests>true</skipTests>
     </properties>
     <dependencies>
         <dependency>

meter-reading-suntront/src/main/java/com/zoniot/suntront/service/impl/ReadingMeterServiceImpl.java

@@ -53,7 +53,7 @@ public class ReadingMeterServiceImpl implements ReadingMeterService {
 
     @Override
     public void executeReadingMeter() {
-        String timeStamp=new SimpleDateFormat("yyyyMMddHHmmss").format(new Date(System.currentTimeMillis()));
+
         Integer date = Integer.valueOf(LocalDate.now().plusDays(-1).format(DateTimeFormatter.ofPattern("yyyyMMdd")));
 
         List<MeterReadRecord> list = repository.findByCustomerIdAndReadDateAndReadStatus(customerId,date,"2");
@@ -70,7 +70,8 @@ public class ReadingMeterServiceImpl implements ReadingMeterService {
                 data.setReadDate(new Date());
                 data.setMeterTime(meterReadRecord.getReadTime());
                 data.setValveState(convertValveState(meterReadRecord.getValveState()));
-                request(data,timeStamp);
+
+                request(data);
             }
 
         }
@@ -103,8 +104,10 @@ public class ReadingMeterServiceImpl implements ReadingMeterService {
         return null;
     }
 
-    private void request(FileData data,String timeStamp){
+    private void request(FileData data){
 
+        String timeStamp=new SimpleDateFormat("yyyyMMddHHmmss").format(new Date(System.currentTimeMillis()));
+        System.out.println(timeStamp);
 
         String tokenUrl = apiUrl + "/api/meters/UploadData";
         HttpHeaders headers = new HttpHeaders();

meter-reading-suntront/src/main/resources/application-dev.properties

@@ -25,11 +25,11 @@ logging.file.path=C:/logs/reading-meter
 #spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
 # mybatis_config
-mybatis.mapper-locations=classpath*:mapper/*.xml
-mybatis.type-aliases-package=com.bz.smart_city.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis.configuration.use-column-label=true
+#mybatis.mapper-locations=classpath*:mapper/*.xml
+#mybatis.type-aliases-package=com.bz.smart_city.entity
+#mybatis.configuration.map-underscore-to-camel-case=true
+#mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis.configuration.use-column-label=true
 
 spring.jackson.time-zone=GMT+8
 

meter-reading-suntront/src/main/resources/application-prd.properties

@@ -1,43 +1,43 @@
 spring.application.name=reading-meter
 server.servlet.context-path=/api
-server.port=9002
+server.port=9011
 logging.level.root=info
-logging.file.path=/home/test/intergration/bozhou/logs
+logging.file.path=/home/app/prd/meter-reading-suntront/logs
 
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=100Zone@123
-spring.datasource.druid.initial-size=5
-spring.datasource.druid.min-idle=5
-spring.datasource.druid.max-active=20
-spring.datasource.druid.max-wait=60000
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-spring.datasource.druid.min-evictable-idle-time-millis=300000
-spring.datasource.druid.validation-query=SELECT 1
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=true
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.pool-prepared-statements=true
-spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
-spring.datasource.druid.filters=stat,wall
-spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#spring.datasource.url=jdbc:mysql://47.112.217.10:3306/smart_city?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+#spring.datasource.username=root
+#spring.datasource.password=100Zone@123
+#spring.datasource.druid.initial-size=5
+#spring.datasource.druid.min-idle=5
+#spring.datasource.druid.max-active=20
+#spring.datasource.druid.max-wait=60000
+#spring.datasource.druid.time-between-eviction-runs-millis=60000
+#spring.datasource.druid.min-evictable-idle-time-millis=300000
+#spring.datasource.druid.validation-query=SELECT 1
+#spring.datasource.druid.test-while-idle=true
+#spring.datasource.druid.test-on-borrow=true
+#spring.datasource.druid.test-on-return=false
+#spring.datasource.druid.pool-prepared-statements=true
+#spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+#spring.datasource.druid.filters=stat,wall
+#spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
 # mybatis_config
-mybatis.mapper-locations=classpath*:mapper/*.xml
-mybatis.type-aliases-package=com.bz.smart_city.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis.configuration.use-column-label=true
+#mybatis.mapper-locations=classpath*:mapper/*.xml
+#mybatis.type-aliases-package=com.bz.smart_city.entity
+#mybatis.configuration.map-underscore-to-camel-case=true
+#mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis.configuration.use-column-label=true
 
 spring.jackson.time-zone=GMT+8
 
-customerId=46
+customerId=33
 
-apiUrl=http://218.29.74.138:15383
-appId=hx123
-appSecret=1842e6e6725c5589
+apiUrl=http://36.99.140.93:8408
+appId=E9E1EE65
+appSecret=87589815-C4CC-483E-9645-F4FD493BAFDA
 
 #mongodb url
 spring.data.mongodb.uri=mongodb://water:zcxk100@114.135.61.189:27071/meter-reading-database?authSource=meter-reading-database

meter-reading-suntront/src/main/resources/application-sit.properties

@@ -4,32 +4,32 @@ server.port=9002
 logging.level.root=info
 logging.file.path=/home/test/intergration/bozhou/logs
 
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=100Zone@123
-spring.datasource.druid.initial-size=5
-spring.datasource.druid.min-idle=5
-spring.datasource.druid.max-active=20
-spring.datasource.druid.max-wait=60000
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-spring.datasource.druid.min-evictable-idle-time-millis=300000
-spring.datasource.druid.validation-query=SELECT 1
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=true
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.pool-prepared-statements=true
-spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
-spring.datasource.druid.filters=stat,wall
-spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#spring.datasource.url=jdbc:mysql://114.135.61.188:33306/smart_city_sit_6_10?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull
+#spring.datasource.username=root
+#spring.datasource.password=100Zone@123
+#spring.datasource.druid.initial-size=5
+#spring.datasource.druid.min-idle=5
+#spring.datasource.druid.max-active=20
+#spring.datasource.druid.max-wait=60000
+#spring.datasource.druid.time-between-eviction-runs-millis=60000
+#spring.datasource.druid.min-evictable-idle-time-millis=300000
+#spring.datasource.druid.validation-query=SELECT 1
+#spring.datasource.druid.test-while-idle=true
+#spring.datasource.druid.test-on-borrow=true
+#spring.datasource.druid.test-on-return=false
+#spring.datasource.druid.pool-prepared-statements=true
+#spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
+#spring.datasource.druid.filters=stat,wall
+#spring.datasource.druid.connection-properties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 
 # mybatis_config
-mybatis.mapper-locations=classpath*:mapper/*.xml
-mybatis.type-aliases-package=com.bz.smart_city.entity
-mybatis.configuration.map-underscore-to-camel-case=true
-mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis.configuration.use-column-label=true
+#mybatis.mapper-locations=classpath*:mapper/*.xml
+#mybatis.type-aliases-package=com.bz.smart_city.entity
+#mybatis.configuration.map-underscore-to-camel-case=true
+#mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis.configuration.use-column-label=true
 
 spring.jackson.time-zone=GMT+8
 

meter-reading-suntront/src/main/resources/application.properties

@@ -1,2 +1,2 @@
 #开发环境：dev  测试环境：sit  线上环境：prd  演示环境：uat
-spring.profiles.active=dev
+spring.profiles.active=prd