diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/StatisticsController.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/StatisticsController.java index bf371ec..3a0bcd1 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/StatisticsController.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/StatisticsController.java @@ -44,7 +44,7 @@ public class StatisticsController extends BaseController //询盘流量 rtnMap.put("ipInquiry",busiThirdItemService.inquiryMap(tenantId)); //询盘来源前十国家 - rtnMap.put("nationalData",busiThirdItemService.nationalData(tenantId)); + rtnMap.put("nationalData",busiThirdItemService.nationalData(tenantId,null,null,10)); //询盘设备 rtnMap.put("equipmentData",busiThirdItemService.equipmentData(tenantId)); //近一个月询盘数 @@ -59,4 +59,11 @@ public class StatisticsController extends BaseController public AjaxResult inquiryChart(String tenantId,String startDate,String endDate){ return success(busiThirdItemService.inquiryChart(tenantId,startDate,endDate)); } + /** + * 询盘国家分布，指定时间范围 + */ + @GetMapping("/countryChart") + public AjaxResult countryChart(String tenantId,String startDate,String endDate){ + return success(busiThirdItemService.nationalData(tenantId,startDate,endDate,null)); + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiInquiryItem.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiInquiryItem.java index 00596a5..d8f1b9f 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiInquiryItem.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiInquiryItem.java @@ -80,7 +80,6 @@ public class BusiInquiryItem extends DlBaseEntity private String equipment; /** 页面路径 */ - @Excel(name = "页面路径") private String pageUrl; /** 站点唯一编码（租户id） */ diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java index 9a8c719..8a99f01 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/domain/BusiThirdItem.java @@ -49,7 +49,6 @@ public class BusiThirdItem extends DlBaseEntity private String viewType; /** 页面路径 */ - @Excel(name = "页面路径") private String pageUrl; /** 设备类型 */ diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiChatMainMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiChatMainMapper.java index 202ad2f..7fdf367 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiChatMainMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiChatMainMapper.java @@ -33,7 +33,7 @@ public interface BusiChatMainMapper extends BaseMapper **/ Integer selectIpCount(@Param("tenantId")String tenantId,@Param("startDate")String startDate,@Param("endDate")String endDate); - List selectNationalSortList(@Param("tenantId")String tenantId); + List selectNationalSortList(@Param("tenantId")String tenantId,@Param("startDate")String startDate,@Param("endDate")String endDate); /** * 查询询盘设备 diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiInquiryItemMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiInquiryItemMapper.java index cc9ce73..07644c0 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiInquiryItemMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiInquiryItemMapper.java @@ -33,7 +33,7 @@ public interface BusiInquiryItemMapper extends BaseMapper **/ Integer selectIpCount(@Param("tenantId")String tenantId,@Param("startDate")String startDate,@Param("endDate")String endDate); - List selectNationalSortList(@Param("tenantId")String tenantId); + List selectNationalSortList(@Param("tenantId")String tenantId,@Param("startDate")String startDate,@Param("endDate")String endDate); /** * 查询询盘设备 diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiThirdItemMapper.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiThirdItemMapper.java index 8416e2a..2461d98 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiThirdItemMapper.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiThirdItemMapper.java @@ -4,10 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.busi.domain.BusiThirdItem; -import com.ruoyi.busi.vo.ChartDataVO; -import com.ruoyi.busi.vo.IndexInquiryVO; -import com.ruoyi.busi.vo.ThirdSoftVO; -import com.ruoyi.busi.vo.ThirdVO; +import com.ruoyi.busi.vo.*; import org.apache.ibatis.annotations.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -40,7 +37,7 @@ public interface BusiThirdItemMapper extends BaseMapper * @param tenantId 站点ID * @return java.util.List **/ - List selectNationalSortList(@Param("tenantId")String tenantId); + List selectNationalSortList(@Param("tenantId")String tenantId,@Param("startDate")String startDate,@Param("endDate")String endDate); /** * 查询询盘设备 diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiThirdItemService.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiThirdItemService.java index 884480f..feab1d9 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiThirdItemService.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiThirdItemService.java @@ -37,7 +37,7 @@ public interface IBusiThirdItemService extends IService * @param tenantId 站点编码 * @return java.util.List **/ - List nationalData(String tenantId); + List nationalData(String tenantId,String startDate,String endDate,Integer num); /** * 查询盘设备 @@ -67,4 +67,14 @@ public interface IBusiThirdItemService extends IService * @return java.util.Map **/ Map inquiryChart(String tenantId,String startDate,String endDate); + /** + * 询盘国家分布 + * @author vinjor-M + * @date 17:12 2025/7/16 + * @param tenantId 站点编码 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @return java.util.Map + **/ + Map countryChart(String tenantId, String startDate, String endDate); } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiThirdItemServiceImpl.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiThirdItemServiceImpl.java index f0e2f56..8f03d48 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiThirdItemServiceImpl.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiThirdItemServiceImpl.java @@ -139,13 +139,17 @@ public class BusiThirdItemServiceImpl extends ServiceImpl nationalData(String tenantId) { + public List nationalData(String tenantId,String startDate,String endDate,Integer num) { + //开始日期 + String startDateStr = null==startDate?null:startDate+StrConstants.START_DATE; + //截止日期 + String endDateStr = null==endDate?null:endDate+StrConstants.END_DATE; //三方系统跳转 - List thirdList = busiThirdItemMapper.selectNationalSortList(tenantId); + List thirdList = busiThirdItemMapper.selectNationalSortList(tenantId,startDateStr,endDateStr); //在线询盘 - List inquiryList = inquiryItemMapper.selectNationalSortList(tenantId); + List inquiryList = inquiryItemMapper.selectNationalSortList(tenantId,startDateStr,endDateStr); //在线聊天 - List chatList = chatMainMapper.selectNationalSortList(tenantId); + List chatList = chatMainMapper.selectNationalSortList(tenantId,startDateStr,endDateStr); //数据合并 Map nationalMap = new HashMap<>(); this.dealMapFun(thirdList,nationalMap); @@ -154,6 +158,9 @@ public class BusiThirdItemServiceImpl extends ServiceImpl dataVOList = new ArrayList<>(nationalMap.values()) .stream().sorted(Comparator.comparingInt(ChartDataVO::getValue).reversed()).collect(Collectors.toList()); + if(null!=num && dataVOList.size()>num){ + return dataVOList.subList(0,num); + } return dataVOList; } @@ -338,4 +345,25 @@ public class BusiThirdItemServiceImpl extends ServiceImpl + * @author vinjor-M + * @date 17:12 2025/7/16 + **/ + @Override + public Map countryChart(String tenantId, String startDate, String endDate) { + Map rtnMap = new HashMap<>(); + //开始日期 + String startDateStr = startDate+StrConstants.START_DATE; + //截止日期 + String endDateStr = endDate+StrConstants.END_DATE; + //先查出这段时间所有三方询盘国家分布情况 + + return rtnMap; + } } diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ChartDataVO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ChartDataVO.java index 50c1d0f..bf87046 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ChartDataVO.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/ChartDataVO.java @@ -2,8 +2,15 @@ package com.ruoyi.busi.vo; import lombok.Data; +/** + * 国家分布饼图实体 + * @author vinjor-M + * @date 16:28 2025/7/17 +**/ @Data public class ChartDataVO { + /** 国家名称 */ private String name; + /** 数量 */ private Integer value; } diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiChatMainMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiChatMainMapper.xml index b95514a..3f11fc8 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiChatMainMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiChatMainMapper.xml @@ -86,6 +86,12 @@ WHERE del_flag = '0' AND tenant_id = #{tenantId} + + and create_time >= #{startDate} + + + and create_time <= #{endDate} + GROUP BY national diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiInquiryItemMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiInquiryItemMapper.xml index a702ad8..b26cbf4 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiInquiryItemMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiInquiryItemMapper.xml @@ -72,6 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE del_flag = '0' AND tenant_id = #{tenantId} + + and create_time >= #{startDate} + + + and create_time <= #{endDate} + GROUP BY national diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml index bcfdb1c..621761d 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/busi/BusiThirdItemMapper.xml @@ -77,6 +77,12 @@ order by dbti.create_time DESC WHERE del_flag = '0' AND tenant_id = #{tenantId} + + and create_time >= #{startDate} + + + and create_time <= #{endDate} + GROUP BY national diff --git a/dl_vue/src/api/statistics/statistics.js b/dl_vue/src/api/statistics/statistics.js index 63cf54e..25d9da6 100644 --- a/dl_vue/src/api/statistics/statistics.js +++ b/dl_vue/src/api/statistics/statistics.js @@ -17,4 +17,12 @@ export function inquiryChart(query) { params: query }) } +//国家分布 +export function countryChart(query) { + return request({ + url: '/statistics/countryChart', + method: 'get', + params: query + }) +} diff --git a/dl_vue/src/views/dashboard/PieChart.vue b/dl_vue/src/views/dashboard/PieChart.vue index b807193..6c679c7 100644 --- a/dl_vue/src/views/dashboard/PieChart.vue +++ b/dl_vue/src/views/dashboard/PieChart.vue @@ -26,7 +26,7 @@ export default { }, data() { return { - chart: null + chart: null, } }, mounted() { @@ -68,18 +68,28 @@ export default { }, series: [ { - name: '', + name: '询盘设备', type: 'pie', roseType: 'radius', radius: [15, 95], center: ['50%', '38%'], data:dataArray, animationEasing: 'cubicInOut', - animationDuration: 2600 + animationDuration: 2600, + emphasis: { + itemStyle: { + shadowBlur: 10, + shadowOffsetX: 0, + shadowColor: 'rgba(0, 0, 0, 0.5)' + } + }, + label: { + formatter: '{b}: {c} ({d}%)' + } } ] }) - } + }, } } diff --git a/dl_vue/src/views/dashboard/PieCusChart.vue b/dl_vue/src/views/dashboard/PieCusChart.vue new file mode 100644 index 0000000..688847c --- /dev/null +++ b/dl_vue/src/views/dashboard/PieCusChart.vue @@ -0,0 +1,78 @@ + + + diff --git a/dl_vue/src/views/index.vue b/dl_vue/src/views/index.vue index 00ed8c0..3b03d4d 100644 --- a/dl_vue/src/views/index.vue +++ b/dl_vue/src/views/index.vue @@ -37,7 +37,7 @@ 三方询盘 -
+
在线询盘
diff --git a/dl_vue/src/views/statistics/thirdItem/countryChart.vue b/dl_vue/src/views/statistics/thirdItem/countryChart.vue index f8d3112..aa6b984 100644 --- a/dl_vue/src/views/statistics/thirdItem/countryChart.vue +++ b/dl_vue/src/views/statistics/thirdItem/countryChart.vue @@ -1,10 +1,122 @@ diff --git a/dl_vue/src/views/statistics/thirdItem/inquiryChart.vue b/dl_vue/src/views/statistics/thirdItem/inquiryChart.vue index b0d624a..7dee5dc 100644 --- a/dl_vue/src/views/statistics/thirdItem/inquiryChart.vue +++ b/dl_vue/src/views/statistics/thirdItem/inquiryChart.vue @@ -18,36 +18,16 @@ 重置 - +