Browse Source

修复 bug

weiximei 6 years ago
parent
commit
091efa69cf

+ 2
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/MonitoringServiceImpl.java View File

40
         parMap.put("unitUuids","1048576");
40
         parMap.put("unitUuids","1048576");
41
 
41
 
42
         String result = HKOpenApi.getMonitoryPoint(parMap);
42
         String result = HKOpenApi.getMonitoryPoint(parMap);
43
-        String url = "rtsp://vipgz1.idcfengye.com:10004/realplay://#cameraUuid#:SUB:";
44
-        
43
+        // String url = "rtsp://vipgz1.idcfengye.com:10004/realplay://#cameraUuid#:SUB:";
44
+        String url = "rtsp://vipgz1.idcfengye.com:10127/realplay://#cameraUuid#:SUB:";
45
         JSONArray cameraList = JSONObject.parseObject(result).getJSONObject("data").getJSONArray("list");
45
         JSONArray cameraList = JSONObject.parseObject(result).getJSONObject("data").getJSONArray("list");
46
         List<String> urlList = new ArrayList<String>();
46
         List<String> urlList = new ArrayList<String>();
47
         for (Object cameraMap : cameraList){
47
         for (Object cameraMap : cameraList){

+ 1
- 1
CODE/smart-community/property-api/src/main/resources/mapper/BillStatementMapper.xml View File

23
                     and tb.bill_name like CONCAT('%',#{map.billName},'%')
23
                     and tb.bill_name like CONCAT('%',#{map.billName},'%')
24
                 </if>
24
                 </if>
25
                 <if test="map.billInvoiceId != null">
25
                 <if test="map.billInvoiceId != null">
26
-                    and tbs.id = #{map.billInvoiceId}
26
+                    and tbs.bill_invoice_id = #{map.billInvoiceId}
27
                 </if>
27
                 </if>
28
                 <if test="map.payName != null and map.payName != ''">
28
                 <if test="map.payName != null and map.payName != ''">
29
                     and tbs.pay_name like CONCAT('%', #{map.payName}, '%')
29
                     and tbs.pay_name like CONCAT('%', #{map.payName}, '%')