追加图表

epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/form/VisitVisitorChartFormDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.plugin.power.dto.visit.form;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+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-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/visit/result/VisitVisitorChartResultDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.plugin.power.dto.visit.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-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/visit/controller/VisitVisitorController.java

@@ -10,7 +10,9 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 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.result.VisitVisitorChartResultDTO;
 import com.epmet.plugin.power.modules.visit.excel.VisitVisitorExcel;
 import com.epmet.plugin.power.modules.visit.service.VisitVisitorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,20 +37,20 @@ public class VisitVisitorController {
     private VisitVisitorService visitVisitorService;
 
     @RequestMapping("page")
-    public Result<PageData<VisitVisitorDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<VisitVisitorDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<VisitVisitorDTO> page = visitVisitorService.page(params);
         return new Result<PageData<VisitVisitorDTO>>().ok(page);
     }
 
     @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
-    public Result<VisitVisitorDTO> get(@PathVariable("id") String id){
+    public Result<VisitVisitorDTO> get(@PathVariable("id") String id) {
         VisitVisitorDTO data = visitVisitorService.get(id);
         return new Result<VisitVisitorDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody VisitVisitorDTO dto){
+    public Result save(@RequestBody VisitVisitorDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         visitVisitorService.save(dto);
@@ -57,7 +59,7 @@ public class VisitVisitorController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody VisitVisitorDTO dto){
+    public Result update(@RequestBody VisitVisitorDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         visitVisitorService.update(dto);
@@ -65,7 +67,7 @@ public class VisitVisitorController {
     }
 
     @RequestMapping(value = "delete", method = {RequestMethod.POST, RequestMethod.DELETE})
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         visitVisitorService.delete(ids);
@@ -80,11 +82,19 @@ public class VisitVisitorController {
 
     @NoRepeatSubmit
     @PostMapping("visit")
-    public Result visit(@RequestBody VisitVisitorFormDTO dto){
+    public Result visit(@RequestBody VisitVisitorFormDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         visitVisitorService.visit(dto);
         return new Result();
     }
 
+    @NoRepeatSubmit
+    @PostMapping("chart/traffic")
+    public Result<VisitVisitorChartResultDTO> getTraffic(@RequestBody VisitVisitorChartFormDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        return new Result<VisitVisitorChartResultDTO>().ok(visitVisitorService.getTraffic(dto););
+    }
+
 }

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

@@ -1,6 +1,8 @@
 package com.epmet.plugin.power.modules.visit.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+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;
 
@@ -12,5 +14,14 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface VisitVisitorDao extends BaseDao<VisitVisitorEntity> {
-	
+
+    /**
+     * 人流量
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    VisitVisitorChartResultDTO getTraffic(VisitVisitorChartFormDTO dto);
 }

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

@@ -3,7 +3,9 @@ package com.epmet.plugin.power.modules.visit.service;
 import com.epmet.commons.mybatis.service.BaseService;
 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.result.VisitVisitorChartResultDTO;
 import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
 
 import java.util.List;
@@ -87,4 +89,15 @@ public interface VisitVisitorService extends BaseService<VisitVisitorEntity> {
      */
     void visit(VisitVisitorFormDTO dto);
 
+    /**
+     * 人流量
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-07-26
+     */
+    VisitVisitorChartResultDTO getTraffic(VisitVisitorChartFormDTO dto);
+
+
 }

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

@@ -3,15 +3,16 @@ package com.epmet.plugin.power.modules.visit.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.feign.GovOrgOpenFeignClient;
 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.result.VisitVisitorChartResultDTO;
 import com.epmet.plugin.power.modules.visit.dao.VisitVisitorDao;
 import com.epmet.plugin.power.modules.visit.entity.VisitVisitorEntity;
 import com.epmet.plugin.power.modules.visit.redis.VisitVisitorRedis;
@@ -22,6 +23,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.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -120,6 +122,7 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
         VisitVisitorEntity entity = ConvertUtils.sourceToTarget(dto, VisitVisitorEntity.class);
         Result<IcNeighborHoodDTO> result = govOrgOpenFeignClient.getIcNeighbordhoodById(dto.getNeighborhoodId());
         if (result.success()) {
+            entity.setResidential(result.getData().getNeighborHoodName());
             entity.setGridId(result.getData().getGridId());
             entity.setAgencyId(result.getData().getAgencyId());
             entity.setParentAgencyId(result.getData().getParentAgencyId());
@@ -128,6 +131,23 @@ public class VisitVisitorServiceImpl extends BaseServiceImpl<VisitVisitorDao, Vi
         insert(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public VisitVisitorChartResultDTO getTraffic(VisitVisitorChartFormDTO dto) {
+        if (StringUtils.isBlank(dto.getDate())) {
+            dto.setDate(LocalDate.now().toString());
+        }
+        return baseDao.getTraffic(dto);
+    }
+
+    /**
+     * 设备下发
+     *
+     * @param dto
+     * @return void
+     * @author zhy
+     * @date 2022/7/28 9:13
+     */
     private void send(VisitVisitorFormDTO dto) {
         dhDeviceUtil.sendPerson(dto);
     }

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

@@ -27,5 +27,16 @@
         <result property="room" column="ROOM"/>
     </resultMap>
 
+    <select id="getTraffic" resultType="com.epmet.plugin.power.dto.visit.result.VisitVisitorChartResultDTO">
+        SELECT
+            h.`hour`,
+            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' )
+                AND DATE_FORMAT( v.CREATED_TIME, '%Y-%m-%d' ) = #{date}
+        GROUP BY
+            h.`hour`;
+    </select>
 
 </mapper>