修改bug

ruoyi-demo/src/main/java/com/ruoyi/demo/constant/RedisContant.java

@@ -1,42 +1,104 @@
 package com.ruoyi.demo.constant;
 
+/**
+ * Redis缓存Key常量
+ */
 public class RedisContant {
-    public static String CHANNEL_MAP_AREA = "channel_area";  //保存渠道地图area数据的Hash名
-    public static int CHANNEL_MAP_AREA_TIME = 60*8;  //渠道地图area数据的超时时间
-    public static String CHANNEL_MAP_LIST = "channel_list";  //保存渠道地图list数据的Hash名
+    /**
+     * ChannelMapController 渠道地图
+     */
+    //获取渠道地图网点数量
+    public static String CHANNEL_MAP_AREA = "channel_area";
+    public static int CHANNEL_MAP_AREA_TIME = 60*8;
 
-    public static int CHANNEL_MAP_LIST_TIME = 60*8;  //渠道地图list数据的超时时间
-    public static String CHANNEL_MAP_POINT = "channel_point"; //保存渠道地图point数据的Hash名
+    //获取渠道地图网点列表
+    public static String CHANNEL_MAP_LIST = "channel_list";
+    public static int CHANNEL_MAP_LIST_TIME = 60*8;
 
-    public static int CHANNEL_MAP_POINT_TIME = 60*8;  //渠道地图point数据的超时时间
+    //获取渠道地图区内网点坐标信息
+    public static String CHANNEL_MAP_POINT = "channel_point";
 
+    public static int CHANNEL_MAP_POINT_TIME = 60*8;
 
+
+    /**
+     * ChannelAnalyseController 渠道分析
+     */
+    //渠道分析-城市等级分布
+    public static String CHANNEL_ANALYSE_CITYTIER = "channel_analyse_cityiter";
+    public static int CHANNEL_ANALYSE_CITYTIER_TIME = 60*8;
+
+    //渠道分析-标签分析
+    public static String CHANNEL_ANALYSE_TAG_ANLYSE = "channel_analyse_tag_anlyse";
+
+    public static int CHANNEL_ANALYSE_TAG_ANLYSE_TIME = 60*20;
+
+    //渠道分析-营业状态统计
+    public static String CHANNEL_ANALYSE_BUSINESS_STATUS_ANALYSE= "channel_analyse_business_status_analyse";
+
+    public static int CHANNEL_ANALYSE_BUSINESS_STATUS_ANALYSE_TIME = 60*8;
+
+    //渠道分析-人均消费水平统计
+    public static String CHANNEL_ANALYSE_PER_CAPITA_CONSUMP_ANALYSE = "channel_analyse_per_capita_consump_analyse";
+
+    public static int CHANNEL_ANALYSE_PER_CAPITA_CONSUMP_ANALYSE_TIME = 60*8;
+
+    //渠道分析-周边楼宇类型统计
+    public static String CHANNEL_ANALYSE_AROUND_BUILD_ANALYSE= "channel_analyse_around_build_analyse";
+
+    public static int CHANNEL_ANALYSE_AROUND_BUILD_ANALYSE_TIME = 60*8;
+
+    //渠道分析-经营时长分布统计
+    public static String CHANNEL_ANALYSE_OPERATE_TIME_ANALYSE = "channel_analyse_operate_time_analyse";
+
+    public static int CHANNEL_ANALYSE_OPERATE_TIME_ANALYSE_TIME = 60*8;
+
+    /**
+     * ToplogicalStoreWdController 点位评估-周边门店网点
+     */
+    //点位评估-周边门店网点列表
     public static String TOPOLOGICAL_STORE_WD_LIST = "topological_store_wd_list";
 
     public static int TOPOLOGICAL_STORE_WD_LIST_TIME = 60*8;
 
+    //点位评估-周边门店网点分类统计
     public static String TOPOLOGICAL_STORE_WD_CATEGORY = "topological_store_wd_category";
 
     public static int TOPOLOGICAL_STORE_WD_CATEGORY_TIME = 60*8;
 
+    //点位评估-周边门店网点
     public static String TOPOLOGICAL_STORE_WD_STORE_HISTOGRAM = "topological_store_wd_store_histogram";
 
     public static int TOPOLOGICAL_STORE_WD_STORE_HISTOGRAM_TIME = 60*8;
 
+    //点位评估-周边网点人均消费统计
     public static String TOPOLOGICAL_STORE_WD_PER_CAPITA_CONSUMP_HISTOGRAM = "topological_store_wd_pre_capita_consump_histogram";
 
     public static int TOPOLOGICAL_STORE_WD_PER_CAPITA_CONSUMP_HISTOGRAM_TIME = 60*8;
 
+    //渠道分析-网点热力图
     public static final String TOPOLOGICAL_STORE_WD_HEAT_MAP = "topological_store_wd_heat_map";
-
     public static final int TOPOLOGICAL_STORE_WD_HEAT_MAP_TIME = 60*8;
+
+    /**
+     * ToplogicalBuildWdController 点位评估-周边楼宇网点
+     */
+    //点位评估-周边楼宇网点列表
     public static String TOPOLOGICAL_BUILD_WD_LIST = "topological_build_wd_list";
     public static int TOPOLOGICAL_BUILD_WD_LIST_TIME = 60*8;
+
+    //点位评估-周边楼宇网点物业类型统计
     public static String TOPOLOGICAL_BUILD_WD_CATEGORY= "topological_build_wd_category";
     public static int TOPOLOGICAL_BUILD_WD_CATEGORY_TIME = 60*8;
 
+    //点位评估-周边楼宇网点分类统计
     public static String TOPOLOGICAL_BUILD_WD_BUILDING_HISTOGRAM = "topological_build_wd_building_histogram";
     public static int TOPOLOGICAL_BUILD_WD_BUILDING_HISTOGRAM_TIME = 60*8;
+
+    /**
+     * ToplogicalEnterpriseWdController 点位评估-周边企业网点
+     */
+    //点位评估-周边企业王
     public static String TOPOLOGICAL_ENTERPRISE_WD_LIST = "topological_enterprise_wd_list";
     public static int TOPOLOGICAL_ENTERPRISE_WD_LIST_TIME = 60*8;
 
@@ -47,28 +109,6 @@ public class RedisContant {
     public static String TOPOLOGICAL_HOUSE_WD_INFO = "topological_house_wd_info";
     public static int TOPOLOGICAL_HOUSE_WD_INFO_TIME = 60*8;
 
-    public static String CHANNEL_ANALYSE_CITYTIER = "channel_analyse_cityiter";
-    public static int CHANNEL_ANALYSE_CITYTIER_TIME = 60*8;
-
-    public static String CHANNEL_ANALYSE_TAG_ANLYSE = "channel_analyse_tag_anlyse";
-
-    public static int CHANNEL_ANALYSE_TAG_ANLYSE_TIME = 60*20;
-
-    public static String CHANNEL_ANALYSE_BUSINESS_STATUS_ANALYSE= "channel_analyse_business_status_analyse";
-
-    public static int CHANNEL_ANALYSE_BUSINESS_STATUS_ANALYSE_TIME = 60*8;
-
-    public static String CHANNEL_ANALYSE_PER_CAPITA_CONSUMP_ANALYSE = "channel_analyse_per_capita_consump_analyse";
-
-    public static int CHANNEL_ANALYSE_PER_CAPITA_CONSUMP_ANALYSE_TIME = 60*8;
-
-    public static String CHANNEL_ANALYSE_AROUND_BUILD_ANALYSE= "channel_analyse_around_build_analyse";
-
-    public static int CHANNEL_ANALYSE_AROUND_BUILD_ANALYSE_TIME = 60*8;
-
-    public static String CHANNEL_ANALYSE_OPERATE_TIME_ANALYSE = "channel_analyse_operate_time_analyse";
-
-    public static int CHANNEL_ANALYSE_OPERATE_TIME_ANALYSE_TIME = 60*8;
 
 
     public static String TOPOLOGICAL_COMMON_MAP = "topological_common_map";

ruoyi-demo/src/main/resources/mapper/demo/WdInfoDaoMapper.xml

@@ -3,11 +3,11 @@
 
 <mapper namespace="com.ruoyi.demo.mapper.WdInfoDao">
     <select id="selectTopologicalBuildWdList" resultType="com.ruoyi.demo.entity.TopologicalBuildingWd">
-        select ddt_wd_info.wd_id as around_wd_id,wd_name,wd_type_code,addr_code,addr_info,rent,build_type,property_type,lat,lng from ddt_wd_info left join ddt_build_wd on ddt_wd_info.wd_id = ddt_build_wd.wd_id ${ew.customSqlSegment}
+        select ddt_wd_info.wd_id as around_wd_id,wd_name as around_wd_name,wd_type_code as aroundWdTypeCode,addr_code,addr_info,rent,build_type,property_type,lat,lng from ddt_wd_info left join ddt_build_wd on ddt_wd_info.wd_id = ddt_build_wd.wd_id ${ew.customSqlSegment}
     </select>
 
     <select id="selectTopologicalHouseList" resultType="com.ruoyi.demo.entity.TopologicalHouseWd">
-        select ddt_wd_info.wd_id as around_wd_id,wd_name,wd_type_code,addr_code,addr_info,rent,households,people_count,property_type,lat,lng from ddt_wd_info left join ddt_house_wd on ddt_wd_info.wd_id = ddt_house_wd.wd_id ${ew.customSqlSegment}
+        select ddt_wd_info.wd_id as around_wd_id,wd_name as around_wd_name,wd_type_code as aroundWdTypeCodee,addr_code,addr_info,rent,households,people_count,property_type,lat,lng from ddt_wd_info left join ddt_house_wd on ddt_wd_info.wd_id = ddt_house_wd.wd_id ${ew.customSqlSegment}
     </select>
 </mapper>