diff --git a/src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java b/src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java index 3589529c..ee6be504 100644 --- a/src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java +++ b/src/main/java/com/youlai/boot/codegen/service/impl/CodegenServiceImpl.java @@ -224,11 +224,9 @@ public class CodegenServiceImpl implements CodegenService { } else if ("MapperXml".equals(templateName)) { return entityName + "Mapper" + extension; } else if ("API".equals(templateName)) { - // 生成 user.ts 命名 - return StrUtil.toSymbolCase(entityName, '-') + extension; + return "index" + extension; } else if ("API_TYPES".equals(templateName)) { - // 生成 types/api/user.ts - return StrUtil.toSymbolCase(entityName, '-') + extension; + return "types" + extension; } else if ("VIEW".equals(templateName)) { return "index.vue"; } @@ -255,18 +253,18 @@ public class CodegenServiceImpl implements CodegenService { + File.separator + moduleName ); } else if ("API".equals(templateName)) { - // path = "src/api/system"; path = (codegenProperties.getFrontendAppName() + File.separator + "src" - + File.separator + subPackageName + + File.separator + "api" + File.separator + moduleName + + File.separator + StrUtil.toSymbolCase(entityName, '-') ); } else if ("API_TYPES".equals(templateName)) { - // path = "src/types/api"; path = (codegenProperties.getFrontendAppName() + File.separator + "src" - + File.separator + "types" + File.separator + "api" + + File.separator + moduleName + + File.separator + StrUtil.toSymbolCase(entityName, '-') ); } else if ("VIEW".equals(templateName)) { // path = "src/views/system/user"; diff --git a/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java index 29447c21..96954a4b 100644 --- a/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java +++ b/src/main/java/com/youlai/boot/system/model/vo/VisitTrendVO.java @@ -23,8 +23,8 @@ public class VisitTrendVO { @Schema(description = "浏览量(PV)") private List pvList; - @Schema(description = "IP数") - private List ipList; + @Schema(description = "访客数(UV)") + private List uvList; } \ No newline at end of file diff --git a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java index 83833720..97bd1480 100644 --- a/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java +++ b/src/main/java/com/youlai/boot/system/service/impl/LogServiceImpl.java @@ -66,19 +66,19 @@ public class LogServiceImpl extends ServiceImpl // 将统计数据转换为 Map Map pvMap = pvCounts.stream().collect(Collectors.toMap(VisitCountDTO::getDate, VisitCountDTO::getCount)); - Map ipMap = ipCounts.stream().collect(Collectors.toMap(VisitCountDTO::getDate, VisitCountDTO::getCount)); + Map uvMap = ipCounts.stream().collect(Collectors.toMap(VisitCountDTO::getDate, VisitCountDTO::getCount)); - // 匹配日期和访问量/访问 IP 数 + // 匹配日期和访问量/访客数 List pvList = new ArrayList<>(); - List ipList = new ArrayList<>(); + List uvList = new ArrayList<>(); for (String date : dates) { pvList.add(pvMap.getOrDefault(date, 0)); - ipList.add(ipMap.getOrDefault(date, 0)); + uvList.add(uvMap.getOrDefault(date, 0)); } visitTrend.setPvList(pvList); - visitTrend.setIpList(ipList); + visitTrend.setUvList(uvList); return visitTrend; }