Merge branch 'feature/visit_zhy' into dev

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/PliPowerFeignClient.java

@@ -21,4 +21,7 @@ public interface PliPowerFeignClient {
     @PostMapping("/pli/power/visitVisitor/visitorlogout")
     Result visitorLogout(@RequestBody VisitorLogoutFormDTO formDTO);
 
+    @PostMapping("/pli/power/visitVisitor/logout")
+    Result logout(@RequestBody VisitorLogoutFormDTO formDTO);
+
 }

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/feign/impl/PliPowerFeignClientFallBack.java

@@ -21,4 +21,9 @@ public class PliPowerFeignClientFallBack implements PliPowerFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "visitorLogout",formDTO);
     }
 
+    @Override
+    public Result logout(VisitorLogoutFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.PLI_POWER_SERVER, "logout",formDTO);
+    }
+
 }

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

@@ -103,6 +103,14 @@ public class VisitVisitorController {
         return new Result();
     }
 
+    @PostMapping("logout")
+    public Result logout(@RequestBody VisitorLogoutFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        visitVisitorService.logout(dto);
+        return new Result();
+    }
+
     @NoRepeatSubmit
     @PostMapping("chart/traffic")
     public Result<List<VisitVisitorChartResultDTO>> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) {

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

@@ -45,7 +45,7 @@
         FROM
             pli_visit_visitor
         WHERE
-            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) = #{dateId}
+            DATE_FORMAT( CREATED_TIME, '%Y%m%d' ) = #{dateId}
     </select>
 
 </mapper>