Merge branch 'feature/visit_zhy' into dev

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/utils/DhDeviceUtil.java

@@ -680,7 +680,7 @@ public class DhDeviceUtil {
         cardFormDTO.setCategory("0");
         cardFormDTO.setCardStatus("ACTIVE");
         cardFormDTO.setStartDate(LocalDate.now().toString());
-        cardFormDTO.setEndDate(LocalDate.now().toString());
+        cardFormDTO.setEndDate(LocalDate.now().plusDays(180L).toString());
         String pwd;
         try {
             pwd = RSAUtils.getPwdByRsa(getPublicKey(), "123456");

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/visit/VisitVisitorDao.xml

@@ -33,7 +33,7 @@
             COUNT( v.id ) AS num
         FROM
             pli_chart_hour h
-                LEFT JOIN pli_visit_visitor v ON h.`hour` = DATE_FORMAT( v.CREATED_TIME, '%h' )
+                LEFT JOIN pli_visit_visitor v ON h.`hour` = DATE_FORMAT( v.CREATED_TIME, '%H' )
                 AND DATE_FORMAT( v.CREATED_TIME, '%Y-%m-%d' ) = #{date}
         GROUP BY
             h.`hour`;