修改 缴费

CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml

@@ -220,7 +220,8 @@
           i.bill_status AS billStatus,
           b.bill_name AS billName,
           b.bill_explain AS billExplain,
-          b.end_date AS endDate
+          b.end_date AS endDate,
+          b.create_date AS createDate
       FROM
           tp_bill_invoice i
           LEFT JOIN tp_bill b ON b.id = i.bill_id

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/MqMessageMapper.java

@@ -20,8 +20,14 @@ public interface MqMessageMapper {
     int updateByPrimaryKey(MqMessage record);
 
     /**
-     * 统计开门次数
+     * 统计小区开门开启次数
      * @return
      */
-    int selectOpenDoorCount();
+    int selectCommunityOpenDoorCount();
+
+    /**
+     * 统计单元门开启次数
+     * @return
+     */
+    int selectUnitsOpenDoorCount(Integer eventType);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/MqMessageService.java

@@ -3,10 +3,12 @@ package com.community.huiju.service.impl;
 import com.community.commom.mode.ResponseBean;
 import com.community.huiju.dao.MqMessageMapper;
 import com.community.huiju.service.IMqMessageService;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,11 +24,28 @@ public class MqMessageService implements IMqMessageService {
     @Override
     public ResponseBean selectOpenDoorCount() {
         ResponseBean responseBean = new ResponseBean();
-        Map<String,Object> map = Maps.newHashMap();
-        Integer result = mqMessageMapper.selectOpenDoorCount();
-        map.put("message","开门次数");
-        map.put("count",result);
-        responseBean.addSuccess(map);
+
+        Map<String,Object> communityMap = Maps.newHashMap();
+        Integer result = mqMessageMapper.selectCommunityOpenDoorCount();
+        communityMap.put("message","小区开门次数");
+        communityMap.put("count",result);
+
+        // 刷卡开门次数
+        Integer brushCardUnitsOpenDoorCount = mqMessageMapper.selectUnitsOpenDoorCount(983299);
+        // 刷脸开门次数
+        Integer brushFaceUunitsOpenDoorCount = mqMessageMapper.selectUnitsOpenDoorCount(983309);
+
+        Integer openCount = brushCardUnitsOpenDoorCount + brushFaceUunitsOpenDoorCount;
+
+        Map<String,Object> uunitsMap = Maps.newHashMap();
+        uunitsMap.put("message","单元门开门次数");
+        uunitsMap.put("count",openCount);
+
+        List<Map<String,Object>> mapList = Lists.newArrayList();
+        mapList.add(communityMap);
+        mapList.add(uunitsMap);
+
+        responseBean.addSuccess(mapList);
         return responseBean;
     }
 }

CODE/smart-community/operate-api/src/main/resources/mapper/MqMessageMapper.xml

@@ -399,9 +399,15 @@
       pic_url = #{picUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="selectOpenDoorCount" parameterType="java.lang.Integer" resultType="java.lang.Integer" >
+  <select id="selectCommunityOpenDoorCount" parameterType="java.lang.Integer" resultType="java.lang.Integer" >
     select count(*)
     from mq_message
     where event_type = '199941' AND source_idx in('94bac7e217fb4a698ad086876d347c6a','efcb9a3fe4e64e2f9c0f546c54465524')
   </select>
+
+  <select id="selectUnitsOpenDoorCount" parameterType="java.lang.Integer" resultType="java.lang.Integer" >
+    select count(*)
+    from mq_message
+    where event_type = #{eventType,jdbcType=INTEGER}
+  </select>
 </mapper>