推送和用水量BUG

smart-city-platform/src/main/java/com/bz/smart_city/commom/model/CommonQueryCondition.java

@@ -62,4 +62,5 @@ public class CommonQueryCondition {
 	private List<Integer> regions;
 	private List<Integer> communities;
 	private List<Integer> customerIds;
+	private Boolean  isAccept;
 }

smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/BuildingResolverExcelTemplate.java

@@ -48,6 +48,7 @@ public class BuildingResolverExcelTemplate extends AbstractResolverExcelTemplate
             if (hssfSheet == null || !StringUtils.equals(executeSheetName, hssfSheet.getSheetName())) {
                 continue;
             }
+            invalidTemplate = true;
             // 循环行Row
             for (int rowNum = 1; rowNum <= hssfSheet.getLastRowNum(); rowNum++) {
                 Row row = hssfSheet.getRow(rowNum);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/BPMNServiceImpl.java

@@ -91,7 +91,7 @@ public class BPMNServiceImpl implements BPMNService {
                  return null;
              }
          }
-         logger.info("end findProccessDefByAlarm ,ProcessDef = " + JSON.toJSONString(pd));
+         //logger.info("end findProccessDefByAlarm ,ProcessDef = " + JSON.toJSONString(pd));
          return pd;
 	}
 	/**
@@ -113,7 +113,7 @@ public class BPMNServiceImpl implements BPMNService {
 				return null;
 			}
 		}
-		logger.info("end findProccessDefByAlarm ,ProcessDef = " + JSON.toJSONString(pd));
+		//logger.info("end findProccessDefByAlarm ,ProcessDef = " + JSON.toJSONString(pd));
 		return pd;
 	}
 

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/GeneralRabbitSyncService.java

@@ -66,6 +66,7 @@ public class GeneralRabbitSyncService {
         }
         // 只传已验收上线的
         //condition.setChannelId(40);
+        condition.setIsAccept(true);
         log.info("begin query meter read records ,condition = {}",JSON.toJSONString(condition));
         List<MeterReadRecord> meterReadRecords = meterReadRecordMapper.queryMeterReadRecordWithCondtion(condition);
         log.info("end query meter read records ,result size is = {}",meterReadRecords.size());

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

@@ -184,4 +184,5 @@ 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
-logging.level.org.springframework.data.mongodb.core=INFO
+logging.level.org.springframework.data.mongodb.core=INFO
+account_userInfo_url=http://114.135.61.188:58084/api/pay/getAccountInfoByMetercode

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

@@ -812,7 +812,10 @@
 			left join sc_device_manufacturer dm on (dm.id = dt.manufacturer_id)
             left join sc_water_related_device wrd on (wrd.device_id = m.device_id)
             left join sc_channel_number scn on (scn.id = wrd.channel_number_id)
-		WHERE m.STATUS = 1 and m.sys_id = -99
+		WHERE m.STATUS = 1
+            <if test="param.isAccept != null and param.isAccept">
+                and m.sys_id != -99
+            </if>
 			<!-- 数据权限 -->
 			<if test="param.siteId != null and param.siteId != 0">
 				and m.site_id = #{param.siteId}