|
@@ -87,57 +87,11 @@ public class PaySysDictServiceImpl implements PaySysDictService {
|
|
|
{
|
|
|
LoginUser loginUser = UserUtil.getCurrentUser();
|
|
|
|
|
|
- //测试
|
|
|
- loginUser.setCustomerId(11);
|
|
|
-
|
|
|
BigInteger customerId = new BigInteger(String.valueOf(loginUser.getCustomerId()));
|
|
|
BigInteger siteId = new BigInteger(String.valueOf(loginUser.getSiteId()));
|
|
|
|
|
|
List<String> stringList = paySysDictMapper.findAllType(siteId,customerId);
|
|
|
- //----------测试mongotemp------------<
|
|
|
- Query query = new Query();
|
|
|
-
|
|
|
- HashMap<BigInteger, MeterReadRecordDto> meterReadRecordHashMap = new HashMap<>();
|
|
|
-
|
|
|
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMdd");
|
|
|
- LocalDateTime time = LocalDateTime.now();
|
|
|
- time = time.plusDays(-1);
|
|
|
- String localTime = "20200531";//df.format(time);
|
|
|
- Integer readDate = new Integer(localTime);
|
|
|
-
|
|
|
- Integer sd = new Integer(1);
|
|
|
- Integer cd = new Integer(3);;
|
|
|
- Criteria criteria = new Criteria();
|
|
|
- criteria.and("readDate").is(readDate);
|
|
|
- criteria.and("siteId").is(sd);
|
|
|
- criteria.and("customerId").is(cd);
|
|
|
- //Criteria selCtr = Criteria.where("readDate").is(20200531);
|
|
|
-
|
|
|
- //in操作
|
|
|
- ArrayList<String> listVa = new ArrayList<>();
|
|
|
-/* listVa.add(new BigInteger("705506563531603968"));
|
|
|
- listVa.add(new BigInteger("705506562667577344"));
|
|
|
- listVa.add(new BigInteger("705505954141175808"));*/
|
|
|
- listVa.add("004a7701240164e8");
|
|
|
- listVa.add("004a770124013b39");
|
|
|
- Criteria inCtr = Criteria.where("deviceNo").all().in(listVa);
|
|
|
-
|
|
|
- //Criteria inCtr = Criteria.where("deviceId").in("705506563531603968","705506562667577344");
|
|
|
- query.addCriteria(criteria);
|
|
|
- query.addCriteria(inCtr);
|
|
|
- query.fields().include("deviceId");
|
|
|
- query.fields().include("readDate");
|
|
|
- query.fields().include("readData");
|
|
|
- query.fields().exclude("_id");
|
|
|
-
|
|
|
-
|
|
|
- List<MeterReadRecordDto> childMap = mongoTemplate.find(query,MeterReadRecordDto.class,"sc_meter_read_record");
|
|
|
- if(childMap.size() > 0){
|
|
|
- for (int i=0;i<childMap.size();i++){
|
|
|
- meterReadRecordHashMap.put(childMap.get(i).getDeviceId(),childMap.get(i));
|
|
|
- }
|
|
|
- }
|
|
|
- //------------------------>
|
|
|
+
|
|
|
return stringList;
|
|
|
}
|
|
|
|