From 43500ede696501fff6723663360a26c3bbb67bf6 Mon Sep 17 00:00:00 2001 From: Cxx0822 <1556464090@qq.com> Date: Tue, 10 Jun 2025 23:29:25 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4Blog=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cxx/admin/AdminServiceApplication.java | 1 - .../controller/BlogManageController.java | 6 +- .../controller/BudgetManageController.java | 27 --- .../controller/ServerMonitorController.java | 30 --- .../main/java/com/cxx/admin/dao/BlogDao.java | 9 +- .../cxx/admin}/dto/blog/BlogCategoryDto.java | 2 +- .../java/com/cxx/admin/dto/blog/BlogDto.java | 1 + .../cxx/admin}/dto/blog/BlogLatestDto.java | 2 +- .../com/cxx/admin}/dto/blog/BlogStatsDto.java | 2 +- .../com/cxx/admin}/dto/blog/BlogVisitDto.java | 2 +- .../main/java/com/cxx/admin}/entity/Blog.java | 2 +- .../com/cxx/admin}/entity/BlogCategory.java | 2 +- .../com/cxx/admin}/entity/BlogContent.java | 2 +- .../java/com/cxx/admin}/entity/BlogVisit.java | 2 +- .../com/cxx/admin}/entity/FileRecord.java | 2 +- .../cxx/admin}/mapper/BlogCategoryMapper.java | 4 +- .../cxx/admin}/mapper/BlogContentMapper.java | 4 +- .../com/cxx/admin}/mapper/BlogMapper.java | 4 +- .../cxx/admin}/mapper/BlogVisitMapper.java | 4 +- .../cxx/admin}/mapper/FileRecordMapper.java | 4 +- .../com/cxx/admin/schedule/ServerMonitor.java | 21 -- .../cxx/admin/service/BlogManageService.java | 7 +- .../admin/service/BudgetManageService.java | 8 - .../admin/service/ServerMonitorService.java | 19 -- .../service/impl/BlogManageServiceImpl.java | 18 +- .../service/impl/BudgetManageServiceImpl.java | 43 ---- .../admin/service/impl/FileServiceImpl.java | 4 +- .../impl/ServerMonitorServiceImpl.java | 214 ------------------ .../java/com/cxx/admin/vo}/BlogQueryVo.java | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/mapper/BlogMapper.xml | 8 +- blog-service/Dockerfile | 6 - blog-service/pom.xml | 1 - .../com/cxx/blog/BlogServiceApplication.java | 13 -- .../com/cxx/blog/config/BlogVisitMonitor.java | 71 ------ .../cxx/blog/controller/BlogController.java | 62 ----- .../main/java/com/cxx/blog/dao/BlogDao.java | 25 -- .../com/cxx/blog/service/BlogService.java | 28 --- .../blog/service/impl/BlogServiceImpl.java | 73 ------ .../java/com/cxx/blog/util/BlogUtils.java | 36 --- .../main/java/com/cxx/blog/util/IpUtils.java | 59 ----- .../src/main/resources/application-dev.yml | 11 - .../src/main/resources/application-docker.yml | 13 -- .../src/main/resources/application-prod.yml | 12 - .../src/main/resources/application.yml | 20 -- .../main/resources/logback-spring-drop.xml | 120 ---------- .../src/main/resources/mapper/blogMapper.xml | 90 -------- .../java/com/cxx/blog/BlogServiceTest.java | 18 -- .../java/com/cxx/common/dto/blog/BlogDto.java | 1 - .../com/cxx/common/dto/budget/BudgetDto.java | 51 ----- .../java/com/cxx/common/entity/Budget.java | 38 ---- .../com/cxx/common/entity/BudgetCategory.java | 15 -- .../common/mapper/BudgetCategoryMapper.java | 9 - .../com/cxx/common/mapper/BudgetMapper.java | 9 - .../cxx/home/controller/BillController.java | 10 +- .../controller/BillManageController.java | 8 +- .../cxx/home/controller/BudgetController.java | 67 ------ .../cxx/home/controller/PlanController.java | 6 +- .../main/java/com/cxx/home/dao/BillDao.java | 7 +- .../main/java/com/cxx/home/dao/BudgetDao.java | 17 -- .../main/java/com/cxx/home/dao/PlanDao.java | 6 +- .../cxx/home}/dto/bill/BillCategoryDto.java | 2 +- .../com/cxx/home}/dto/bill/BillItemDto.java | 2 +- .../com/cxx/home}/dto/bill/BillRecordDto.java | 2 +- .../cxx/home}/dto/bill/BillSummaryDto.java | 2 +- .../cxx/home}/dto/message/MailMessageDto.java | 2 +- .../java/com/cxx/home}/dto/plan/PlanDto.java | 2 +- .../com/cxx/home}/dto/plan/PlanStatsDto.java | 2 +- .../java/com/cxx/home}/dto/task/TaskDto.java | 2 +- .../java/com/cxx/home}/entity/BillBook.java | 2 +- .../com/cxx/home}/entity/BillCategory.java | 2 +- .../java/com/cxx/home}/entity/BillImage.java | 2 +- .../java/com/cxx/home}/entity/BillPay.java | 2 +- .../java/com/cxx/home}/entity/BillRecord.java | 2 +- .../main/java/com/cxx/home}/entity/Plan.java | 2 +- .../main/java/com/cxx/home}/entity/Task.java | 2 +- .../com/cxx/home}/mapper/BillBookMapper.java | 4 +- .../cxx/home}/mapper/BillCategoryMapper.java | 4 +- .../com/cxx/home}/mapper/BillImageMapper.java | 4 +- .../com/cxx/home}/mapper/BillPayMapper.java | 4 +- .../cxx/home}/mapper/BillRecordMapper.java | 4 +- .../java/com/cxx/home}/mapper/PlanMapper.java | 4 +- .../java/com/cxx/home}/mapper/TaskMapper.java | 4 +- .../java/com/cxx/home/schedule/QuartzDto.java | 2 +- .../java/com/cxx/home/schedule/QuartzJob.java | 6 +- .../com/cxx/home/schedule/QuartzUtils.java | 2 +- .../cxx/home}/service/BillManageService.java | 6 +- .../cxx/home/service/BillRecordService.java | 10 +- .../com/cxx/home/service/BudgetService.java | 23 -- .../com/cxx/home/service/MessageService.java | 2 +- .../com/cxx/home/service/PlanService.java | 6 +- .../com/cxx/home/service/QuartzService.java | 2 +- .../com/cxx/home/service/TaskService.java | 2 +- .../service/impl/BillManageServiceImpl.java | 20 +- .../service/impl/BillRecordServiceImpl.java | 19 +- .../home/service/impl/BudgetServiceImpl.java | 88 ------- .../home/service/impl/MessageServiceImpl.java | 2 +- .../home/service/impl/PlanServiceImpl.java | 14 +- .../home/service/impl/QuartzServiceImpl.java | 4 +- .../home/service/impl/TaskServiceImpl.java | 6 +- .../java/com/cxx/home/vo}/BillQueryVo.java | 2 +- .../java/com/cxx/home/vo}/PlanQueryVo.java | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/mapper/BillMapper.xml | 10 +- .../main/resources/mapper/BudgetMapper.xml | 37 --- .../src/main/resources/mapper/PlanMapper.xml | 4 +- pom.xml | 1 - 107 files changed, 155 insertions(+), 1535 deletions(-) delete mode 100644 admin-service/src/main/java/com/cxx/admin/controller/BudgetManageController.java delete mode 100644 admin-service/src/main/java/com/cxx/admin/controller/ServerMonitorController.java rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/dto/blog/BlogCategoryDto.java (89%) create mode 100644 admin-service/src/main/java/com/cxx/admin/dto/blog/BlogDto.java rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/dto/blog/BlogLatestDto.java (90%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/dto/blog/BlogStatsDto.java (91%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/dto/blog/BlogVisitDto.java (95%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/entity/Blog.java (96%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/entity/BlogCategory.java (93%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/entity/BlogContent.java (93%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/entity/BlogVisit.java (94%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/entity/FileRecord.java (94%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/mapper/BlogCategoryMapper.java (71%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/mapper/BlogContentMapper.java (71%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/mapper/BlogMapper.java (71%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/mapper/BlogVisitMapper.java (71%) rename {common/src/main/java/com/cxx/common => admin-service/src/main/java/com/cxx/admin}/mapper/FileRecordMapper.java (71%) delete mode 100644 admin-service/src/main/java/com/cxx/admin/schedule/ServerMonitor.java delete mode 100644 admin-service/src/main/java/com/cxx/admin/service/BudgetManageService.java delete mode 100644 admin-service/src/main/java/com/cxx/admin/service/ServerMonitorService.java delete mode 100644 admin-service/src/main/java/com/cxx/admin/service/impl/BudgetManageServiceImpl.java delete mode 100644 admin-service/src/main/java/com/cxx/admin/service/impl/ServerMonitorServiceImpl.java rename {common/src/main/java/com/cxx/common/vo/blog => admin-service/src/main/java/com/cxx/admin/vo}/BlogQueryVo.java (92%) delete mode 100644 blog-service/Dockerfile delete mode 100644 blog-service/pom.xml delete mode 100644 blog-service/src/main/java/com/cxx/blog/BlogServiceApplication.java delete mode 100644 blog-service/src/main/java/com/cxx/blog/config/BlogVisitMonitor.java delete mode 100644 blog-service/src/main/java/com/cxx/blog/controller/BlogController.java delete mode 100644 blog-service/src/main/java/com/cxx/blog/dao/BlogDao.java delete mode 100644 blog-service/src/main/java/com/cxx/blog/service/BlogService.java delete mode 100644 blog-service/src/main/java/com/cxx/blog/service/impl/BlogServiceImpl.java delete mode 100644 blog-service/src/main/java/com/cxx/blog/util/BlogUtils.java delete mode 100644 blog-service/src/main/java/com/cxx/blog/util/IpUtils.java delete mode 100644 blog-service/src/main/resources/application-dev.yml delete mode 100644 blog-service/src/main/resources/application-docker.yml delete mode 100644 blog-service/src/main/resources/application-prod.yml delete mode 100644 blog-service/src/main/resources/application.yml delete mode 100644 blog-service/src/main/resources/logback-spring-drop.xml delete mode 100644 blog-service/src/main/resources/mapper/blogMapper.xml delete mode 100644 blog-service/src/test/java/com/cxx/blog/BlogServiceTest.java delete mode 100644 common/src/main/java/com/cxx/common/dto/blog/BlogDto.java delete mode 100644 common/src/main/java/com/cxx/common/dto/budget/BudgetDto.java delete mode 100644 common/src/main/java/com/cxx/common/entity/Budget.java delete mode 100644 common/src/main/java/com/cxx/common/entity/BudgetCategory.java delete mode 100644 common/src/main/java/com/cxx/common/mapper/BudgetCategoryMapper.java delete mode 100644 common/src/main/java/com/cxx/common/mapper/BudgetMapper.java rename {admin-service/src/main/java/com/cxx/admin => home-service/src/main/java/com/cxx/home}/controller/BillManageController.java (92%) delete mode 100644 home-service/src/main/java/com/cxx/home/controller/BudgetController.java delete mode 100644 home-service/src/main/java/com/cxx/home/dao/BudgetDao.java rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/bill/BillCategoryDto.java (92%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/bill/BillItemDto.java (94%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/bill/BillRecordDto.java (97%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/bill/BillSummaryDto.java (97%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/message/MailMessageDto.java (79%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/plan/PlanDto.java (97%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/plan/PlanStatsDto.java (93%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/dto/task/TaskDto.java (94%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/entity/BillBook.java (93%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/entity/BillCategory.java (94%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/entity/BillImage.java (90%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/entity/BillPay.java (93%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/entity/BillRecord.java (96%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/entity/Plan.java (97%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/entity/Task.java (95%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/mapper/BillBookMapper.java (71%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/mapper/BillCategoryMapper.java (71%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/mapper/BillImageMapper.java (71%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/mapper/BillPayMapper.java (71%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/mapper/BillRecordMapper.java (71%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/mapper/PlanMapper.java (71%) rename {common/src/main/java/com/cxx/common => home-service/src/main/java/com/cxx/home}/mapper/TaskMapper.java (71%) rename {admin-service/src/main/java/com/cxx/admin => home-service/src/main/java/com/cxx/home}/service/BillManageService.java (76%) delete mode 100644 home-service/src/main/java/com/cxx/home/service/BudgetService.java rename {admin-service/src/main/java/com/cxx/admin => home-service/src/main/java/com/cxx/home}/service/impl/BillManageServiceImpl.java (90%) delete mode 100644 home-service/src/main/java/com/cxx/home/service/impl/BudgetServiceImpl.java rename {common/src/main/java/com/cxx/common/vo/bill => home-service/src/main/java/com/cxx/home/vo}/BillQueryVo.java (92%) rename {common/src/main/java/com/cxx/common/vo/plan => home-service/src/main/java/com/cxx/home/vo}/PlanQueryVo.java (89%) delete mode 100644 home-service/src/main/resources/mapper/BudgetMapper.xml diff --git a/admin-service/src/main/java/com/cxx/admin/AdminServiceApplication.java b/admin-service/src/main/java/com/cxx/admin/AdminServiceApplication.java index 0c9c2ed..5c376ed 100644 --- a/admin-service/src/main/java/com/cxx/admin/AdminServiceApplication.java +++ b/admin-service/src/main/java/com/cxx/admin/AdminServiceApplication.java @@ -7,7 +7,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @MapperScan(basePackages = {"com.cxx.common.mapper", "com.cxx.admin.mapper", "com.cxx.admin.dao"}) -@EnableScheduling public class AdminServiceApplication { public static void main(String[] args) { SpringApplication.run(AdminServiceApplication.class, args); diff --git a/admin-service/src/main/java/com/cxx/admin/controller/BlogManageController.java b/admin-service/src/main/java/com/cxx/admin/controller/BlogManageController.java index 3cdcfc6..9352147 100644 --- a/admin-service/src/main/java/com/cxx/admin/controller/BlogManageController.java +++ b/admin-service/src/main/java/com/cxx/admin/controller/BlogManageController.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.cxx.admin.service.BlogManageService; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogVisitDto; +import com.cxx.admin.dto.blog.BlogCategoryDto; +import com.cxx.admin.dto.blog.BlogDto; +import com.cxx.admin.dto.blog.BlogVisitDto; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/admin-service/src/main/java/com/cxx/admin/controller/BudgetManageController.java b/admin-service/src/main/java/com/cxx/admin/controller/BudgetManageController.java deleted file mode 100644 index 432f85c..0000000 --- a/admin-service/src/main/java/com/cxx/admin/controller/BudgetManageController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cxx.admin.controller; - -import com.cxx.admin.service.BudgetManageService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/budget-manage") -@Tag(name = "预算管理") -public class BudgetManageController { - @Resource - private BudgetManageService budgetManageService; - - @Operation(summary = "新增预算类别") - @PostMapping("/category") - public Boolean addBudgetCategory(@RequestParam String category) { - return budgetManageService.addBudgetCategory(category); - } - - @Operation(summary = "更新预算类别") - @PutMapping("/category/{id}") - public Boolean updateBudgetCategory(@PathVariable("id") Long id, @RequestParam String category) { - return budgetManageService.updateBudgetCategory(id, category); - } -} diff --git a/admin-service/src/main/java/com/cxx/admin/controller/ServerMonitorController.java b/admin-service/src/main/java/com/cxx/admin/controller/ServerMonitorController.java deleted file mode 100644 index baa27d5..0000000 --- a/admin-service/src/main/java/com/cxx/admin/controller/ServerMonitorController.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.cxx.admin.controller; - -import com.cxx.admin.dto.server.*; -import com.cxx.admin.service.ServerMonitorService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/server-monitor") -@Tag(name = "服务器监控") -public class ServerMonitorController { - @Resource - private ServerMonitorService serverMonitorService; - - @Operation(summary = "系统信息") - @GetMapping("/system/info") - public SystemInfoDto getSystemInfo() { - return serverMonitorService.getSystemInfo(); - } - - @Operation(summary = "系统指标") - @GetMapping("/system/metrics") - public List querySystemMetrics(@RequestParam String range) { - return serverMonitorService.querySystemMetrics(range); - } -} \ No newline at end of file diff --git a/admin-service/src/main/java/com/cxx/admin/dao/BlogDao.java b/admin-service/src/main/java/com/cxx/admin/dao/BlogDao.java index 6060e8f..07d26aa 100644 --- a/admin-service/src/main/java/com/cxx/admin/dao/BlogDao.java +++ b/admin-service/src/main/java/com/cxx/admin/dao/BlogDao.java @@ -1,11 +1,10 @@ package com.cxx.admin.dao; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogVisitDto; -import com.cxx.common.entity.Blog; -import com.cxx.common.vo.blog.BlogQueryVo; +import com.cxx.admin.dto.blog.BlogCategoryDto; +import com.cxx.admin.dto.blog.BlogDto; +import com.cxx.admin.dto.blog.BlogVisitDto; +import com.cxx.admin.entity.Blog; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/common/src/main/java/com/cxx/common/dto/blog/BlogCategoryDto.java b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogCategoryDto.java similarity index 89% rename from common/src/main/java/com/cxx/common/dto/blog/BlogCategoryDto.java rename to admin-service/src/main/java/com/cxx/admin/dto/blog/BlogCategoryDto.java index 36bb833..2fd20de 100644 --- a/common/src/main/java/com/cxx/common/dto/blog/BlogCategoryDto.java +++ b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogCategoryDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.blog; +package com.cxx.admin.dto.blog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogDto.java b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogDto.java new file mode 100644 index 0000000..efe5096 --- /dev/null +++ b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogDto.java @@ -0,0 +1 @@ +package com.cxx.admin.dto.blog; import com.cxx.common.PlainView; import com.cxx.common.ReadView; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import java.util.Date; @Getter @Setter @JsonView(PlainView.class) public class BlogDto { @Schema(description = "id") @JsonView(ReadView.class) private Long id; @Schema(description = "博客标题") private String title; @Schema(description = "置顶值") private Integer topValue; @Schema(description = "是否是精品") private Boolean isGreat; @Schema(description = "博客类别") private String category; @Schema(description = "博客简介") @JsonView(ReadView.class) private String summary; @Schema(description = "博客内容") private String content; @Schema(description = "博客字数") @JsonView(ReadView.class) private Integer wordCount; @Schema(description = "博客时长") @JsonView(ReadView.class) private Double readDuration; @Schema(description = "博客访问人数") @JsonView(ReadView.class) private Integer visitCount; @Schema(description = "创建时间") @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonView(ReadView.class) private Date createTime; @Schema(description = "更新时间") @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonView(ReadView.class) private Date updateTime; } \ No newline at end of file diff --git a/common/src/main/java/com/cxx/common/dto/blog/BlogLatestDto.java b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogLatestDto.java similarity index 90% rename from common/src/main/java/com/cxx/common/dto/blog/BlogLatestDto.java rename to admin-service/src/main/java/com/cxx/admin/dto/blog/BlogLatestDto.java index 60ac2c0..06254d9 100644 --- a/common/src/main/java/com/cxx/common/dto/blog/BlogLatestDto.java +++ b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogLatestDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.blog; +package com.cxx.admin.dto.blog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/common/src/main/java/com/cxx/common/dto/blog/BlogStatsDto.java b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogStatsDto.java similarity index 91% rename from common/src/main/java/com/cxx/common/dto/blog/BlogStatsDto.java rename to admin-service/src/main/java/com/cxx/admin/dto/blog/BlogStatsDto.java index 5a03072..769c894 100644 --- a/common/src/main/java/com/cxx/common/dto/blog/BlogStatsDto.java +++ b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogStatsDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.blog; +package com.cxx.admin.dto.blog; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/common/src/main/java/com/cxx/common/dto/blog/BlogVisitDto.java b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogVisitDto.java similarity index 95% rename from common/src/main/java/com/cxx/common/dto/blog/BlogVisitDto.java rename to admin-service/src/main/java/com/cxx/admin/dto/blog/BlogVisitDto.java index fd8346b..9606346 100644 --- a/common/src/main/java/com/cxx/common/dto/blog/BlogVisitDto.java +++ b/admin-service/src/main/java/com/cxx/admin/dto/blog/BlogVisitDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.blog; +package com.cxx.admin.dto.blog; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/common/src/main/java/com/cxx/common/entity/Blog.java b/admin-service/src/main/java/com/cxx/admin/entity/Blog.java similarity index 96% rename from common/src/main/java/com/cxx/common/entity/Blog.java rename to admin-service/src/main/java/com/cxx/admin/entity/Blog.java index 4aa6e27..1020c6b 100644 --- a/common/src/main/java/com/cxx/common/entity/Blog.java +++ b/admin-service/src/main/java/com/cxx/admin/entity/Blog.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.admin.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/BlogCategory.java b/admin-service/src/main/java/com/cxx/admin/entity/BlogCategory.java similarity index 93% rename from common/src/main/java/com/cxx/common/entity/BlogCategory.java rename to admin-service/src/main/java/com/cxx/admin/entity/BlogCategory.java index e6734f6..0be5cd6 100644 --- a/common/src/main/java/com/cxx/common/entity/BlogCategory.java +++ b/admin-service/src/main/java/com/cxx/admin/entity/BlogCategory.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.admin.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/BlogContent.java b/admin-service/src/main/java/com/cxx/admin/entity/BlogContent.java similarity index 93% rename from common/src/main/java/com/cxx/common/entity/BlogContent.java rename to admin-service/src/main/java/com/cxx/admin/entity/BlogContent.java index cc88b57..d7518df 100644 --- a/common/src/main/java/com/cxx/common/entity/BlogContent.java +++ b/admin-service/src/main/java/com/cxx/admin/entity/BlogContent.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.admin.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/BlogVisit.java b/admin-service/src/main/java/com/cxx/admin/entity/BlogVisit.java similarity index 94% rename from common/src/main/java/com/cxx/common/entity/BlogVisit.java rename to admin-service/src/main/java/com/cxx/admin/entity/BlogVisit.java index 70b3a81..1847bf7 100644 --- a/common/src/main/java/com/cxx/common/entity/BlogVisit.java +++ b/admin-service/src/main/java/com/cxx/admin/entity/BlogVisit.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.admin.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/FileRecord.java b/admin-service/src/main/java/com/cxx/admin/entity/FileRecord.java similarity index 94% rename from common/src/main/java/com/cxx/common/entity/FileRecord.java rename to admin-service/src/main/java/com/cxx/admin/entity/FileRecord.java index 75e4bbd..2cc9842 100644 --- a/common/src/main/java/com/cxx/common/entity/FileRecord.java +++ b/admin-service/src/main/java/com/cxx/admin/entity/FileRecord.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.admin.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/mapper/BlogCategoryMapper.java b/admin-service/src/main/java/com/cxx/admin/mapper/BlogCategoryMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BlogCategoryMapper.java rename to admin-service/src/main/java/com/cxx/admin/mapper/BlogCategoryMapper.java index 907a07c..313080e 100644 --- a/common/src/main/java/com/cxx/common/mapper/BlogCategoryMapper.java +++ b/admin-service/src/main/java/com/cxx/admin/mapper/BlogCategoryMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BlogCategory; +import com.cxx.admin.entity.BlogCategory; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/BlogContentMapper.java b/admin-service/src/main/java/com/cxx/admin/mapper/BlogContentMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BlogContentMapper.java rename to admin-service/src/main/java/com/cxx/admin/mapper/BlogContentMapper.java index b349799..82a6935 100644 --- a/common/src/main/java/com/cxx/common/mapper/BlogContentMapper.java +++ b/admin-service/src/main/java/com/cxx/admin/mapper/BlogContentMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BlogContent; +import com.cxx.admin.entity.BlogContent; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/BlogMapper.java b/admin-service/src/main/java/com/cxx/admin/mapper/BlogMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BlogMapper.java rename to admin-service/src/main/java/com/cxx/admin/mapper/BlogMapper.java index 865077d..11ce550 100644 --- a/common/src/main/java/com/cxx/common/mapper/BlogMapper.java +++ b/admin-service/src/main/java/com/cxx/admin/mapper/BlogMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.Blog; +import com.cxx.admin.entity.Blog; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/BlogVisitMapper.java b/admin-service/src/main/java/com/cxx/admin/mapper/BlogVisitMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BlogVisitMapper.java rename to admin-service/src/main/java/com/cxx/admin/mapper/BlogVisitMapper.java index 3e1f101..56c05be 100644 --- a/common/src/main/java/com/cxx/common/mapper/BlogVisitMapper.java +++ b/admin-service/src/main/java/com/cxx/admin/mapper/BlogVisitMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BlogVisit; +import com.cxx.admin.entity.BlogVisit; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/FileRecordMapper.java b/admin-service/src/main/java/com/cxx/admin/mapper/FileRecordMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/FileRecordMapper.java rename to admin-service/src/main/java/com/cxx/admin/mapper/FileRecordMapper.java index 1ba2e3d..491963d 100644 --- a/common/src/main/java/com/cxx/common/mapper/FileRecordMapper.java +++ b/admin-service/src/main/java/com/cxx/admin/mapper/FileRecordMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.FileRecord; +import com.cxx.admin.entity.FileRecord; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/admin-service/src/main/java/com/cxx/admin/schedule/ServerMonitor.java b/admin-service/src/main/java/com/cxx/admin/schedule/ServerMonitor.java deleted file mode 100644 index 277a69f..0000000 --- a/admin-service/src/main/java/com/cxx/admin/schedule/ServerMonitor.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.cxx.admin.schedule; - -import com.cxx.admin.service.ServerMonitorService; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - - -@Component -@Slf4j -public class ServerMonitor { - @Resource - private ServerMonitorService serverMonitorService; - - // @Scheduled(fixedRate = 60000) - public void collectAndStoreMetrics() { - log.info("开始存储服务器状态"); - serverMonitorService.storeSystemMetrics(); - log.info("结束存储服务器状态"); - } -} diff --git a/admin-service/src/main/java/com/cxx/admin/service/BlogManageService.java b/admin-service/src/main/java/com/cxx/admin/service/BlogManageService.java index 6d38c9b..790b6f2 100644 --- a/admin-service/src/main/java/com/cxx/admin/service/BlogManageService.java +++ b/admin-service/src/main/java/com/cxx/admin/service/BlogManageService.java @@ -1,10 +1,9 @@ package com.cxx.admin.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogVisitDto; -import com.cxx.common.vo.blog.BlogQueryVo; +import com.cxx.admin.dto.blog.BlogCategoryDto; +import com.cxx.admin.dto.blog.BlogDto; +import com.cxx.admin.dto.blog.BlogVisitDto; import java.util.List; diff --git a/admin-service/src/main/java/com/cxx/admin/service/BudgetManageService.java b/admin-service/src/main/java/com/cxx/admin/service/BudgetManageService.java deleted file mode 100644 index 37c19f6..0000000 --- a/admin-service/src/main/java/com/cxx/admin/service/BudgetManageService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.cxx.admin.service; - - -public interface BudgetManageService { - Boolean addBudgetCategory(String category); - - Boolean updateBudgetCategory(Long id, String category); -} diff --git a/admin-service/src/main/java/com/cxx/admin/service/ServerMonitorService.java b/admin-service/src/main/java/com/cxx/admin/service/ServerMonitorService.java deleted file mode 100644 index fc571a8..0000000 --- a/admin-service/src/main/java/com/cxx/admin/service/ServerMonitorService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.cxx.admin.service; - -import com.cxx.admin.dto.server.*; - -import java.util.List; - -public interface ServerMonitorService { - CpuDto getCpuInfo(); - - MemoryDto getMemoryInfo(); - - DiskDto getDiskInfo(); - - SystemInfoDto getSystemInfo(); - - void storeSystemMetrics(); - - List querySystemMetrics(String range) ; -} diff --git a/admin-service/src/main/java/com/cxx/admin/service/impl/BlogManageServiceImpl.java b/admin-service/src/main/java/com/cxx/admin/service/impl/BlogManageServiceImpl.java index 6379228..674ecc0 100644 --- a/admin-service/src/main/java/com/cxx/admin/service/impl/BlogManageServiceImpl.java +++ b/admin-service/src/main/java/com/cxx/admin/service/impl/BlogManageServiceImpl.java @@ -6,15 +6,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cxx.admin.dao.BlogDao; import com.cxx.admin.service.BlogManageService; import com.cxx.admin.util.BlogUtils; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogVisitDto; -import com.cxx.common.entity.Blog; -import com.cxx.common.entity.BlogCategory; -import com.cxx.common.entity.BlogContent; -import com.cxx.common.mapper.BlogCategoryMapper; -import com.cxx.common.mapper.BlogContentMapper; -import com.cxx.common.mapper.BlogMapper; +import com.cxx.admin.dto.blog.BlogCategoryDto; +import com.cxx.admin.dto.blog.BlogDto; +import com.cxx.admin.dto.blog.BlogVisitDto; +import com.cxx.admin.entity.Blog; +import com.cxx.admin.entity.BlogCategory; +import com.cxx.admin.entity.BlogContent; +import com.cxx.admin.mapper.BlogCategoryMapper; +import com.cxx.admin.mapper.BlogContentMapper; +import com.cxx.admin.mapper.BlogMapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/admin-service/src/main/java/com/cxx/admin/service/impl/BudgetManageServiceImpl.java b/admin-service/src/main/java/com/cxx/admin/service/impl/BudgetManageServiceImpl.java deleted file mode 100644 index e858e4c..0000000 --- a/admin-service/src/main/java/com/cxx/admin/service/impl/BudgetManageServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.cxx.admin.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.cxx.admin.service.BudgetManageService; -import com.cxx.common.entity.BudgetCategory; -import com.cxx.common.mapper.BudgetCategoryMapper; -import com.cxx.framework.web.CustomException; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.Objects; - -@Service -public class BudgetManageServiceImpl implements BudgetManageService { - @Resource - private BudgetCategoryMapper budgetCategoryMapper; - - - @Override - public Boolean addBudgetCategory(String category) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (budgetCategoryMapper.exists(queryWrapper.eq(BudgetCategory::getName, category))) { - throw new CustomException("该预算类别已存在"); - } - - BudgetCategory budgetCategory = new BudgetCategory(); - budgetCategory.setName(category); - return budgetCategoryMapper.insert(budgetCategory) == 1; - } - - @Override - public Boolean updateBudgetCategory(Long id, String category) { - if (Objects.isNull(budgetCategoryMapper.selectById(id))) { - throw new CustomException("该预算类别不存在"); - } - - BudgetCategory budgetCategory = new BudgetCategory(); - budgetCategory.setId(id); - budgetCategory.setName(category); - - return budgetCategoryMapper.updateById(budgetCategory) == 1; - } -} diff --git a/admin-service/src/main/java/com/cxx/admin/service/impl/FileServiceImpl.java b/admin-service/src/main/java/com/cxx/admin/service/impl/FileServiceImpl.java index 804940f..6b525db 100644 --- a/admin-service/src/main/java/com/cxx/admin/service/impl/FileServiceImpl.java +++ b/admin-service/src/main/java/com/cxx/admin/service/impl/FileServiceImpl.java @@ -10,8 +10,8 @@ import com.cxx.admin.service.FileService; import com.cxx.admin.dto.file.FileRecordDto; import com.cxx.admin.util.FileUtils; import com.cxx.admin.util.UploadFileUtil; -import com.cxx.common.entity.FileRecord; -import com.cxx.common.mapper.FileRecordMapper; +import com.cxx.admin.entity.FileRecord; +import com.cxx.admin.mapper.FileRecordMapper; import com.cxx.framework.web.CustomException; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/admin-service/src/main/java/com/cxx/admin/service/impl/ServerMonitorServiceImpl.java b/admin-service/src/main/java/com/cxx/admin/service/impl/ServerMonitorServiceImpl.java deleted file mode 100644 index 5528e96..0000000 --- a/admin-service/src/main/java/com/cxx/admin/service/impl/ServerMonitorServiceImpl.java +++ /dev/null @@ -1,214 +0,0 @@ -package com.cxx.admin.service.impl; - -import com.cxx.admin.dto.server.*; -import com.cxx.admin.service.ServerMonitorService; -import com.influxdb.client.InfluxDBClient; -import com.influxdb.client.InfluxDBClientFactory; -import com.influxdb.client.QueryApi; -import com.influxdb.client.WriteApi; -import com.influxdb.client.domain.WritePrecision; -import com.influxdb.client.write.Point; -import com.influxdb.query.FluxTable; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import oshi.SystemInfo; -import oshi.hardware.CentralProcessor; -import oshi.hardware.GlobalMemory; -import oshi.hardware.HWDiskStore; -import oshi.hardware.HardwareAbstractionLayer; -import oshi.software.os.OperatingSystem; - -import java.io.File; -import java.text.DecimalFormat; -import java.time.Instant; -import java.util.*; -import java.util.concurrent.TimeUnit; - -@Service -public class ServerMonitorServiceImpl implements ServerMonitorService { - private final SystemInfo systemInfo = new SystemInfo(); - private final HardwareAbstractionLayer hardware = systemInfo.getHardware(); - private final OperatingSystem os = systemInfo.getOperatingSystem(); - private final CentralProcessor processor = hardware.getProcessor(); - - private final InfluxDBClient client; - - private final QueryApi queryApi; - - private final String SYSTEM_METRICS = "system_metrics"; - - private final long GB = 1024 * 1024 * 1024; - private final DecimalFormat df = new DecimalFormat("0.00"); - - public ServerMonitorServiceImpl( - @Value("${influxdb.url}") String url, - @Value("${influxdb.token}") String token, - @Value("${influxdb.org}") String org, - @Value("${influxdb.bucket}") String bucket) { - this.client = InfluxDBClientFactory.create(url, token.toCharArray(), org, bucket); - this.queryApi = this.client.getQueryApi(); - } - - @Override - public CpuDto getCpuInfo() { - CpuDto cpuDto = new CpuDto(); - cpuDto.setUsagePercent(formatPercent(hardware.getProcessor().getSystemCpuLoad(500) * 100)); - - return cpuDto; - } - - @Override - public MemoryDto getMemoryInfo() { - GlobalMemory memory = hardware.getMemory(); - MemoryDto memoryDto = new MemoryDto(); - long total = memory.getTotal(); - long free = memory.getAvailable(); - long used = total - free; - - memoryDto.setTotal(bytesToGb(total)); - memoryDto.setUsed(bytesToGb(used)); - memoryDto.setFree(bytesToGb(free)); - memoryDto.setUsagePercent(formatPercent((used * 100.0) / total)); - - return memoryDto; - } - - @Override - public DiskDto getDiskInfo() { - List disks = hardware.getDiskStores(); - if (disks.isEmpty()) { - return null; - } - - // 获取根分区信息 - HWDiskStore rootDisk = disks.get(0); - DiskDto diskInfo = new DiskDto(); - diskInfo.setTotal(bytesToGb(rootDisk.getSize())); - - // 获取文件系统使用情况 - os.getFileSystem().getFileStores().stream() - .filter(fs -> fs.getMount().equals(File.separator)) - .findFirst() - .ifPresent(fs -> { - long total = fs.getTotalSpace(); - long free = fs.getFreeSpace(); - long used = total - free; - - diskInfo.setUsed(bytesToGb(used)); - diskInfo.setFree(bytesToGb(free)); - diskInfo.setUsagePercent(formatPercent((double) (used) * 100.0 / total)); - }); - - return diskInfo; - } - - @Override - public SystemInfoDto getSystemInfo() { - SystemInfoDto dto = new SystemInfoDto(); - - // 获取CPU信息 - dto.setCpuName(processor.getProcessorIdentifier().getName()); - dto.setCpuVendor(processor.getProcessorIdentifier().getVendor()); - dto.setCpuLogicalCores(processor.getLogicalProcessorCount()); - dto.setCpuPhysicalCores(processor.getPhysicalProcessorCount()); - - // 获取CPU负载 - double[] loadAverage = processor.getSystemLoadAverage(3); - dto.setCpuSystemLoad(loadAverage[0]); // 1分钟平均负载 - - // 获取操作系统信息 - dto.setOsFamily(os.getFamily()); - dto.setOsVersion(os.getVersionInfo().getVersion()); - dto.setOsManufacturer(os.getManufacturer()); - - // 获取系统运行时间(秒) - dto.setSystemUptime(TimeUnit.MILLISECONDS.toSeconds(systemInfo.getOperatingSystem().getSystemUptime())); - - return dto; - } - - @Override - public void storeSystemMetrics() { - try (WriteApi writeApi = client.getWriteApi()) { - CpuDto cpuDto = getCpuInfo(); - MemoryDto memoryDto = getMemoryInfo(); - DiskDto diskDto = getDiskInfo(); - - Point point = Point - .measurement(SYSTEM_METRICS) - .addTag("host", "localhost") - .addField("cpu_usage", cpuDto.getUsagePercent()) - .addField("memory_total", memoryDto.getTotal()) - .addField("memory_used", memoryDto.getUsed()) - .addField("memory_free", memoryDto.getFree()) - .addField("memory_usage", memoryDto.getUsagePercent()) - .addField("disk_total", diskDto.getTotal()) - .addField("disk_used", diskDto.getUsed()) - .addField("disk_free", diskDto.getFree()) - .addField("disk_usage", diskDto.getUsagePercent()) - .time(Instant.now(), WritePrecision.S); - - writeApi.writePoint(point); - } - } - - @Override - public List querySystemMetrics(String range) { - String fluxQuery = "from(bucket: \"server_metrics\")" + - "|> range(start: -" + range + ")" + // range 可以是 "1h", "24h" 等 - "|> filter(fn: (r) => r._measurement == \"system_metrics\")" + - "|> pivot(rowKey: [\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")"; - - List> results = executeQuery(fluxQuery); - - List systemMetricsList = new ArrayList<>(); - - for (Map data : results) { - SystemMetricsDto systemMetrics = new SystemMetricsDto(); - systemMetrics.setCpuUsage((Double) data.get("cpu_usage")); - systemMetrics.setMemoryTotal((Double) data.get("memory_total")); - systemMetrics.setMemoryUsed((Double) data.get("memory_used")); - systemMetrics.setMemoryFree((Double) data.get("memory_free")); - systemMetrics.setMemoryUsage((Double) data.get("memory_usage")); - systemMetrics.setDiskTotal((Double) data.get("disk_total")); - systemMetrics.setDiskUsed((Double) data.get("disk_used")); - systemMetrics.setDiskFree((Double) data.get("disk_free")); - systemMetrics.setDiskUsage((Double) data.get("disk_usage")); - systemMetrics.setTime(Date.from((Instant) data.get("time"))); - - systemMetricsList.add(systemMetrics); - } - - return systemMetricsList; - } - - private List> executeQuery(String fluxQuery) { - List tables = queryApi.query(fluxQuery); - List> results = new ArrayList<>(); - - for (FluxTable table : tables) { - table.getRecords().forEach(record -> { - Map data = new HashMap<>(); - data.put("time", record.getTime()); - - record.getValues().forEach((key, value) -> { - if (!key.startsWith("_")) { // 过滤掉内部字段 - data.put(key, value); - } - }); - - results.add(data); - }); - } - return results; - } - - private double bytesToGb(long bytes) { - double gb = bytes / (double) GB; - return Double.parseDouble(df.format(gb)); - } - - public double formatPercent(double percent) { - return Double.parseDouble(df.format(percent)); - } -} diff --git a/common/src/main/java/com/cxx/common/vo/blog/BlogQueryVo.java b/admin-service/src/main/java/com/cxx/admin/vo/BlogQueryVo.java similarity index 92% rename from common/src/main/java/com/cxx/common/vo/blog/BlogQueryVo.java rename to admin-service/src/main/java/com/cxx/admin/vo/BlogQueryVo.java index 303f03c..d31002b 100644 --- a/common/src/main/java/com/cxx/common/vo/blog/BlogQueryVo.java +++ b/admin-service/src/main/java/com/cxx/admin/vo/BlogQueryVo.java @@ -1,4 +1,4 @@ -package com.cxx.common.vo.blog; +package com.cxx.admin.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/admin-service/src/main/resources/application-dev.yml b/admin-service/src/main/resources/application-dev.yml index d03fa4c..1810fd7 100644 --- a/admin-service/src/main/resources/application-dev.yml +++ b/admin-service/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root - password: estun@medical + password: 123456 file: path: D:\\temp\\ diff --git a/admin-service/src/main/resources/mapper/BlogMapper.xml b/admin-service/src/main/resources/mapper/BlogMapper.xml index 5d14e22..7c057a0 100644 --- a/admin-service/src/main/resources/mapper/BlogMapper.xml +++ b/admin-service/src/main/resources/mapper/BlogMapper.xml @@ -1,7 +1,7 @@ - SELECT a.id AS id, a.title AS title, a.top_value AS topValue, @@ -21,7 +21,7 @@ a.update_time DESC - SELECT a.id AS id, a.title AS title, a.top_value AS topValue, @@ -41,7 +41,7 @@ WHERE a.id = #{id} LIMIT 1 - SELECT b.name AS name, count(b.name) AS count FROM blog a @@ -50,7 +50,7 @@ GROUP BY b.name - SELECT a.ip AS ip, a.os AS os, a.browser AS browser, diff --git a/blog-service/Dockerfile b/blog-service/Dockerfile deleted file mode 100644 index 94ced11..0000000 --- a/blog-service/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM docker-0.unsee.tech/openjdk:11-jdk-slim -ARG JAR_FILE=target/*.jar -COPY $JAR_FILE app.jar -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -RUN echo 'Asia/Shanghai' > /etc/timezone -ENTRYPOINT ["java","-jar","/app.jar"] \ No newline at end of file diff --git a/blog-service/pom.xml b/blog-service/pom.xml deleted file mode 100644 index 4f785ae..0000000 --- a/blog-service/pom.xml +++ /dev/null @@ -1 +0,0 @@ - 4.0.0 com.cxx sweet-hut-service 2.0.0 blog-service 2.0.0 17 17 UTF-8 com.cxx common 2.0.0 eu.bitwalker UserAgentUtils 1.21 \ No newline at end of file diff --git a/blog-service/src/main/java/com/cxx/blog/BlogServiceApplication.java b/blog-service/src/main/java/com/cxx/blog/BlogServiceApplication.java deleted file mode 100644 index 218b40a..0000000 --- a/blog-service/src/main/java/com/cxx/blog/BlogServiceApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cxx.blog; - -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -@MapperScan(basePackages = {"com.cxx.common.mapper", "com.cxx.blog.dao"}) -public class BlogServiceApplication { - public static void main(String[] args) { - SpringApplication.run(BlogServiceApplication.class, args); - } -} \ No newline at end of file diff --git a/blog-service/src/main/java/com/cxx/blog/config/BlogVisitMonitor.java b/blog-service/src/main/java/com/cxx/blog/config/BlogVisitMonitor.java deleted file mode 100644 index 1c12f74..0000000 --- a/blog-service/src/main/java/com/cxx/blog/config/BlogVisitMonitor.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.cxx.blog.config; - -import com.cxx.blog.service.BlogService; -import com.cxx.common.entity.BlogVisit; -import com.cxx.blog.util.IpUtils; -import eu.bitwalker.useragentutils.Browser; -import eu.bitwalker.useragentutils.OperatingSystem; -import eu.bitwalker.useragentutils.UserAgent; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletRequest; -import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.*; -import org.springframework.stereotype.Component; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - - -/** - * 利用AOP监控博客访问 - * 1. @Before：前置通知，在方法执行之前执行 - * 2. @After：后置通知，在方法执行之后执行 - * 3. @AfterRunning：返回通知，在方法返回结果之后执行 - * 4. @AfterThrowing：异常通知，在方法抛出异常之后执行 - * 5. @Around：环绕通知，围绕着方法执行 - */ -@Component -@Aspect -@Slf4j -public class BlogVisitMonitor { - @Resource - private BlogService blogService; - - /** - * 定义切面 - * 指定需要统计的包 - */ - @Pointcut("execution(* com.cxx.blog.controller.BlogController.*(..))") - public void pointCut() { - - } - - /** - * 只有正常返回才会执行此方法 - * 如果程序执行失败，则不执行此方法 - */ - @AfterReturning(returning = "returnVal", pointcut = "pointCut()") - public void doAfterReturning(JoinPoint joinPoint, Object returnVal) { - // 获取接收到的HTTP请求信息 - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - - String agent = request.getHeader("User-Agent"); - UserAgent userAgent = UserAgent.parseUserAgentString(agent); - OperatingSystem os = userAgent.getOperatingSystem(); - Browser browser = userAgent.getBrowser(); - String uri = request.getRequestURI(); - - BlogVisit blogVisit = new BlogVisit(); - blogVisit.setIp(IpUtils.getIpAddress(request)); - blogVisit.setOs(os.getName()); - blogVisit.setBrowser(browser.getName() + "-" + userAgent.getBrowserVersion()); - blogVisit.setUri(uri); - blogVisit.setBlogId(0L); - - if (blogVisit.getUri().contains("content")) { - blogVisit.setBlogId(Long.valueOf(uri.split("/")[3])); - } - - blogService.addBlogVisit(blogVisit); - } -} diff --git a/blog-service/src/main/java/com/cxx/blog/controller/BlogController.java b/blog-service/src/main/java/com/cxx/blog/controller/BlogController.java deleted file mode 100644 index 5c5af84..0000000 --- a/blog-service/src/main/java/com/cxx/blog/controller/BlogController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.cxx.blog.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cxx.blog.service.BlogService; -import com.cxx.common.ReadView; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogLatestDto; -import com.cxx.common.dto.blog.BlogStatsDto; -import com.cxx.common.vo.blog.BlogQueryVo; -import com.fasterxml.jackson.annotation.JsonView; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/blog") -@Tag(name = "查看博客") -public class BlogController { - @Resource - private BlogService blogService; - - @Operation(summary = "分页查询博客") - @GetMapping("/page") - public IPage queryBlogByPage(@RequestParam("currentPage") Integer currentPage, - @RequestParam("pageSize") Integer pageSize) { - return blogService.queryBlogByPage(currentPage, pageSize); - } - - @Operation(summary = "条件查询博客") - @GetMapping("/condition") - public @JsonView(ReadView.class) List queryBlogByCondition(BlogQueryVo query) { - return blogService.queryBlogByCondition(query); - } - - @Operation(summary = "查询博客内容") - @GetMapping("/content/{id}") - public @JsonView(ReadView.class) BlogDto queryBlogById(@PathVariable("id") long id) { - return blogService.queryBlogById(id); - } - - @Operation(summary = "查询博客分类") - @GetMapping("/category") - public List queryBlogCategory() { - return blogService.queryBlogCategory(); - } - - @Operation(summary = "查询博客统计信息") - @GetMapping("/stats") - public BlogStatsDto queryBlogStats() { - return blogService.queryBlogStats(); - } - - @Operation(summary = "查询近期博客") - @GetMapping("/latest") - public List queryLatestBlog() { - return blogService.queryLatestBlog(); - } -} \ No newline at end of file diff --git a/blog-service/src/main/java/com/cxx/blog/dao/BlogDao.java b/blog-service/src/main/java/com/cxx/blog/dao/BlogDao.java deleted file mode 100644 index 2914937..0000000 --- a/blog-service/src/main/java/com/cxx/blog/dao/BlogDao.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.cxx.blog.dao; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogLatestDto; -import com.cxx.common.entity.Blog; -import com.cxx.common.vo.blog.BlogQueryVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface BlogDao { - IPage queryBlogByPage(IPage page); - - List queryBlogByCondition(@Param("query") BlogQueryVo query); - - BlogDto queryBlogById(@Param("id") Long id); - - List queryBlogCategory(); - - List queryLatestBlog(); -} diff --git a/blog-service/src/main/java/com/cxx/blog/service/BlogService.java b/blog-service/src/main/java/com/cxx/blog/service/BlogService.java deleted file mode 100644 index c42b96d..0000000 --- a/blog-service/src/main/java/com/cxx/blog/service/BlogService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cxx.blog.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogLatestDto; -import com.cxx.common.dto.blog.BlogStatsDto; -import com.cxx.common.entity.BlogVisit; -import com.cxx.common.vo.blog.BlogQueryVo; - -import java.util.List; - - -public interface BlogService { - IPage queryBlogByPage(Integer currentPage, Integer pageSize); - - List queryBlogByCondition(BlogQueryVo query); - - BlogDto queryBlogById(Long id); - - List queryBlogCategory(); - - BlogStatsDto queryBlogStats(); - - List queryLatestBlog(); - - void addBlogVisit(BlogVisit blogVisit); -} diff --git a/blog-service/src/main/java/com/cxx/blog/service/impl/BlogServiceImpl.java b/blog-service/src/main/java/com/cxx/blog/service/impl/BlogServiceImpl.java deleted file mode 100644 index e7101b3..0000000 --- a/blog-service/src/main/java/com/cxx/blog/service/impl/BlogServiceImpl.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.cxx.blog.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.cxx.blog.dao.BlogDao; -import com.cxx.blog.service.BlogService; -import com.cxx.common.dto.blog.BlogCategoryDto; -import com.cxx.common.dto.blog.BlogDto; -import com.cxx.common.dto.blog.BlogLatestDto; -import com.cxx.common.dto.blog.BlogStatsDto; -import com.cxx.common.entity.BlogVisit; -import com.cxx.common.mapper.BlogCategoryMapper; -import com.cxx.common.mapper.BlogMapper; -import com.cxx.common.mapper.BlogVisitMapper; -import com.cxx.common.vo.blog.BlogQueryVo; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class BlogServiceImpl implements BlogService { - @Resource - private BlogDao blogDao; - - @Resource - private BlogMapper blogMapper; - - @Resource - private BlogCategoryMapper categoryMapper; - - @Resource - private BlogVisitMapper visitMapper; - - @Override - public IPage queryBlogByPage(Integer currentPage, Integer pageSize) { - return blogDao.queryBlogByPage(new Page<>(currentPage, pageSize)); - } - - @Override - public List queryBlogByCondition(BlogQueryVo query) { - return blogDao.queryBlogByCondition(query); - } - - @Override - public BlogDto queryBlogById(Long id) { - return blogDao.queryBlogById(id); - } - - @Override - public List queryBlogCategory() { - return blogDao.queryBlogCategory(); - } - - @Override - public BlogStatsDto queryBlogStats() { - BlogStatsDto blogStats = new BlogStatsDto(); - blogStats.setBlogCount(blogMapper.selectCount(null)); - blogStats.setCategoryCount(categoryMapper.selectCount(null)); - - return blogStats; - } - - @Override - public List queryLatestBlog() { - return blogDao.queryLatestBlog(); - } - - @Override - public void addBlogVisit(BlogVisit blogVisit) { - visitMapper.insert(blogVisit); - } -} \ No newline at end of file diff --git a/blog-service/src/main/java/com/cxx/blog/util/BlogUtils.java b/blog-service/src/main/java/com/cxx/blog/util/BlogUtils.java deleted file mode 100644 index e091b24..0000000 --- a/blog-service/src/main/java/com/cxx/blog/util/BlogUtils.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.cxx.blog.util; - -import org.springframework.web.multipart.MultipartFile; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -public class BlogUtils { - public static File multipartFileToFile(MultipartFile multipartFile) { - if (multipartFile.getOriginalFilename() == null) { - return null; - } - - File file = new File(multipartFile.getOriginalFilename()); - try { - InputStream ins = multipartFile.getInputStream(); - OutputStream os = new FileOutputStream(file); - int bytesRead = 0; - byte[] buffer = new byte[8192]; - while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) { - os.write(buffer, 0, bytesRead); - } - os.close(); - ins.close(); - } catch (Exception e) { - e.printStackTrace(); - } - - return file; - } -} diff --git a/blog-service/src/main/java/com/cxx/blog/util/IpUtils.java b/blog-service/src/main/java/com/cxx/blog/util/IpUtils.java deleted file mode 100644 index 36544ab..0000000 --- a/blog-service/src/main/java/com/cxx/blog/util/IpUtils.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.cxx.blog.util; - -import jakarta.servlet.http.HttpServletRequest; - -import java.net.InetAddress; -import java.net.UnknownHostException; - -public class IpUtils { - private static final String UNKNOWN = "unknown"; - private static final String LOCALHOST_IP = "127.0.0.1"; - // 客户端与服务器同为一台机器，获取的 ip 有时候是 ipv6 格式 - private static final String LOCALHOST_IPV6 = "0:0:0:0:0:0:0:1"; - private static final String SEPARATOR = ","; - - /** - * 根据 HttpServletRequest 获取 IP - * @param request 请求 - * @return ip - */ - public static String getIpAddress(HttpServletRequest request) { - if (request == null) { - return "unknown"; - } - String ip = request.getHeader("x-forwarded-for"); - if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) { - ip = request.getHeader("Proxy-Client-IP"); - } - if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) { - ip = request.getHeader("X-Forwarded-For"); - } - if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) { - ip = request.getHeader("WL-Proxy-Client-IP"); - } - if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) { - ip = request.getHeader("X-Real-IP"); - } - if (ip == null || ip.isEmpty() || UNKNOWN.equalsIgnoreCase(ip)) { - ip = request.getRemoteAddr(); - if (LOCALHOST_IP.equalsIgnoreCase(ip) || LOCALHOST_IPV6.equalsIgnoreCase(ip)) { - // 根据网卡取本机配置的 IP - InetAddress iNet = null; - try { - iNet = InetAddress.getLocalHost(); - } catch (UnknownHostException e) { - e.printStackTrace(); - } - if (iNet != null) - ip = iNet.getHostAddress(); - } - } - // 对于通过多个代理的情况，分割出第一个 IP - if (ip != null && ip.length() > 15) { - if (ip.indexOf(SEPARATOR) > 0) { - ip = ip.substring(0, ip.indexOf(SEPARATOR)); - } - } - return LOCALHOST_IPV6.equals(ip) ? LOCALHOST_IP : ip; - } -} diff --git a/blog-service/src/main/resources/application-dev.yml b/blog-service/src/main/resources/application-dev.yml deleted file mode 100644 index e680bf2..0000000 --- a/blog-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,11 +0,0 @@ -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: root - password: 123456 - -logging: - level: - root: info - config: diff --git a/blog-service/src/main/resources/application-docker.yml b/blog-service/src/main/resources/application-docker.yml deleted file mode 100644 index 21f5ae1..0000000 --- a/blog-service/src/main/resources/application-docker.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://mysql:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: docker - password: 19940822Cxx - -logging: - fluentd: - host: fluent-bit - port: 24224 - level: - root: info diff --git a/blog-service/src/main/resources/application-prod.yml b/blog-service/src/main/resources/application-prod.yml deleted file mode 100644 index e8be661..0000000 --- a/blog-service/src/main/resources/application-prod.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring: - datasource: - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false - username: cxx - password: 19940822Cxx@1213 - -logging: - level: - root: info - config: - classpath:logback-spring-drop.xml \ No newline at end of file diff --git a/blog-service/src/main/resources/application.yml b/blog-service/src/main/resources/application.yml deleted file mode 100644 index 8bd6ff3..0000000 --- a/blog-service/src/main/resources/application.yml +++ /dev/null @@ -1,20 +0,0 @@ -server: - port: 8082 - -spring: - application: - name: @project.artifactId@ - version: @project.version@ - profiles: - active: dev - -# mybatis plus mapper路径 -mybatis-plus: - # mybatis plus - mapper-locations: classpath*:/mapper/**/*.xml - configuration: - log-impl: - org.apache.ibatis.logging.stdout.StdOutImpl - -web-starter: - base-package: com.cxx.blog \ No newline at end of file diff --git a/blog-service/src/main/resources/logback-spring-drop.xml b/blog-service/src/main/resources/logback-spring-drop.xml deleted file mode 100644 index 1a73420..0000000 --- a/blog-service/src/main/resources/logback-spring-drop.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - logback - - - - - - - - - - - - - - - - - - - - - - DEBUG - - - - ${CONSOLE_LOG_PATTERN} - - ${ENCODING} - - - - - - - - INFO - ACCEPT - DENY - - - ${log.path}/log_info.log - - ${FILE_LOG_PATTERN} - ${ENCODING} - - - - - ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log - - 500MB - - - 15 - - - - - - - WARN - ACCEPT - DENY - - - ${log.path}/log_warn.log - - ${FILE_LOG_PATTERN} - ${ENCODING} - - - - ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - - - - ERROR - ACCEPT - DENY - - - ${log.path}/log_error.log - - ${FILE_LOG_PATTERN} - ${ENCODING} - - - - ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log - - 100MB - - - 15 - - - - - - - - - - - \ No newline at end of file diff --git a/blog-service/src/main/resources/mapper/blogMapper.xml b/blog-service/src/main/resources/mapper/blogMapper.xml deleted file mode 100644 index a848ae3..0000000 --- a/blog-service/src/main/resources/mapper/blogMapper.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/blog-service/src/test/java/com/cxx/blog/BlogServiceTest.java b/blog-service/src/test/java/com/cxx/blog/BlogServiceTest.java deleted file mode 100644 index 78081b5..0000000 --- a/blog-service/src/test/java/com/cxx/blog/BlogServiceTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.cxx.blog; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * @Author: Cxx - * @Date: 2024/9/22 0:17 - * @Description: - */ -@SpringBootTest -public class BlogServiceTest { - - @Test - public void test() { - - } -} diff --git a/common/src/main/java/com/cxx/common/dto/blog/BlogDto.java b/common/src/main/java/com/cxx/common/dto/blog/BlogDto.java deleted file mode 100644 index 67904d2..0000000 --- a/common/src/main/java/com/cxx/common/dto/blog/BlogDto.java +++ /dev/null @@ -1 +0,0 @@ -package com.cxx.common.dto.blog; import com.cxx.common.PlainView; import com.cxx.common.ReadView; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; import java.util.Date; @Getter @Setter @JsonView(PlainView.class) public class BlogDto { @Schema(description = "id") @JsonView(ReadView.class) private Long id; @Schema(description = "博客标题") private String title; @Schema(description = "置顶值") private Integer topValue; @Schema(description = "是否是精品") private Boolean isGreat; @Schema(description = "博客类别") private String category; @Schema(description = "博客简介") @JsonView(ReadView.class) private String summary; @Schema(description = "博客内容") private String content; @Schema(description = "博客字数") @JsonView(ReadView.class) private Integer wordCount; @Schema(description = "博客时长") @JsonView(ReadView.class) private Double readDuration; @Schema(description = "博客访问人数") @JsonView(ReadView.class) private Integer visitCount; @Schema(description = "创建时间") @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonView(ReadView.class) private Date createTime; @Schema(description = "更新时间") @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonView(ReadView.class) private Date updateTime; } \ No newline at end of file diff --git a/common/src/main/java/com/cxx/common/dto/budget/BudgetDto.java b/common/src/main/java/com/cxx/common/dto/budget/BudgetDto.java deleted file mode 100644 index bbed016..0000000 --- a/common/src/main/java/com/cxx/common/dto/budget/BudgetDto.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cxx.common.dto.budget; - -import com.cxx.common.PlainView; -import com.cxx.common.ReadView; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonView; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.PositiveOrZero; -import lombok.Getter; -import lombok.Setter; - -import java.util.Date; - -@Getter -@Setter -@JsonView(PlainView.class) -public class BudgetDto { - @Schema(description = "id") - @JsonView(ReadView.class) - private Long id; - - @Schema(description = "预算类别") - @NotBlank(message = "类别不能为空") - private String category; - - @Schema(description = "预算项目") - @NotBlank(message = "项目不能为空") - private String project; - - @Schema(description = "预算内容") - private String content; - - @Schema(description = "供应商") - private String vendor; - - @Schema(description = "预算支出") - @PositiveOrZero(message = "预算支出支出必须大于等于0") - private Double budget; - - @Schema(description = "实际支出") - @PositiveOrZero(message = "实际支出支出必须大于等于0") - private Double actual; - - @Schema(description = "支付时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date payTime; - - @Schema(description = "备注") - private String remake; -} diff --git a/common/src/main/java/com/cxx/common/entity/Budget.java b/common/src/main/java/com/cxx/common/entity/Budget.java deleted file mode 100644 index e6643be..0000000 --- a/common/src/main/java/com/cxx/common/entity/Budget.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cxx.common.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cxx.framework.data.AbstractEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("budget") -public class Budget extends AbstractEntity { - @TableField("category_id") - private Long categoryId; - - @TableField("project") - private String project; - - @TableField("content") - private String content; - - @TableField("vendor") - private String vendor; - - @TableField("budget") - private Double budget; - - @TableField("actual") - private Double actual; - - @TableField("pay_time") - private Date payTime; - - @TableField("remake") - private String remake; -} diff --git a/common/src/main/java/com/cxx/common/entity/BudgetCategory.java b/common/src/main/java/com/cxx/common/entity/BudgetCategory.java deleted file mode 100644 index d16ff08..0000000 --- a/common/src/main/java/com/cxx/common/entity/BudgetCategory.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.cxx.common.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.cxx.framework.data.AbstractEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("budget_category") -public class BudgetCategory extends AbstractEntity { - @TableField("name") - private String name; -} diff --git a/common/src/main/java/com/cxx/common/mapper/BudgetCategoryMapper.java b/common/src/main/java/com/cxx/common/mapper/BudgetCategoryMapper.java deleted file mode 100644 index a9bf043..0000000 --- a/common/src/main/java/com/cxx/common/mapper/BudgetCategoryMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.cxx.common.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BudgetCategory; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface BudgetCategoryMapper extends BaseMapper { -} \ No newline at end of file diff --git a/common/src/main/java/com/cxx/common/mapper/BudgetMapper.java b/common/src/main/java/com/cxx/common/mapper/BudgetMapper.java deleted file mode 100644 index 93ced54..0000000 --- a/common/src/main/java/com/cxx/common/mapper/BudgetMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.cxx.common.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.Budget; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface BudgetMapper extends BaseMapper { -} \ No newline at end of file diff --git a/home-service/src/main/java/com/cxx/home/controller/BillController.java b/home-service/src/main/java/com/cxx/home/controller/BillController.java index f846df7..e294310 100644 --- a/home-service/src/main/java/com/cxx/home/controller/BillController.java +++ b/home-service/src/main/java/com/cxx/home/controller/BillController.java @@ -3,12 +3,12 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.bill.BillCategoryDto; -import com.cxx.common.dto.bill.BillItemDto; -import com.cxx.common.dto.bill.BillRecordDto; -import com.cxx.common.dto.bill.BillSummaryDto; +import com.cxx.home.dto.bill.BillCategoryDto; +import com.cxx.home.dto.bill.BillItemDto; +import com.cxx.home.dto.bill.BillRecordDto; +import com.cxx.home.dto.bill.BillSummaryDto; import com.cxx.home.service.BillRecordService; -import com.cxx.common.vo.bill.BillQueryVo; +import com.cxx.home.vo.BillQueryVo; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/admin-service/src/main/java/com/cxx/admin/controller/BillManageController.java b/home-service/src/main/java/com/cxx/home/controller/BillManageController.java similarity index 92% rename from admin-service/src/main/java/com/cxx/admin/controller/BillManageController.java rename to home-service/src/main/java/com/cxx/home/controller/BillManageController.java index 994b929..f427df6 100644 --- a/admin-service/src/main/java/com/cxx/admin/controller/BillManageController.java +++ b/home-service/src/main/java/com/cxx/home/controller/BillManageController.java @@ -1,9 +1,9 @@ -package com.cxx.admin.controller; +package com.cxx.home.controller; -import com.cxx.admin.service.BillManageService; import com.cxx.common.WriteView; -import com.cxx.common.dto.bill.BillCategoryDto; -import com.cxx.common.dto.bill.BillItemDto; +import com.cxx.home.dto.bill.BillCategoryDto; +import com.cxx.home.dto.bill.BillItemDto; +import com.cxx.home.service.BillManageService; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/home-service/src/main/java/com/cxx/home/controller/BudgetController.java b/home-service/src/main/java/com/cxx/home/controller/BudgetController.java deleted file mode 100644 index ed20b2f..0000000 --- a/home-service/src/main/java/com/cxx/home/controller/BudgetController.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cxx.home.controller; - -import com.cxx.common.ReadView; -import com.cxx.common.WriteView; -import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.budget.BudgetDto; -import com.cxx.home.service.BudgetService; -import com.fasterxml.jackson.annotation.JsonView; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/budget") -@Tag(name = "预算统计") -public class BudgetController { - @Resource - private BudgetService budgetService; - - @Operation(summary = "查询预算类别") - @GetMapping("/category") - public List queryBudgetCategory() { - return budgetService.queryBudgetCategory(); - } - - @Operation(summary = "新增预算") - @PostMapping("") - public Boolean addBudget(@RequestBody @JsonView(WriteView.class) @Validated BudgetDto budgetDto) { - return budgetService.addBudget(budgetDto); - } - - @Operation(summary = "更新预算") - @PutMapping("/{id}") - public Boolean updateBudget(@PathVariable("id") long id, - @RequestBody @JsonView(WriteView.class) BudgetDto budgetDto) { - return budgetService.updateBudget(id, budgetDto); - } - - @Operation(summary = "删除预算") - @DeleteMapping("/{id}") - public Boolean deleteBudget(@PathVariable("id") long id) { - return budgetService.deleteBudget(id); - } - - @Operation(summary = "查询预算") - @GetMapping("") - public @JsonView(ReadView.class) List queryBudget(@RequestParam("category") String category) { - return budgetService.queryBudget(category); - } - - @Operation(summary = "预算排行统计") - @GetMapping("stats/rank") - public List queryBudgetRankStats(@RequestParam("category") String category) { - return budgetService.queryBudgetRankStats(category); - } - - @Operation(summary = "预算项目统计") - @GetMapping("stats/project") - public List queryBudgetProjectStats(@RequestParam("category") String category) { - return budgetService.queryBudgetProjectStats(category); - } -} - \ No newline at end of file diff --git a/home-service/src/main/java/com/cxx/home/controller/PlanController.java b/home-service/src/main/java/com/cxx/home/controller/PlanController.java index bdf21c2..ff7324f 100644 --- a/home-service/src/main/java/com/cxx/home/controller/PlanController.java +++ b/home-service/src/main/java/com/cxx/home/controller/PlanController.java @@ -2,9 +2,9 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.common.dto.plan.PlanDto; -import com.cxx.common.dto.plan.PlanStatsDto; -import com.cxx.common.vo.plan.PlanQueryVo; +import com.cxx.home.dto.plan.PlanDto; +import com.cxx.home.dto.plan.PlanStatsDto; +import com.cxx.home.vo.PlanQueryVo; import com.cxx.home.service.PlanService; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; diff --git a/home-service/src/main/java/com/cxx/home/dao/BillDao.java b/home-service/src/main/java/com/cxx/home/dao/BillDao.java index 6364ba9..2caa71a 100644 --- a/home-service/src/main/java/com/cxx/home/dao/BillDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/BillDao.java @@ -1,8 +1,11 @@ package com.cxx.home.dao; import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.bill.*; -import com.cxx.common.vo.bill.BillQueryVo; +import com.cxx.home.dto.bill.BillCategoryDto; +import com.cxx.home.dto.bill.BillItemDto; +import com.cxx.home.dto.bill.BillRecordDto; +import com.cxx.home.dto.bill.BillSummaryDto; +import com.cxx.home.vo.BillQueryVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/home-service/src/main/java/com/cxx/home/dao/BudgetDao.java b/home-service/src/main/java/com/cxx/home/dao/BudgetDao.java deleted file mode 100644 index 5f0a0cc..0000000 --- a/home-service/src/main/java/com/cxx/home/dao/BudgetDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cxx.home.dao; - -import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.budget.BudgetDto; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface BudgetDao { - List queryBudget(@Param("category") String category); - - List queryBudgetRankStats(@Param("category") String category); - - List queryBudgetProjectStats(@Param("category") String category); -} diff --git a/home-service/src/main/java/com/cxx/home/dao/PlanDao.java b/home-service/src/main/java/com/cxx/home/dao/PlanDao.java index 9be6573..dbb89c0 100644 --- a/home-service/src/main/java/com/cxx/home/dao/PlanDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/PlanDao.java @@ -1,8 +1,8 @@ package com.cxx.home.dao; -import com.cxx.common.dto.plan.PlanDto; -import com.cxx.common.dto.plan.PlanStatsDto; -import com.cxx.common.vo.plan.PlanQueryVo; +import com.cxx.home.dto.plan.PlanDto; +import com.cxx.home.dto.plan.PlanStatsDto; +import com.cxx.home.vo.PlanQueryVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/common/src/main/java/com/cxx/common/dto/bill/BillCategoryDto.java b/home-service/src/main/java/com/cxx/home/dto/bill/BillCategoryDto.java similarity index 92% rename from common/src/main/java/com/cxx/common/dto/bill/BillCategoryDto.java rename to home-service/src/main/java/com/cxx/home/dto/bill/BillCategoryDto.java index f5c912c..9a62df3 100644 --- a/common/src/main/java/com/cxx/common/dto/bill/BillCategoryDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/bill/BillCategoryDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.bill; +package com.cxx.home.dto.bill; import com.cxx.common.PlainView; import com.fasterxml.jackson.annotation.JsonView; diff --git a/common/src/main/java/com/cxx/common/dto/bill/BillItemDto.java b/home-service/src/main/java/com/cxx/home/dto/bill/BillItemDto.java similarity index 94% rename from common/src/main/java/com/cxx/common/dto/bill/BillItemDto.java rename to home-service/src/main/java/com/cxx/home/dto/bill/BillItemDto.java index 6d2012b..894a8aa 100644 --- a/common/src/main/java/com/cxx/common/dto/bill/BillItemDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/bill/BillItemDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.bill; +package com.cxx.home.dto.bill; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/common/src/main/java/com/cxx/common/dto/bill/BillRecordDto.java b/home-service/src/main/java/com/cxx/home/dto/bill/BillRecordDto.java similarity index 97% rename from common/src/main/java/com/cxx/common/dto/bill/BillRecordDto.java rename to home-service/src/main/java/com/cxx/home/dto/bill/BillRecordDto.java index 0fb23c0..cf8845a 100644 --- a/common/src/main/java/com/cxx/common/dto/bill/BillRecordDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/bill/BillRecordDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.bill; +package com.cxx.home.dto.bill; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/common/src/main/java/com/cxx/common/dto/bill/BillSummaryDto.java b/home-service/src/main/java/com/cxx/home/dto/bill/BillSummaryDto.java similarity index 97% rename from common/src/main/java/com/cxx/common/dto/bill/BillSummaryDto.java rename to home-service/src/main/java/com/cxx/home/dto/bill/BillSummaryDto.java index 163d507..1bd40be 100644 --- a/common/src/main/java/com/cxx/common/dto/bill/BillSummaryDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/bill/BillSummaryDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.bill; +package com.cxx.home.dto.bill; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/common/src/main/java/com/cxx/common/dto/message/MailMessageDto.java b/home-service/src/main/java/com/cxx/home/dto/message/MailMessageDto.java similarity index 79% rename from common/src/main/java/com/cxx/common/dto/message/MailMessageDto.java rename to home-service/src/main/java/com/cxx/home/dto/message/MailMessageDto.java index 23d199f..bae9544 100644 --- a/common/src/main/java/com/cxx/common/dto/message/MailMessageDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/message/MailMessageDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.message; +package com.cxx.home.dto.message; import lombok.Data; diff --git a/common/src/main/java/com/cxx/common/dto/plan/PlanDto.java b/home-service/src/main/java/com/cxx/home/dto/plan/PlanDto.java similarity index 97% rename from common/src/main/java/com/cxx/common/dto/plan/PlanDto.java rename to home-service/src/main/java/com/cxx/home/dto/plan/PlanDto.java index a8b6047..77108ab 100644 --- a/common/src/main/java/com/cxx/common/dto/plan/PlanDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/plan/PlanDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.plan; +package com.cxx.home.dto.plan; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/common/src/main/java/com/cxx/common/dto/plan/PlanStatsDto.java b/home-service/src/main/java/com/cxx/home/dto/plan/PlanStatsDto.java similarity index 93% rename from common/src/main/java/com/cxx/common/dto/plan/PlanStatsDto.java rename to home-service/src/main/java/com/cxx/home/dto/plan/PlanStatsDto.java index 8bb37f8..60af0e2 100644 --- a/common/src/main/java/com/cxx/common/dto/plan/PlanStatsDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/plan/PlanStatsDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.plan; +package com.cxx.home.dto.plan; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/common/src/main/java/com/cxx/common/dto/task/TaskDto.java b/home-service/src/main/java/com/cxx/home/dto/task/TaskDto.java similarity index 94% rename from common/src/main/java/com/cxx/common/dto/task/TaskDto.java rename to home-service/src/main/java/com/cxx/home/dto/task/TaskDto.java index 17e94cf..2afb042 100644 --- a/common/src/main/java/com/cxx/common/dto/task/TaskDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/task/TaskDto.java @@ -1,4 +1,4 @@ -package com.cxx.common.dto.task; +package com.cxx.home.dto.task; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/common/src/main/java/com/cxx/common/entity/BillBook.java b/home-service/src/main/java/com/cxx/home/entity/BillBook.java similarity index 93% rename from common/src/main/java/com/cxx/common/entity/BillBook.java rename to home-service/src/main/java/com/cxx/home/entity/BillBook.java index 8a5f29b..0638a2c 100644 --- a/common/src/main/java/com/cxx/common/entity/BillBook.java +++ b/home-service/src/main/java/com/cxx/home/entity/BillBook.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/BillCategory.java b/home-service/src/main/java/com/cxx/home/entity/BillCategory.java similarity index 94% rename from common/src/main/java/com/cxx/common/entity/BillCategory.java rename to home-service/src/main/java/com/cxx/home/entity/BillCategory.java index 1cb537d..abcb2ae 100644 --- a/common/src/main/java/com/cxx/common/entity/BillCategory.java +++ b/home-service/src/main/java/com/cxx/home/entity/BillCategory.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/BillImage.java b/home-service/src/main/java/com/cxx/home/entity/BillImage.java similarity index 90% rename from common/src/main/java/com/cxx/common/entity/BillImage.java rename to home-service/src/main/java/com/cxx/home/entity/BillImage.java index a005e9f..34d4763 100644 --- a/common/src/main/java/com/cxx/common/entity/BillImage.java +++ b/home-service/src/main/java/com/cxx/home/entity/BillImage.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/BillPay.java b/home-service/src/main/java/com/cxx/home/entity/BillPay.java similarity index 93% rename from common/src/main/java/com/cxx/common/entity/BillPay.java rename to home-service/src/main/java/com/cxx/home/entity/BillPay.java index 96f97d6..0c4fb22 100644 --- a/common/src/main/java/com/cxx/common/entity/BillPay.java +++ b/home-service/src/main/java/com/cxx/home/entity/BillPay.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/BillRecord.java b/home-service/src/main/java/com/cxx/home/entity/BillRecord.java similarity index 96% rename from common/src/main/java/com/cxx/common/entity/BillRecord.java rename to home-service/src/main/java/com/cxx/home/entity/BillRecord.java index 36dd7b5..fcf3bb9 100644 --- a/common/src/main/java/com/cxx/common/entity/BillRecord.java +++ b/home-service/src/main/java/com/cxx/home/entity/BillRecord.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/entity/Plan.java b/home-service/src/main/java/com/cxx/home/entity/Plan.java similarity index 97% rename from common/src/main/java/com/cxx/common/entity/Plan.java rename to home-service/src/main/java/com/cxx/home/entity/Plan.java index bec12df..8a07fce 100644 --- a/common/src/main/java/com/cxx/common/entity/Plan.java +++ b/home-service/src/main/java/com/cxx/home/entity/Plan.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/common/src/main/java/com/cxx/common/entity/Task.java b/home-service/src/main/java/com/cxx/home/entity/Task.java similarity index 95% rename from common/src/main/java/com/cxx/common/entity/Task.java rename to home-service/src/main/java/com/cxx/home/entity/Task.java index df7db43..f21e0e4 100644 --- a/common/src/main/java/com/cxx/common/entity/Task.java +++ b/home-service/src/main/java/com/cxx/home/entity/Task.java @@ -1,4 +1,4 @@ -package com.cxx.common.entity; +package com.cxx.home.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/common/src/main/java/com/cxx/common/mapper/BillBookMapper.java b/home-service/src/main/java/com/cxx/home/mapper/BillBookMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BillBookMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/BillBookMapper.java index 52451a0..1eed5c5 100644 --- a/common/src/main/java/com/cxx/common/mapper/BillBookMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/BillBookMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BillBook; +import com.cxx.home.entity.BillBook; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/BillCategoryMapper.java b/home-service/src/main/java/com/cxx/home/mapper/BillCategoryMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BillCategoryMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/BillCategoryMapper.java index 13d1a2b..fee26bd 100644 --- a/common/src/main/java/com/cxx/common/mapper/BillCategoryMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/BillCategoryMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BillCategory; +import com.cxx.home.entity.BillCategory; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/BillImageMapper.java b/home-service/src/main/java/com/cxx/home/mapper/BillImageMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BillImageMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/BillImageMapper.java index 5809400..a252041 100644 --- a/common/src/main/java/com/cxx/common/mapper/BillImageMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/BillImageMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BillImage; +import com.cxx.home.entity.BillImage; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/BillPayMapper.java b/home-service/src/main/java/com/cxx/home/mapper/BillPayMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BillPayMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/BillPayMapper.java index 11a8e4d..b9e08a8 100644 --- a/common/src/main/java/com/cxx/common/mapper/BillPayMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/BillPayMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BillPay; +import com.cxx.home.entity.BillPay; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/BillRecordMapper.java b/home-service/src/main/java/com/cxx/home/mapper/BillRecordMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/BillRecordMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/BillRecordMapper.java index 014d9cc..79bb147 100644 --- a/common/src/main/java/com/cxx/common/mapper/BillRecordMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/BillRecordMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.BillRecord; +import com.cxx.home.entity.BillRecord; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/PlanMapper.java b/home-service/src/main/java/com/cxx/home/mapper/PlanMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/PlanMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/PlanMapper.java index bcf5e82..24b21e9 100644 --- a/common/src/main/java/com/cxx/common/mapper/PlanMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/PlanMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.Plan; +import com.cxx.home.entity.Plan; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/common/src/main/java/com/cxx/common/mapper/TaskMapper.java b/home-service/src/main/java/com/cxx/home/mapper/TaskMapper.java similarity index 71% rename from common/src/main/java/com/cxx/common/mapper/TaskMapper.java rename to home-service/src/main/java/com/cxx/home/mapper/TaskMapper.java index e24bedb..4eab8d1 100644 --- a/common/src/main/java/com/cxx/common/mapper/TaskMapper.java +++ b/home-service/src/main/java/com/cxx/home/mapper/TaskMapper.java @@ -1,7 +1,7 @@ -package com.cxx.common.mapper; +package com.cxx.home.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.cxx.common.entity.Task; +import com.cxx.home.entity.Task; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/home-service/src/main/java/com/cxx/home/schedule/QuartzDto.java b/home-service/src/main/java/com/cxx/home/schedule/QuartzDto.java index 4c06f7b..0490808 100644 --- a/home-service/src/main/java/com/cxx/home/schedule/QuartzDto.java +++ b/home-service/src/main/java/com/cxx/home/schedule/QuartzDto.java @@ -1,7 +1,7 @@ package com.cxx.home.schedule; -import com.cxx.common.dto.task.TaskDto; +import com.cxx.home.dto.task.TaskDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/home-service/src/main/java/com/cxx/home/schedule/QuartzJob.java b/home-service/src/main/java/com/cxx/home/schedule/QuartzJob.java index 97cb78a..1e487fe 100644 --- a/home-service/src/main/java/com/cxx/home/schedule/QuartzJob.java +++ b/home-service/src/main/java/com/cxx/home/schedule/QuartzJob.java @@ -1,9 +1,9 @@ package com.cxx.home.schedule; -import com.cxx.common.dto.message.MailMessageDto; -import com.cxx.common.entity.Task; +import com.cxx.home.dto.message.MailMessageDto; +import com.cxx.home.entity.Task; import com.cxx.framework.web.CustomException; -import com.cxx.common.mapper.TaskMapper; +import com.cxx.home.mapper.TaskMapper; import com.cxx.home.service.MessageService; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/home-service/src/main/java/com/cxx/home/schedule/QuartzUtils.java b/home-service/src/main/java/com/cxx/home/schedule/QuartzUtils.java index 8f4e998..5e6d127 100644 --- a/home-service/src/main/java/com/cxx/home/schedule/QuartzUtils.java +++ b/home-service/src/main/java/com/cxx/home/schedule/QuartzUtils.java @@ -1,6 +1,6 @@ package com.cxx.home.schedule; -import com.cxx.common.entity.Task; +import com.cxx.home.entity.Task; import com.cxx.framework.web.CustomException; import org.quartz.*; import org.springframework.stereotype.Component; diff --git a/admin-service/src/main/java/com/cxx/admin/service/BillManageService.java b/home-service/src/main/java/com/cxx/home/service/BillManageService.java similarity index 76% rename from admin-service/src/main/java/com/cxx/admin/service/BillManageService.java rename to home-service/src/main/java/com/cxx/home/service/BillManageService.java index f981594..6ad6b71 100644 --- a/admin-service/src/main/java/com/cxx/admin/service/BillManageService.java +++ b/home-service/src/main/java/com/cxx/home/service/BillManageService.java @@ -1,7 +1,7 @@ -package com.cxx.admin.service; +package com.cxx.home.service; -import com.cxx.common.dto.bill.BillCategoryDto; -import com.cxx.common.dto.bill.BillItemDto; +import com.cxx.home.dto.bill.BillCategoryDto; +import com.cxx.home.dto.bill.BillItemDto; public interface BillManageService { Boolean addBillPay(BillItemDto billItemDto); diff --git a/home-service/src/main/java/com/cxx/home/service/BillRecordService.java b/home-service/src/main/java/com/cxx/home/service/BillRecordService.java index 8565ded..bf7f770 100644 --- a/home-service/src/main/java/com/cxx/home/service/BillRecordService.java +++ b/home-service/src/main/java/com/cxx/home/service/BillRecordService.java @@ -1,11 +1,11 @@ package com.cxx.home.service; import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.bill.BillCategoryDto; -import com.cxx.common.dto.bill.BillItemDto; -import com.cxx.common.dto.bill.BillRecordDto; -import com.cxx.common.dto.bill.BillSummaryDto; -import com.cxx.common.vo.bill.BillQueryVo; +import com.cxx.home.dto.bill.BillCategoryDto; +import com.cxx.home.dto.bill.BillItemDto; +import com.cxx.home.dto.bill.BillRecordDto; +import com.cxx.home.dto.bill.BillSummaryDto; +import com.cxx.home.vo.BillQueryVo; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/BudgetService.java b/home-service/src/main/java/com/cxx/home/service/BudgetService.java deleted file mode 100644 index 74b4a40..0000000 --- a/home-service/src/main/java/com/cxx/home/service/BudgetService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.cxx.home.service; - - -import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.budget.BudgetDto; - -import java.util.List; - -public interface BudgetService { - List queryBudgetCategory(); - - Boolean addBudget(BudgetDto budgetDto); - - Boolean updateBudget(Long id, BudgetDto budgetDto); - - Boolean deleteBudget(Long id); - - List queryBudget(String category); - - List queryBudgetRankStats(String category); - - List queryBudgetProjectStats(String category); -} diff --git a/home-service/src/main/java/com/cxx/home/service/MessageService.java b/home-service/src/main/java/com/cxx/home/service/MessageService.java index f1fd264..e602c16 100644 --- a/home-service/src/main/java/com/cxx/home/service/MessageService.java +++ b/home-service/src/main/java/com/cxx/home/service/MessageService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.common.dto.message.MailMessageDto; +import com.cxx.home.dto.message.MailMessageDto; public interface MessageService { void sendMailMessage(MailMessageDto mailMessageDto); diff --git a/home-service/src/main/java/com/cxx/home/service/PlanService.java b/home-service/src/main/java/com/cxx/home/service/PlanService.java index aa6aefa..a1ccb48 100644 --- a/home-service/src/main/java/com/cxx/home/service/PlanService.java +++ b/home-service/src/main/java/com/cxx/home/service/PlanService.java @@ -1,8 +1,8 @@ package com.cxx.home.service; -import com.cxx.common.dto.plan.PlanDto; -import com.cxx.common.dto.plan.PlanStatsDto; -import com.cxx.common.vo.plan.PlanQueryVo; +import com.cxx.home.dto.plan.PlanDto; +import com.cxx.home.dto.plan.PlanStatsDto; +import com.cxx.home.vo.PlanQueryVo; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/QuartzService.java b/home-service/src/main/java/com/cxx/home/service/QuartzService.java index ea52d67..4fb393f 100644 --- a/home-service/src/main/java/com/cxx/home/service/QuartzService.java +++ b/home-service/src/main/java/com/cxx/home/service/QuartzService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.common.entity.Task; +import com.cxx.home.entity.Task; import com.cxx.home.schedule.QuartzDto; import org.quartz.JobKey; diff --git a/home-service/src/main/java/com/cxx/home/service/TaskService.java b/home-service/src/main/java/com/cxx/home/service/TaskService.java index a1386ab..1247459 100644 --- a/home-service/src/main/java/com/cxx/home/service/TaskService.java +++ b/home-service/src/main/java/com/cxx/home/service/TaskService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.common.dto.task.TaskDto; +import com.cxx.home.dto.task.TaskDto; public interface TaskService { diff --git a/admin-service/src/main/java/com/cxx/admin/service/impl/BillManageServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/BillManageServiceImpl.java similarity index 90% rename from admin-service/src/main/java/com/cxx/admin/service/impl/BillManageServiceImpl.java rename to home-service/src/main/java/com/cxx/home/service/impl/BillManageServiceImpl.java index 905e2f5..335d9e0 100644 --- a/admin-service/src/main/java/com/cxx/admin/service/impl/BillManageServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/BillManageServiceImpl.java @@ -1,16 +1,16 @@ -package com.cxx.admin.service.impl; +package com.cxx.home.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.cxx.admin.service.BillManageService; -import com.cxx.common.dto.bill.BillCategoryDto; -import com.cxx.common.dto.bill.BillItemDto; -import com.cxx.common.entity.BillBook; -import com.cxx.common.entity.BillCategory; -import com.cxx.common.entity.BillPay; -import com.cxx.common.mapper.BillBookMapper; -import com.cxx.common.mapper.BillCategoryMapper; -import com.cxx.common.mapper.BillPayMapper; +import com.cxx.home.dto.bill.BillCategoryDto; +import com.cxx.home.dto.bill.BillItemDto; import com.cxx.framework.web.CustomException; +import com.cxx.home.entity.BillBook; +import com.cxx.home.entity.BillCategory; +import com.cxx.home.entity.BillPay; +import com.cxx.home.mapper.BillBookMapper; +import com.cxx.home.mapper.BillCategoryMapper; +import com.cxx.home.mapper.BillPayMapper; +import com.cxx.home.service.BillManageService; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/BillRecordServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/BillRecordServiceImpl.java index af1924c..3f3f2fb 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/BillRecordServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/BillRecordServiceImpl.java @@ -3,21 +3,16 @@ package com.cxx.home.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.bill.*; -import com.cxx.common.entity.*; -import com.cxx.common.mapper.*; -import com.cxx.common.entity.BillBook; -import com.cxx.common.entity.BillCategory; -import com.cxx.common.entity.BillPay; -import com.cxx.common.entity.BillRecord; -import com.cxx.common.mapper.BillBookMapper; -import com.cxx.common.mapper.BillCategoryMapper; -import com.cxx.common.mapper.BillPayMapper; -import com.cxx.common.mapper.BillRecordMapper; +import com.cxx.home.dto.bill.BillCategoryDto; +import com.cxx.home.dto.bill.BillItemDto; +import com.cxx.home.dto.bill.BillRecordDto; +import com.cxx.home.dto.bill.BillSummaryDto; +import com.cxx.home.entity.*; +import com.cxx.home.mapper.*; import com.cxx.framework.web.CustomException; import com.cxx.home.dao.BillDao; import com.cxx.home.service.BillRecordService; -import com.cxx.common.vo.bill.BillQueryVo; +import com.cxx.home.vo.BillQueryVo; import jakarta.annotation.Resource; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/BudgetServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/BudgetServiceImpl.java deleted file mode 100644 index e15d893..0000000 --- a/home-service/src/main/java/com/cxx/home/service/impl/BudgetServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.cxx.home.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.toolkit.SimpleQuery; -import com.cxx.common.dto.StatsChartDto; -import com.cxx.common.dto.budget.BudgetDto; -import com.cxx.common.entity.Budget; -import com.cxx.common.entity.BudgetCategory; -import com.cxx.common.mapper.BudgetCategoryMapper; -import com.cxx.common.mapper.BudgetMapper; -import com.cxx.home.dao.BudgetDao; -import com.cxx.home.service.BudgetService; -import jakarta.annotation.Resource; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Objects; - -@Service -public class BudgetServiceImpl implements BudgetService { - @Resource - private BudgetDao budgetDao; - - @Resource - private BudgetMapper budgetMapper; - - @Resource - private BudgetCategoryMapper budgetCategoryMapper; - - @Override - public List queryBudgetCategory() { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BudgetCategory.class); - return SimpleQuery.list(queryWrapper.select(BudgetCategory::getName), BudgetCategory::getName); - } - - @Override - public Boolean addBudget(BudgetDto budgetDto) { - Budget budge = new Budget(); - BeanUtils.copyProperties(budgetDto, budge); - budge.setCategoryId(getBudgetCategory(budgetDto.getCategory())); - - return budgetMapper.insert(budge) == 1; - } - - @Override - public Boolean updateBudget(Long id, BudgetDto budgetDto) { - Budget budge = new Budget(); - BeanUtils.copyProperties(budgetDto, budge); - budge.setCategoryId(getBudgetCategory(budgetDto.getCategory())); - budge.setId(id); - return budgetMapper.updateById(budge) == 1; - } - - private Long getBudgetCategory(String category) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - BudgetCategory budgetCategory = budgetCategoryMapper.selectOne(queryWrapper.eq(BudgetCategory::getName, category)); - if (Objects.isNull(budgetCategory)) { - BudgetCategory newBudgetCategory = new BudgetCategory(); - newBudgetCategory.setName(category); - budgetCategoryMapper.insert(newBudgetCategory); - return newBudgetCategory.getId(); - } else { - return budgetCategory.getId(); - } - } - - @Override - public Boolean deleteBudget(Long id) { - return budgetMapper.deleteById(id) == 1; - } - - @Override - public List queryBudget(String category) { - return budgetDao.queryBudget(category); - } - - @Override - public List queryBudgetRankStats(String category) { - return budgetDao.queryBudgetRankStats(category); - } - - @Override - public List queryBudgetProjectStats(String category) { - return budgetDao.queryBudgetProjectStats(category); - } -} diff --git a/home-service/src/main/java/com/cxx/home/service/impl/MessageServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/MessageServiceImpl.java index b81a805..034b63d 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/MessageServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/MessageServiceImpl.java @@ -1,6 +1,6 @@ package com.cxx.home.service.impl; -import com.cxx.common.dto.message.MailMessageDto; +import com.cxx.home.dto.message.MailMessageDto; import com.cxx.home.service.MessageService; import jakarta.annotation.Resource; import jakarta.mail.MessagingException; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/PlanServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/PlanServiceImpl.java index 387e257..7dee5d4 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/PlanServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/PlanServiceImpl.java @@ -3,13 +3,13 @@ package com.cxx.home.service.impl; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.cxx.common.dto.message.MailMessageDto; -import com.cxx.common.dto.plan.PlanDto; -import com.cxx.common.dto.plan.PlanStatsDto; -import com.cxx.common.dto.task.TaskDto; -import com.cxx.common.entity.Plan; -import com.cxx.common.mapper.PlanMapper; -import com.cxx.common.vo.plan.PlanQueryVo; +import com.cxx.home.dto.message.MailMessageDto; +import com.cxx.home.dto.plan.PlanDto; +import com.cxx.home.dto.plan.PlanStatsDto; +import com.cxx.home.dto.task.TaskDto; +import com.cxx.home.entity.Plan; +import com.cxx.home.mapper.PlanMapper; +import com.cxx.home.vo.PlanQueryVo; import com.cxx.home.dao.PlanDao; import com.cxx.home.schedule.TaskType; import com.cxx.home.service.PlanService; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/QuartzServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/QuartzServiceImpl.java index 706268c..0aa5a4d 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/QuartzServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/QuartzServiceImpl.java @@ -1,7 +1,7 @@ package com.cxx.home.service.impl; -import com.cxx.common.entity.Task; -import com.cxx.common.mapper.TaskMapper; +import com.cxx.home.entity.Task; +import com.cxx.home.mapper.TaskMapper; import com.cxx.framework.web.CustomException; import com.cxx.home.schedule.QuartzDto; import com.cxx.home.schedule.QuartzUtils; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/TaskServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/TaskServiceImpl.java index c34341f..8fa5db2 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/TaskServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/TaskServiceImpl.java @@ -1,8 +1,8 @@ package com.cxx.home.service.impl; -import com.cxx.common.dto.task.TaskDto; -import com.cxx.common.entity.Task; -import com.cxx.common.mapper.TaskMapper; +import com.cxx.home.dto.task.TaskDto; +import com.cxx.home.entity.Task; +import com.cxx.home.mapper.TaskMapper; import com.cxx.home.service.QuartzService; import com.cxx.home.service.TaskService; import jakarta.annotation.Resource; diff --git a/common/src/main/java/com/cxx/common/vo/bill/BillQueryVo.java b/home-service/src/main/java/com/cxx/home/vo/BillQueryVo.java similarity index 92% rename from common/src/main/java/com/cxx/common/vo/bill/BillQueryVo.java rename to home-service/src/main/java/com/cxx/home/vo/BillQueryVo.java index a58e888..b304146 100644 --- a/common/src/main/java/com/cxx/common/vo/bill/BillQueryVo.java +++ b/home-service/src/main/java/com/cxx/home/vo/BillQueryVo.java @@ -1,4 +1,4 @@ -package com.cxx.common.vo.bill; +package com.cxx.home.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/common/src/main/java/com/cxx/common/vo/plan/PlanQueryVo.java b/home-service/src/main/java/com/cxx/home/vo/PlanQueryVo.java similarity index 89% rename from common/src/main/java/com/cxx/common/vo/plan/PlanQueryVo.java rename to home-service/src/main/java/com/cxx/home/vo/PlanQueryVo.java index 63fac64..50f4790 100644 --- a/common/src/main/java/com/cxx/common/vo/plan/PlanQueryVo.java +++ b/home-service/src/main/java/com/cxx/home/vo/PlanQueryVo.java @@ -1,4 +1,4 @@ -package com.cxx.common.vo.plan; +package com.cxx.home.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/home-service/src/main/resources/application-dev.yml b/home-service/src/main/resources/application-dev.yml index 628463e..56c58fe 100644 --- a/home-service/src/main/resources/application-dev.yml +++ b/home-service/src/main/resources/application-dev.yml @@ -3,4 +3,4 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/sweet_hut?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root - password: estun@medical + password: 123456 diff --git a/home-service/src/main/resources/mapper/BillMapper.xml b/home-service/src/main/resources/mapper/BillMapper.xml index abf2cd4..23c626a 100644 --- a/home-service/src/main/resources/mapper/BillMapper.xml +++ b/home-service/src/main/resources/mapper/BillMapper.xml @@ -1,7 +1,7 @@ - + @@ -16,7 +16,7 @@ column="id" select="queryBillImage"/> - + @@ -134,7 +134,7 @@ - SELECT id AS id, name AS name, icon AS icon, @@ -142,7 +142,7 @@ FROM bill_pay - SELECT id AS id, name AS name, icon AS icon, @@ -150,7 +150,7 @@ FROM bill_book - SELECT a.id AS id, b.name AS bookName, a.name AS name, diff --git a/home-service/src/main/resources/mapper/BudgetMapper.xml b/home-service/src/main/resources/mapper/BudgetMapper.xml deleted file mode 100644 index 802367d..0000000 --- a/home-service/src/main/resources/mapper/BudgetMapper.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - diff --git a/home-service/src/main/resources/mapper/PlanMapper.xml b/home-service/src/main/resources/mapper/PlanMapper.xml index 7df7ce2..90ca388 100644 --- a/home-service/src/main/resources/mapper/PlanMapper.xml +++ b/home-service/src/main/resources/mapper/PlanMapper.xml @@ -1,7 +1,7 @@ - SELECT id AS id, title AS title, content AS content, @@ -32,7 +32,7 @@ date DESC - SELECT COUNT(*) AS totalCount, IFNULL(SUM(completed), 0) AS completedCount, IFNULL(SUM(CASE WHEN completed = 0 AND date ]]> CURDATE() THEN 1 ELSE 0 END), 0) AS currentCount, diff --git a/pom.xml b/pom.xml index cd49f2f..40cba46 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ - blog-service home-service admin-service common