1

lefull-lot-api-web/src/main/java/cn/lefull/api/LisaController.java

@@ -84,8 +84,8 @@ public class LisaController {
 
     @NoAuth
     @GetMapping("/test")
-    public ApiResponse<Object> test(String start, String end) throws Exception {
-        equipmentService.getLogList(start, end);
+    public ApiResponse<Object> test(int apartmentId, String start, String end) throws Exception {
+        equipmentService.getLogList(apartmentId, start, end);
         return new ApiResponse<>();
     }
 }

lefull-lot-interaction/src/main/java/cn/lefull/interaction/vo/face/CameraDateLogListVO.java

+package cn.lefull.interaction.vo.face;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author 杨奇
+ */
+@Data
+public class CameraDateLogListVO implements Serializable {
+
+    private Integer apartmentId;
+
+    private LocalDate logDate;
+
+    private Integer visitNum;
+
+    private Integer userNum;
+
+    /**
+     * 无身份
+     */
+    private Integer identity0;
+
+    /**
+     * 其它
+     */
+    private Integer identity1;
+
+    /**
+     * 内部员工
+     */
+    private Integer identity2;
+
+    /**
+     * 外卖员
+     */
+    private Integer identity3;
+
+    /**
+     * 快递员
+     */
+    private Integer identity4;
+
+    /**
+     * 在住租客
+     */
+    private Integer identity5;
+
+    /**
+     * 访客
+     */
+    private Integer identity6;
+
+    /**
+     * 保洁人员
+     */
+    private Integer identity7;
+
+    /**
+     * 维修人员
+     */
+    private Integer identity8;
+
+}

lefull-lot-repository/src/main/java/cn/lefull/repository/mapper/face/CameraDateLogMapper.java

@@ -3,6 +3,8 @@ package cn.lefull.repository.mapper.face;
 import cn.lefull.repository.model.face.CameraDateLog;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * @author 杨奇
  */
@@ -14,4 +16,6 @@ public interface CameraDateLogMapper {
     int updateLog(CameraDateLog log);
 
     CameraDateLog getLog(CameraDateLog log);
+
+    List<CameraDateLog> getLogList(int apartmentId, String start, String end);
 }

lefull-lot-repository/src/main/java/cn/lefull/repository/model/face/CameraDateLog.java

@@ -2,6 +2,7 @@ package cn.lefull.repository.model.face;
 
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -18,7 +19,7 @@ public class CameraDateLog {
     /**
      * 日期
      */
-    private String logDate;
+    private LocalDate logDate;
 
     /**
      * 门店id

lefull-lot-repository/src/main/resources/mapper/face/CameraDateLogMapper.xml

@@ -14,4 +14,8 @@
         UPDATE camera_date_log set visit_num = #{visitNum}, user_num = #{userNum}, identity0 = #{identity0}, identity1 = #{identity1}, identity2 = #{identity2}, identity3 = #{identity3}, identity4 = #{identity4}, identity5 = #{identity5}, identity6 = #{identity6}, identity7 = #{identity7}, identity8 = #{identity8}
         where camera_date_log_id = #{cameraDateLogId}
     </update>
+    <select id="getLogList" resultType="cn.lefull.repository.model.face.CameraDateLog">
+        SELECT *
+        FROM camera_date_log where apartment_id = #{apartmentId} and log_date between #{start} and #{end} and is_delete = 0
+    </select>
 </mapper>

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentService.java

 package cn.lefull.service.lisa;
 
 import cn.lefull.interaction.pageresp.Pagination;
+import cn.lefull.interaction.vo.face.CameraDateLogListVO;
 import cn.lefull.interaction.vo.face.EntityListVO;
 import cn.lefull.interaction.vo.face.EquipmentListVO;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author 杨奇
@@ -32,5 +34,5 @@ public interface EquipmentService {
 
     void addDateLog(String date) throws Exception;
 
-    void getLogList(String start, String end) throws Exception;
+    List<CameraDateLogListVO> getLogList(int apartmentId, String start, String end);
 }

lefull-lot-service/src/main/java/cn/lefull/service/lisa/EquipmentServiceImpl.java

@@ -4,6 +4,7 @@ import cn.lefull.common.utils.ArrayUtils;
 import cn.lefull.common.utils.PageBuilder;
 import cn.lefull.common.utils.Utils;
 import cn.lefull.interaction.pageresp.Pagination;
+import cn.lefull.interaction.vo.face.CameraDateLogListVO;
 import cn.lefull.interaction.vo.face.EntityListVO;
 import cn.lefull.interaction.vo.face.EquipmentListVO;
 import cn.lefull.repository.bo.face.CameraEntityBO;
@@ -21,6 +22,8 @@ import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -349,7 +352,7 @@ public class EquipmentServiceImpl implements EquipmentService {
             CameraLogBO cameraLogBO = userLogList.stream()
                     .filter(u -> Objects.equals(u.getApartmentId(), logBo.getApartmentId())).findFirst().orElse(null);
             CameraDateLog log = new CameraDateLog();
-            log.setLogDate(date);
+            log.setLogDate(LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")));
             log.setApartmentId(logBo.getApartmentId());
             log.setVisitNum(logBo.getVisitNum());
             if(cameraLogBO == null){
@@ -387,10 +390,49 @@ public class EquipmentServiceImpl implements EquipmentService {
     }
 
     @Override
-    public void getLogList(String start, String end) throws Exception {
+    public List<CameraDateLogListVO> getLogList(int apartmentId, String start, String end) {
+
         LocalDate startDate = LocalDate.parse(start, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         LocalDate endDate = LocalDate.parse(end, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         List<LocalDate> dateList = ArrayUtils.getTimeList(startDate, endDate);
-        System.out.println(dateList);
+
+        List<CameraDateLog> dateLogList = cameraDateLogMapper.getLogList(apartmentId, start, end);
+
+        List<CameraDateLogListVO> targets = new ArrayList<>();
+        for (LocalDate localDate : dateList) {
+            CameraDateLogListVO cameraDateLogListVO = new CameraDateLogListVO();
+            CameraDateLog source = dateLogList.stream()
+                    .filter(s -> s.getLogDate().compareTo(localDate) == 0).findFirst().orElse(null);
+            cameraDateLogListVO.setApartmentId(apartmentId);
+            cameraDateLogListVO.setLogDate(localDate);
+            if(source == null){
+                cameraDateLogListVO.setVisitNum(0);
+                cameraDateLogListVO.setUserNum(0);
+                cameraDateLogListVO.setIdentity0(0);
+                cameraDateLogListVO.setIdentity1(0);
+                cameraDateLogListVO.setIdentity2(0);
+                cameraDateLogListVO.setIdentity3(0);
+                cameraDateLogListVO.setIdentity4(0);
+                cameraDateLogListVO.setIdentity5(0);
+                cameraDateLogListVO.setIdentity6(0);
+                cameraDateLogListVO.setIdentity7(0);
+                cameraDateLogListVO.setIdentity8(0);
+            }else{
+                cameraDateLogListVO.setVisitNum(source.getVisitNum());
+                cameraDateLogListVO.setUserNum(source.getUserNum());
+                cameraDateLogListVO.setIdentity0(source.getIdentity0());
+                cameraDateLogListVO.setIdentity1(source.getIdentity1());
+                cameraDateLogListVO.setIdentity2(source.getIdentity2());
+                cameraDateLogListVO.setIdentity3(source.getIdentity3());
+                cameraDateLogListVO.setIdentity4(source.getIdentity4());
+                cameraDateLogListVO.setIdentity5(source.getIdentity5());
+                cameraDateLogListVO.setIdentity6(source.getIdentity6());
+                cameraDateLogListVO.setIdentity7(source.getIdentity7());
+                cameraDateLogListVO.setIdentity8(source.getIdentity8());
+            }
+            targets.add(cameraDateLogListVO);
+        }
+
+        return targets;
     }
 }