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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @date: 2020/6/22 17:39
  * @author: jianjun liu
  */
-@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallbackFactory = PliPowerFeignClientFallBackFactory.class)
+@FeignClient(name = ServiceConstant.PLI_POWER_SERVER, fallbackFactory = PliPowerFeignClientFallBackFactory.class)
 public interface PliPowerFeignClient {
 
     @PostMapping("/pli/power/visitVisitor/logout")

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

@@ -18,7 +18,7 @@ public class PliPowerFeignClientFallBack implements PliPowerFeignClient {
 
     @Override
     public Result visitorLogout(VisitorLogoutFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "logout",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

@@ -96,7 +96,7 @@ public class VisitVisitorController {
     public Result logout(@RequestBody VisitorLogoutFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-
+        visitVisitorService.logout(dto);
         return new Result();
     }
 

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

@@ -1,10 +1,12 @@
 package com.epmet.plugin.power.modules.visit.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO;
 import com.epmet.plugin.power.dto.visit.result.VisitVisitorChartResultDTO;
 import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -26,4 +28,6 @@ public interface VisitVisitorDao extends BaseDao<VisitVisitorEntity> {
      * @date 2022-07-26
      */
     List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto);
+
+    List<VisitVisitorDTO> listByDate(@Param("dateId") String dateId);
 }

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

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
+import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO;
 import com.epmet.plugin.power.dto.visit.result.VisitVisitorChartResultDTO;
 import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
 
@@ -99,6 +100,16 @@ public interface VisitVisitorService extends BaseService<VisitVisitorEntity> {
      */
     void doorAuthority(VisitVisitorFormDTO dto);
 
+    /**
+     * 退卡登出
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    void logout(VisitorLogoutFormDTO dto);
+
     /**
      * 人流量
      *

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/service/impl/VisitVisitorServiceImpl.java

@@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -14,6 +15,7 @@ import com.epmet.plugin.power.dto.visit.VisitVisitorDTO;
 import com.epmet.plugin.power.dto.visit.form.DhPersonFormDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO;
 import com.epmet.plugin.power.dto.visit.form.VisitVisitorFormDTO;
+import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO;
 import com.epmet.plugin.power.dto.visit.result.VisitVisitorChartResultDTO;
 import com.epmet.plugin.power.modules.visit.dao.VisitVisitorDao;
 import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
@@ -139,6 +141,16 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
         sendAuth(dto);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void logout(VisitorLogoutFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getDateId())) {
+            formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
+        }
+        List<VisitVisitorDTO> list = baseDao.listByDate(formDTO.getDateId());
+        list.forEach(item -> delAuth(item.getIdCard()));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto) {

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

@@ -39,4 +39,13 @@
             h.`hour`;
     </select>
 
+    <select id="listByDate" resultType="com.epmet.plugin.power.dto.visit.VisitVisitorDTO">
+        SELECT
+            *
+        FROM
+            pli_visit_visitor
+        WHERE
+            DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) = #{dateId}
+    </select>
+
 </mapper>