合并折线图功能

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VisitVisitorChartFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorChartFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间
+     */
+	private String date;
+
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VisitVisitorChartResultDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 租客表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-07-26
+ */
+@Data
+public class VisitVisitorChartResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间
+     */
+	private String hour;
+
+    /**
+     * 数量
+     */
+    private String num;
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiCollectVisitorController.java

@@ -13,10 +13,8 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.dto.SaveCollectVisitorFormDTO;
-import com.epmet.dto.form.CollectDetailFormDTO;
-import com.epmet.dto.form.CollectListFormDTO;
-import com.epmet.dto.form.VisitListFormDTO;
-import com.epmet.dto.form.VisitorInfoFormDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.VisitVisitorChartResultDTO;
 import com.epmet.excel.IcResiCollectVisitorExcel;
 import com.epmet.service.IcResiCollectVisitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -148,4 +146,20 @@ public class IcResiCollectVisitorController {
         return icResiCollectVisitorService.getVisitorInfo(tokenDto, dto);
     }
 
+    /**
+     * 访客折线图
+     *
+     * @param dto
+     * @return com.epmet.commons.tools.utils.Result<java.util.List<VisitVisitorChartResultDTO>>
+     * @author zhy
+     * @date 2022/8/22 9:56
+     */
+    @NoRepeatSubmit
+    @PostMapping("chart/traffic")
+    public Result<List<VisitVisitorChartResultDTO>> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        return new Result<List<VisitVisitorChartResultDTO>>().ok(icResiCollectVisitorService.getTraffic(dto));
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectVisitorDao.java

@@ -3,7 +3,9 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.dto.form.VisitListFormDTO;
+import com.epmet.dto.form.VisitVisitorChartFormDTO;
 import com.epmet.dto.form.VisitorInfoFormDTO;
+import com.epmet.dto.result.VisitVisitorChartResultDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -46,4 +48,14 @@ public interface IcResiCollectVisitorDao extends BaseDao<IcResiCollectVisitorEnt
      */
     IcResiCollectVisitorEntity getLastInfo(VisitorInfoFormDTO formDTO);
 
+    /**
+     * 人流量
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiCollectVisitorService.java

@@ -8,7 +8,9 @@ import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.dto.SaveCollectVisitorFormDTO;
 import com.epmet.dto.form.CollectDetailFormDTO;
 import com.epmet.dto.form.VisitListFormDTO;
+import com.epmet.dto.form.VisitVisitorChartFormDTO;
 import com.epmet.dto.form.VisitorInfoFormDTO;
+import com.epmet.dto.result.VisitVisitorChartResultDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 
 import java.util.List;
@@ -121,4 +123,14 @@ public interface IcResiCollectVisitorService extends BaseService<IcResiCollectVi
      */
     Result getVisitorInfo(TokenDto tokenDto, VisitorInfoFormDTO dto);
 
+    /**
+     * 人流量
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto);
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java

@@ -15,10 +15,8 @@ import com.epmet.dao.IcResiCollectVisitorDao;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcResiCollectVisitorDTO;
 import com.epmet.dto.SaveCollectVisitorFormDTO;
-import com.epmet.dto.form.CollectDetailFormDTO;
-import com.epmet.dto.form.VisitListFormDTO;
-import com.epmet.dto.form.VisitVisitorFormDTO;
-import com.epmet.dto.form.VisitorInfoFormDTO;
+import com.epmet.dto.form.*;
+import com.epmet.dto.result.VisitVisitorChartResultDTO;
 import com.epmet.entity.IcResiCollectVisitorEntity;
 import com.epmet.redis.IcResiCollectVisitorRedis;
 import com.epmet.service.IcResiCollectVisitorService;
@@ -30,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -179,4 +178,13 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
         return new Result().ok(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<VisitVisitorChartResultDTO> getTraffic(VisitVisitorChartFormDTO dto) {
+        if (StringUtils.isBlank(dto.getDate())) {
+            dto.setDate(LocalDate.now().toString());
+        }
+        return baseDao.getTraffic(dto);
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectVisitorDao.xml

@@ -121,4 +121,16 @@
         LIMIT 1
     </select>
 
+    <select id="getTraffic" resultType="com.epmet.dto.result.VisitVisitorChartResultDTO">
+        SELECT
+            CONCAT( h.`hour`, ':00' ) AS HOUR,
+            COUNT( v.id ) AS num
+        FROM
+            pli_chart_hour h
+                LEFT JOIN ic_resi_collect_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`;
+    </select>
+
 </mapper>