Merge remote-tracking branch 'origin/20200908' into 20200908

smart-city-platform/src/main/java/com/bz/smart_city/commom/security/smsCode/SmsCodeCheckUserFilter.java

@@ -53,25 +53,25 @@ public class SmsCodeCheckUserFilter extends OncePerRequestFilter {
         if(StringUtils.equals("dev",active)){
             return;
         }
-        if(StringUtils.equals("sit",active)){
+        if(StringUtils.equals("sit",active) && StringUtils.equals(smsCode,"8090")){
             return;
         }
-        if (StringUtils.equals(mobile, "18800000001") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "18800000001") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "18800000008") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "18800000008") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "18800000009") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "18800000009") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "13265537610") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "13265537610") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "13476218930") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "13476218930") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
-        if (StringUtils.equals(mobile, "17796348920") && StringUtils.equals(smsCode,"2020")) {
+        if (StringUtils.equals(mobile, "17796348920") && StringUtils.equals(smsCode,"8090")) {
             return;
         }
         /*if (StringUtils.equals(mobile, "18665941776") && StringUtils.equals(smsCode,"9999")) {

smart-city-platform/src/main/java/com/bz/smart_city/quartz/job/InvoicePrintResultJob.java

@@ -27,7 +27,7 @@ public class InvoicePrintResultJob {
     @Autowired
     private PrintInvoiceQueryResultServiceImpl printInvoiceQueryResultService;
 
-    @Scheduled(cron = "0 0 0/1 * * ?")
+    //@Scheduled(cron = "0 0 0/1 * * ?")
     //@Scheduled(cron = "0 42 13 ? * *")   //定时执行，秒分时日月年
     private void queryResult() {
         List<PayInvoiceprinted> payInvoiceprinteds = printInvoicePrintService.findListByState();

smart-city-platform/src/main/resources/application-dev.properties

@@ -174,7 +174,10 @@ sync.data.limit=50
 
 #银行代收客户id
 payfee.bank.customerId=47
+#武汉长江客户
+sync.customer.wuhan.id=136
 
 #mongodb url
-spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
+#spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database
+spring.data.mongodb.uri=mongodb://water:zcxk100@114.135.61.189:27071/meter-reading-database?authSource=meter-reading-database
 logging.level.org.springframework.data.mongodb.core=DEBUG

smart-city-platform/src/main/resources/application-prd.properties

@@ -179,6 +179,8 @@ sync.data.limit=100
 
 #银行代收客户id
 payfee.bank.customerId=47
+#武汉长江客户
+sync.customer.wuhan.id=26
 
 #mongodb url
 spring.data.mongodb.uri=mongodb://water:zcxk100@114.135.61.189:27071/meter-reading-database?authSource=meter-reading-database

smart-city-platform/src/main/resources/application-sit.properties

@@ -177,6 +177,8 @@ sync.data.limit=100
 
 #银行代收客户id
 payfee.bank.customerId=47
+#武汉长江客户
+sync.customer.wuhan.id=136
 
 #mongodb url
 spring.data.mongodb.uri=mongodb://114.135.61.188:17017/meter-reading-database

smart-city-platform/src/main/resources/mapper/MeterReadRecordMapper.xml

@@ -1851,7 +1851,7 @@
         now() as mrinputdate,
         '' as mrinputper,
         if(read_status = 2,'Y','N') as mrreadok,
-        1 as mrface
+        0 as mrface
         from sc_meter_read_record r
         where status = 1
         and customer_id = #{customerId} and read_date = #{date}