Merge branch 'master' of http://192.168.0.115:3000/lyhzzz/4dkankan-center-user

src/main/java/com/fdkankan/ucenter/controller/SceneStatisticsController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.ucenter.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 百度统计场景流量量表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2022-10-31
+ */
+@RestController
+@RequestMapping("/ucenter/sceneStatistics")
+public class SceneStatisticsController {
+
+}
+

src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -1,41 +1,53 @@
 package com.fdkankan.ucenter.controller.app;
 
 import com.alibaba.fastjson.JSONObject;
-import com.amazonaws.services.marketplacemetering.model.UsageRecord;
-import com.dtflys.forest.annotation.JSONBody;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.constant.LoginConstant;
-import com.fdkankan.ucenter.entity.*;
-import com.fdkankan.ucenter.service.*;
+import com.fdkankan.ucenter.entity.Camera;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePro;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.ICameraService;
+import com.fdkankan.ucenter.service.IScene3dNumService;
+import com.fdkankan.ucenter.service.ISceneCooperationService;
+import com.fdkankan.ucenter.service.IScenePlusExtService;
+import com.fdkankan.ucenter.service.IScenePlusService;
+import com.fdkankan.ucenter.service.ISceneProService;
+import com.fdkankan.ucenter.service.ISceneStatisticsService;
+import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.service.impl.LoginService;
 import com.fdkankan.ucenter.vo.request.LoginParam;
+import com.fdkankan.ucenter.vo.request.RequestSceneStatistics;
 import com.fdkankan.ucenter.vo.response.LoginVo;
 import com.fdkankan.ucenter.vo.response.UserVo;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.HashMap;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
 @Slf4j
 @RestController
 @RequestMapping("/scene")
