修复人员闸机查询不访问数据库的问题

src/main/java/com/zcloud/controller/map/MapController.java

@@ -294,7 +294,13 @@ public class MapController extends BaseController {
         String[] gateIdsByGateAreaId = mapService.getGateIdsByGateAreaId(pd);
         Map<String, Object> doorComeAndOutInfo = new HashMap<>();
         if (pd.getString("TYPE").equals("PERSON_MACHINE")){
-            doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(gateIdsByGateAreaId, pd.getString("pageNo"), pd.getString("pageSize"),fstartDate,fendDate);
+            List<PageData> infoByArea = gateMachineInfoService.findInfoByArea(pd);
+            Map<String,Object> data = new HashMap<>();
+            data.put("list", infoByArea);
+            doorComeAndOutInfo.put("data", data);
+            doorComeAndOutInfo.put("code", 0);
+            doorComeAndOutInfo.put("msg", "success");
+//            doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(gateIdsByGateAreaId, pd.getString("pageNo"), pd.getString("pageSize"),fstartDate,fendDate);
         }else {
             List<PageData> infoByArea = gateCarMachineInfoService.findInfoByArea(pd);
             Map<String,Object> data = new HashMap<>();

src/main/java/com/zcloud/mapper/datasource/gatemachine/GateMachineInfoMapper.java

@@ -19,4 +19,6 @@ public interface GateMachineInfoMapper {
     List<PageData> findByIds(PageData pd);
 
     PageData perpleCount(PageData pd);
+
+    List<PageData> findInfoByArea(PageData pd);
 }

src/main/java/com/zcloud/service/gatemachine/GateMachineInfoService.java

@@ -17,4 +17,6 @@ public interface GateMachineInfoService {
     public List<PageData> findByIds(PageData pd);
 
     PageData peopleCount(PageData pd);
+
+    List<PageData> findInfoByArea(PageData pd);
 }

src/main/java/com/zcloud/service/gatemachine/impl/GateMachineInfoServiceImpl.java

@@ -37,4 +37,9 @@ public class GateMachineInfoServiceImpl implements GateMachineInfoService {
     public PageData peopleCount(PageData pd) {
         return gateMachineInfoMapper.perpleCount(pd);
     }
+
+    @Override
+    public List<PageData> findInfoByArea(PageData pd) {
+        return gateMachineInfoMapper.findInfoByArea(pd);
+    }
 }

src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml

@@ -81,6 +81,8 @@
             mk_gate_car_machine_info f
         WHERE
             f.ENTRANCESYSCODE = #{GATE_AREA_ID}
+        AND
+            f.`CROSSTIME` >= CONCAT_WS("", date_format(now(),'%Y-%m'), '-01 00:00:00')
         GROUP BY
             f.CAR_MACHINE_INFO_ID
         ORDER BY

src/main/resources/mybatis/datasource/gatemachine/GateMachineInfoMapper.xml

@@ -74,4 +74,20 @@
             and f.eventTime >= #{eventTime}
         </if>
     </select>
+
+    <select id="findInfoByArea" resultType="com.zcloud.entity.PageData">
+        SELECT
+            *
+        FROM
+            mk_gate_person_machine_info f
+                LEFT JOIN mk_gate_machine mgm ON mgm.EQUIPMENTID = f.doorIndexCode
+        WHERE
+            mgm.GATE_AREA_ID = #{GATE_AREA_ID}
+        AND
+            f.`eventTime` >= CONCAT_WS("", date_format(now(),'%Y-%m'), '-01 00:00:00')
+        GROUP BY
+            f.MACHINE_INFO_ID
+        ORDER BY
+            f.eventTime DESC;
+    </select>
 </mapper>

src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml

@@ -160,7 +160,7 @@
 		pv.INDEXCODE
 		from
 		<include refid="tableName"></include> f
-		left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
+		left join `qa-cmt-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
 		where f.ISDELETE = '0'
 		<if test="pd.GATE_AREA_ID != null and pd.GATE_AREA_ID != ''"><!-- 关键词检索 -->
 			and f.GATE_AREA_ID=#{pd.GATE_AREA_ID}
@@ -199,7 +199,7 @@
 		pv.INDEXCODE
 		from
 		<include refid="tableName"></include> f
-		left join `qa-gwj-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
+		left join `qa-cmt-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
 		where f.ISDELETE = '0'
 		<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
 			and f.CORPINFO_ID=#{CORPINFO_ID}