-public class SceneApiController {
+public class SceneApiController extends BaseController {
 
     @Autowired
     ISceneProService sceneProService;
@@ -53,6 +65,11 @@ public class SceneApiController {
     ICameraDetailService cameraDetailService;
     @Autowired
     ISceneCooperationService cooperationService;
+    @Autowired
+    private IScene3dNumService scene3dNumService;
+    @Autowired
+    private ISceneStatisticsService sceneStatisticsService;
+    @Autowired
 
     @Value("${main.url}")
     private String mainUrl;
@@ -209,4 +226,35 @@ public class SceneApiController {
         //登录成功
         response.sendRedirect(mainUrl + "mobile.html?token="+ loginVo.getToken() + "&app" + (lang == null ? "" : "&lang=" + lang)+"#/consumption/0" );
     }
+
+    /**
+     * 查找123看房未使用过的场景吗
+     * */
+    @PostMapping("/finSkSceneNum")
+    public Result finSkSceneNum(){
+        String num = scene3dNumService.generateSceneNum(null);
+        return Result.success(num);
+    }
+
+    /**
+     * 根据时间场景码等获取百度统量
+     * @param param
+     * @return
+     */
+    @PostMapping(value = "/statistics/findByTime")
+    public Result findByTime(@RequestBody RequestSceneStatistics param){
+
+        if(org.springframework.util.StringUtils.isEmpty(param.getSceneNum()) || param.getType() == null ||
+            org.springframework.util.StringUtils
+                .isEmpty(param.getStartDate()) || org.springframework.util.StringUtils.isEmpty(param.getEndDate())){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
+        }
+
+        return Result.success(sceneStatisticsService.findByTime(
+            DateUtil.string2Date(param.getStartDate(), DateUtil.YYYYMMDD_DATA_FORMAT),
+            DateUtil.string2Date(param.getEndDate(), DateUtil.YYYYMMDD_DATA_FORMAT),
+            param.getSceneNum(), param.getType()));
+    }
+
+
 }

src/main/java/com/fdkankan/ucenter/entity/SceneStatistics.java

@@ -0,0 +1,109 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 百度统计场景流量量表
+ * </p>
+ *
+ * @author 
+ * @since 2022-10-31
+ */
+@Getter
+@Setter
+@TableName("t_scene_statistics")
+public class SceneStatistics implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("scene_num")
+    private String sceneNum;
+
+    /**
+     * 浏览量(PV)
+     */
+    @TableField("pv_count")
+    private Integer pvCount;
+
+    /**
+     * 访客数(UV)
+     */
+    @TableField("visitor_count")
+    private Integer visitorCount;
+
+    /**
+     * IP 数
+     */
+    @TableField("ip_count")
+    private Integer ipCount;
+
+    /**
+     * 入口页次数
+     */
+    @TableField("visit1_count")
+    private Integer visit1Count;
+
+    /**
+     * 贡献下游浏览量
+     */
+    @TableField("outward_count")
+    private Integer outwardCount;
+
+    /**
+     * 退出页次数
+     */
+    @TableField("exit_count")
+    private Integer exitCount;
+
+    /**
+     * 平均停留时长， 秒
+     */
+    @TableField("average_stay_time")
+    private Integer averageStayTime;
+
+    /**
+     * 退出率，%
+     */
+    @TableField("exit_ratio")
+    private BigDecimal exitRatio;
+
+    /**
+     * 1:场景，2:热点，3:视频
+     */
+    @TableField("type")
+    private Integer type;
+
+    /**
+     * 日期（年月日）
+     */
+    @TableField("date_str")
+    private Date dateStr;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+
+}

src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"ucenter", getTables(new String[]{
-                "t_article",
+                "t_scene_statistics",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/ucenter/mapper/ISceneStatisticsMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.SceneStatistics;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 百度统计场景流量量表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-10-31
+ */
+@Mapper
+public interface ISceneStatisticsMapper extends BaseMapper<SceneStatistics> {
+
+}

src/main/java/com/fdkankan/ucenter/service/ISceneStatisticsService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.SceneStatistics;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 百度统计场景流量量表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-10-31
+ */
+public interface ISceneStatisticsService extends IService<SceneStatistics> {
+
+    List<SceneStatistics> findByTime(Date startDate, Date endDate, String sceneNum, Integer type);
+
+}

src/main/java/com/fdkankan/ucenter/service/impl/SceneStatisticsServiceImpl.java

@@ -0,0 +1,32 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.ucenter.entity.SceneStatistics;
+import com.fdkankan.ucenter.mapper.ISceneStatisticsMapper;
+import com.fdkankan.ucenter.service.ISceneStatisticsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 百度统计场景流量量表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-10-31
+ */
+@Service
+public class SceneStatisticsServiceImpl extends ServiceImpl<ISceneStatisticsMapper, SceneStatistics> implements ISceneStatisticsService {
+
+    @Override
+    public List<SceneStatistics> findByTime(Date startDate, Date endDate, String sceneNum, Integer type) {
+        return this.list(new LambdaQueryWrapper<SceneStatistics>()
+            .eq(SceneStatistics::getSceneNum, sceneNum)
+            .eq(SceneStatistics::getType, type)
+            .ge(SceneStatistics::getDateStr, startDate)
+            .le(SceneStatistics::getDateStr, endDate));
+    }
+
+}

src/main/java/com/fdkankan/ucenter/vo/request/RequestSceneStatistics.java

@@ -0,0 +1,32 @@
+package com.fdkankan.ucenter.vo.request;
+
+import lombok.Data;
+
+/**
+ * Created by Hb_zzZ on 2020/8/25.
+ */
+@Data
+public class RequestSceneStatistics {
+
+    /**
+     * 搜索百度数据的时间 YYYYMMDD
+     */
+    private String dateStr;
+
+    /**
+     * 开始时间 YYYYMMDD
+     */
+    private String startDate;
+
+    /**
+     * 结束时间 YYYYMMDD
+     */
+    private String endDate;
+
+    /**
+     * 场景码
+     */
+    private String sceneNum;
+
+    private Integer type;
+}

src/main/resources/mapper/ucenter/SceneStatisticsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.ucenter.mapper.ISceneStatisticsMapper">
+
+</mapper>